Skip to content

Commit cea74d7

Browse files
authored
Add almost-infinite scenario with Clark2Dt dispersal (#273)
Co-authored-by: Nicolás Firbas <nicolas.firbas@gmail.com> * Sketch out Clark scenario code skeleton * Implement Clark2Dt dispersal using inverse sampling * Implement Clark2Dt self-dispersal probability using numerical integration * Generalise Clark2Dt to p/=0 + add tests * Make p=1 the default * Merge spatially explicit scenario configs * Merge the Clark2Dt scenario into the AlmostInfinite scenario * Enable circle and rectangle origin sampling for both Normal and Clark2Dt dispersal in the AlmostInfinite scenario * Switch to using cuda-toolkit action in CI
1 parent cad7c26 commit cea74d7

File tree

57 files changed

+2016
-481
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+2016
-481
lines changed

.github/workflows/ci.yml

Lines changed: 15 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,11 @@ jobs:
2222
uses: actions/checkout@v2
2323

2424
- name: Install CUDA
25-
run: |
26-
wget https://developer.download.nvidia.com/compute/cuda/repos/ubuntu1804/x86_64/cuda-ubuntu1804.pin
27-
sudo mv cuda-ubuntu1804.pin /etc/apt/preferences.d/cuda-repository-pin-600
28-
curl -L -O https://developer.download.nvidia.com/compute/cuda/repos/ubuntu1804/x86_64/cuda-keyring_1.0-1_all.deb
29-
sudo dpkg -i cuda-keyring_1.0-1_all.deb
30-
sudo add-apt-repository "deb https://developer.download.nvidia.com/compute/cuda/repos/ubuntu1804/x86_64/ /"
31-
sudo apt-get update -q
32-
sudo apt-get install cuda -y --no-install-recommends
25+
uses: Jimver/cuda-toolkit@v0.2.14
26+
with:
27+
method: network
28+
use-github-cache: false
29+
use-local-cache: false
3330

3431
- name: Install OpenMPI
3532
run: |
@@ -57,14 +54,11 @@ jobs:
5754
uses: actions/checkout@v2
5855

5956
- name: Install CUDA
60-
run: |
61-
wget https://developer.download.nvidia.com/compute/cuda/repos/ubuntu1804/x86_64/cuda-ubuntu1804.pin
62-
sudo mv cuda-ubuntu1804.pin /etc/apt/preferences.d/cuda-repository-pin-600
63-
curl -L -O https://developer.download.nvidia.com/compute/cuda/repos/ubuntu1804/x86_64/cuda-keyring_1.0-1_all.deb
64-
sudo dpkg -i cuda-keyring_1.0-1_all.deb
65-
sudo add-apt-repository "deb https://developer.download.nvidia.com/compute/cuda/repos/ubuntu1804/x86_64/ /"
66-
sudo apt-get update -q
67-
sudo apt-get install cuda -y --no-install-recommends
57+
uses: Jimver/cuda-toolkit@v0.2.14
58+
with:
59+
method: network
60+
use-github-cache: false
61+
use-local-cache: false
6862

6963
- name: Install OpenMPI
7064
run: |
@@ -99,14 +93,11 @@ jobs:
9993
uses: actions/checkout@v2
10094

10195
- name: Install CUDA
102-
run: |
103-
wget https://developer.download.nvidia.com/compute/cuda/repos/ubuntu1804/x86_64/cuda-ubuntu1804.pin
104-
sudo mv cuda-ubuntu1804.pin /etc/apt/preferences.d/cuda-repository-pin-600
105-
curl -L -O https://developer.download.nvidia.com/compute/cuda/repos/ubuntu1804/x86_64/cuda-keyring_1.0-1_all.deb
106-
sudo dpkg -i cuda-keyring_1.0-1_all.deb
107-
sudo add-apt-repository "deb https://developer.download.nvidia.com/compute/cuda/repos/ubuntu1804/x86_64/ /"
108-
sudo apt-get update -q
109-
sudo apt-get install cuda -y --no-install-recommends
96+
uses: Jimver/cuda-toolkit@v0.2.14
97+
with:
98+
method: network
99+
use-github-cache: false
100+
use-local-cache: false
110101

111102
- name: Install OpenMPI
112103
run: |

.github/workflows/coverage.yml

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,11 @@ jobs:
2020
uses: actions/checkout@v2
2121

2222
- name: Install CUDA
23-
run: |
24-
wget https://developer.download.nvidia.com/compute/cuda/repos/ubuntu1804/x86_64/cuda-ubuntu1804.pin
25-
sudo mv cuda-ubuntu1804.pin /etc/apt/preferences.d/cuda-repository-pin-600
26-
curl -L -O https://developer.download.nvidia.com/compute/cuda/repos/ubuntu1804/x86_64/cuda-keyring_1.0-1_all.deb
27-
sudo dpkg -i cuda-keyring_1.0-1_all.deb
28-
sudo add-apt-repository "deb https://developer.download.nvidia.com/compute/cuda/repos/ubuntu1804/x86_64/ /"
29-
sudo apt-get update -q
30-
sudo apt-get install cuda -y --no-install-recommends
23+
uses: Jimver/cuda-toolkit@v0.2.14
24+
with:
25+
method: network
26+
use-github-cache: false
27+
use-local-cache: false
3128

3229
- name: Install OpenMPI
3330
run: |

Cargo.lock

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/replay.ron

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
/* selection of event log segments which will be analysed in the replay */
44
segments: [
55
/* a PathBuf which can contain Unix glob patterns
6-
* e.g. use "event_log / ** / *" (without spaces)
7-
* where the event log was stored to the "event_log" directory */
6+
* e.g. use "event_log / ** / *" (without spaces)
7+
* where the event log was stored to the "event_log" directory */
88
(GlobPathBuf),
99
],
1010
/* in-memory buffering capacity of each log segment
11-
* a higher capacity will batch up disk read calls but use more RAM */
12-
/* optional, default = 100000 */
11+
* a higher capacity will batch up disk read calls but use more RAM
12+
* optional, default = 100000 */
1313
capacity: (0 < usize),
1414
),
1515

0 commit comments

Comments
 (0)