Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add support for Sphinx 3.0.x and use CUDA 10 docker image with ffmpeg #3659

Merged
merged 2 commits into from
Apr 13, 2020
Merged

Add support for Sphinx 3.0.x and use CUDA 10 docker image with ffmpeg #3659

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c2a5f9a
Use new cuda 10 image with ffmpeg
jngrad Apr 12, 2020
f68d236
Fix Sphinx 3.0 error for Cython class attributes
jngrad Apr 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions .gitlab-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ style:
style_doxygen:
<<: *global_job_definition
stage: prepare
image: docker.pkg.github.com/espressomd/docker/ubuntu-cuda-10.1:01cf23487c9eeec758daf425c9947d8089ed9da0
image: docker.pkg.github.com/espressomd/docker/ubuntu-cuda-10.1:c9fe9d6d79ffd7e3e89ef282548e0b5278afde2c
dependencies: []
script:
- mkdir build
Expand Down Expand Up @@ -166,7 +166,7 @@ fedora:latest:
cuda10-maxset:
<<: *global_job_definition
stage: build
image: docker.pkg.github.com/espressomd/docker/ubuntu-cuda-10.1:01cf23487c9eeec758daf425c9947d8089ed9da0
image: docker.pkg.github.com/espressomd/docker/ubuntu-cuda-10.1:c9fe9d6d79ffd7e3e89ef282548e0b5278afde2c
script:
- export myconfig=maxset with_coverage=false test_timeout=900 srcdir=${CI_PROJECT_DIR}
- export cmake_params="-DIPYTHON_EXECUTABLE=$(which jupyter)"
Expand All @@ -183,7 +183,7 @@ cuda10-maxset:
cuda9-maxset:
<<: *global_job_definition
stage: build
image: docker.pkg.github.com/espressomd/docker/ubuntu-cuda-9.0:01cf23487c9eeec758daf425c9947d8089ed9da0
image: docker.pkg.github.com/espressomd/docker/ubuntu-cuda-9.0:c9fe9d6d79ffd7e3e89ef282548e0b5278afde2c
script:
- export myconfig=maxset with_coverage=true test_timeout=900 srcdir=${CI_PROJECT_DIR}
- sed -i 's/ or "DISPLAY" in os.environ/ or True/' src/python/espressomd/visualization.pyx
Expand All @@ -201,7 +201,7 @@ cuda9-maxset:
tutorials-samples-maxset:
<<: *global_job_definition
stage: build
image: docker.pkg.github.com/espressomd/docker/ubuntu-cuda-10.1:01cf23487c9eeec758daf425c9947d8089ed9da0
image: docker.pkg.github.com/espressomd/docker/ubuntu-cuda-10.1:c9fe9d6d79ffd7e3e89ef282548e0b5278afde2c
script:
- export myconfig=maxset with_coverage=false make_check_unit_tests=false make_check_python=false
- export make_check_tutorials=true make_check_samples=true make_check_benchmarks=false test_timeout=1200
Expand All @@ -214,7 +214,7 @@ tutorials-samples-maxset:
tutorials-samples-default:
<<: *global_job_definition
stage: build
image: docker.pkg.github.com/espressomd/docker/ubuntu-cuda-10.1:01cf23487c9eeec758daf425c9947d8089ed9da0
image: docker.pkg.github.com/espressomd/docker/ubuntu-cuda-10.1:c9fe9d6d79ffd7e3e89ef282548e0b5278afde2c
script:
- export myconfig=default with_coverage=false make_check_unit_tests=false make_check_python=false
- export make_check_tutorials=true make_check_samples=true make_check_benchmarks=false test_timeout=1200
Expand All @@ -229,7 +229,7 @@ tutorials-samples-default:
tutorials-samples-empty:
<<: *global_job_definition
stage: build
image: docker.pkg.github.com/espressomd/docker/ubuntu-cuda-10.1:01cf23487c9eeec758daf425c9947d8089ed9da0
image: docker.pkg.github.com/espressomd/docker/ubuntu-cuda-10.1:c9fe9d6d79ffd7e3e89ef282548e0b5278afde2c
script:
- export myconfig=empty with_coverage=false make_check_unit_tests=false make_check_python=false
- export make_check_tutorials=true make_check_samples=true make_check_benchmarks=false test_timeout=1200 with_scafacos=false
Expand All @@ -244,7 +244,7 @@ tutorials-samples-empty:
tutorials-samples-no-gpu:
<<: *global_job_definition
stage: build
image: docker.pkg.github.com/espressomd/docker/ubuntu-cuda-10.1:01cf23487c9eeec758daf425c9947d8089ed9da0
image: docker.pkg.github.com/espressomd/docker/ubuntu-cuda-10.1:c9fe9d6d79ffd7e3e89ef282548e0b5278afde2c
script:
- export myconfig=maxset with_coverage=false make_check_unit_tests=false make_check_python=false
- export make_check_tutorials=true make_check_samples=true make_check_benchmarks=false test_timeout=1200 hide_gpu=true
Expand All @@ -258,7 +258,7 @@ tutorials-samples-no-gpu:
installation:
<<: *global_job_definition
stage: build
image: docker.pkg.github.com/espressomd/docker/ubuntu-cuda-10.1:01cf23487c9eeec758daf425c9947d8089ed9da0
image: docker.pkg.github.com/espressomd/docker/ubuntu-cuda-10.1:c9fe9d6d79ffd7e3e89ef282548e0b5278afde2c
script:
- export myconfig=maxset with_coverage=false make_check_unit_tests=false make_check_python=false
- export srcdir=${CI_PROJECT_DIR} test_timeout=1800
Expand Down Expand Up @@ -377,7 +377,7 @@ intel:19:
check_sphinx:
<<: *global_job_definition
stage: additional_checks
image: docker.pkg.github.com/espressomd/docker/ubuntu-cuda-10.1:01cf23487c9eeec758daf425c9947d8089ed9da0
image: docker.pkg.github.com/espressomd/docker/ubuntu-cuda-10.1:c9fe9d6d79ffd7e3e89ef282548e0b5278afde2c
needs:
- cuda10-maxset
when: on_success
Expand All @@ -398,7 +398,7 @@ check_sphinx:
run_tutorials:
<<: *global_job_definition
stage: additional_checks
image: docker.pkg.github.com/espressomd/docker/ubuntu-cuda-10.1:01cf23487c9eeec758daf425c9947d8089ed9da0
image: docker.pkg.github.com/espressomd/docker/ubuntu-cuda-10.1:c9fe9d6d79ffd7e3e89ef282548e0b5278afde2c
needs:
- cuda10-maxset
when: on_success
Expand All @@ -422,7 +422,7 @@ run_tutorials:
run_doxygen:
<<: *global_job_definition
stage: additional_checks
image: docker.pkg.github.com/espressomd/docker/ubuntu-cuda-10.1:01cf23487c9eeec758daf425c9947d8089ed9da0
image: docker.pkg.github.com/espressomd/docker/ubuntu-cuda-10.1:c9fe9d6d79ffd7e3e89ef282548e0b5278afde2c
needs:
- cuda10-maxset
when: on_success
Expand All @@ -442,7 +442,7 @@ run_doxygen:
check_cuda_maxset_no_gpu:
<<: *global_job_definition
stage: additional_checks
image: docker.pkg.github.com/espressomd/docker/ubuntu-cuda-9.0:01cf23487c9eeec758daf425c9947d8089ed9da0
image: docker.pkg.github.com/espressomd/docker/ubuntu-cuda-9.0:c9fe9d6d79ffd7e3e89ef282548e0b5278afde2c
when: on_success
needs:
- cuda9-maxset
Expand All @@ -458,7 +458,7 @@ check_cuda_maxset_no_gpu:
check_with_odd_no_of_processors:
<<: *global_job_definition
stage: additional_checks
image: docker.pkg.github.com/espressomd/docker/ubuntu-cuda-9.0:01cf23487c9eeec758daf425c9947d8089ed9da0
image: docker.pkg.github.com/espressomd/docker/ubuntu-cuda-9.0:c9fe9d6d79ffd7e3e89ef282548e0b5278afde2c
when: on_success
needs:
- cuda9-maxset
Expand Down
37 changes: 17 additions & 20 deletions src/python/espressomd/system.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,45 +72,42 @@ cdef class System:
``self.new_attr = somevalue`` without declaring it inside this
indentation level, either as method, property or reference.

Attributes
----------
globals : :class:`espressomd.globals.Globals`
actors : :class:`espressomd.actors.Actors`
analysis : :class:`espressomd.analyze.Analysis`
auto_update_accumulators : :class:`espressomd.accumulators.AutoUpdateAccumulators`
bonded_inter : :class:`espressomd.interactions.BondedInteractions`
cell_system : :class:`espressomd.cellsystem.CellSystem`
collision_detection : :class:`espressomd.collision_detection.CollisionDetection`
comfixed : :class:`espressomd.comfixed.ComFixed`
constraints : :class:`espressomd.constraints.Constraints`
cuda_init_handle : :class:`espressomd.cuda_init.CudaInitHandle`
galilei : :class:`espressomd.galilei.GalileiTransform`
integrator : :class:`espressomd.integrate.IntegratorHandle`
lbboundaries : :class:`espressomd.lbboundaries.LBBoundaries`
ekboundaries : :class:`espressomd.ekboundaries.EKBoundaries`
non_bonded_inter : :class:`espressomd.interactions.NonBondedInteractions`
part : :class:`espressomd.particle_data.ParticleList`
thermostat : :class:`espressomd.thermostat.Thermostat`

"""
cdef public:
globals
""":class:`espressomd.globals.Globals`"""
part
""":class:`espressomd.particle_data.ParticleList`"""
non_bonded_inter
""":class:`espressomd.interactions.NonBondedInteractions`"""
bonded_inter
""":class:`espressomd.interactions.BondedInteractions`"""
cell_system
""":class:`espressomd.cellsystem.CellSystem`"""
thermostat
""":class:`espressomd.thermostat.Thermostat`"""
actors
""":class:`espressomd.actors.Actors`"""
analysis
""":class:`espressomd.analyze.Analysis`"""
galilei
""":class:`espressomd.galilei.GalileiTransform`"""
integrator
""":class:`espressomd.integrate.IntegratorHandle`"""
auto_update_accumulators
""":class:`espressomd.accumulators.AutoUpdateAccumulators`"""
constraints
""":class:`espressomd.constraints.Constraints`"""
lbboundaries
""":class:`espressomd.lbboundaries.LBBoundaries`"""
ekboundaries
""":class:`espressomd.ekboundaries.EKBoundaries`"""
collision_detection
""":class:`espressomd.collision_detection.CollisionDetection`"""
cuda_init_handle
""":class:`espressomd.cuda_init.CudaInitHandle`"""
comfixed
""":class:`espressomd.comfixed.ComFixed`"""
_active_virtual_sites_handle

def __init__(self, **kwargs):
Expand Down