Skip to content

Commit

Permalink
Add almost-infinite scenario with Clark2Dt dispersal (#273)
Browse files Browse the repository at this point in the history
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
  • Loading branch information
juntyr authored Mar 2, 2024
1 parent cad7c26 commit cea74d7
Show file tree
Hide file tree
Showing 57 changed files with 2,016 additions and 481 deletions.
39 changes: 15 additions & 24 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,11 @@ jobs:
uses: actions/checkout@v2

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

- name: Install OpenMPI
run: |
Expand Down Expand Up @@ -57,14 +54,11 @@ jobs:
uses: actions/checkout@v2

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

- name: Install OpenMPI
run: |
Expand Down Expand Up @@ -99,14 +93,11 @@ jobs:
uses: actions/checkout@v2

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

- name: Install OpenMPI
run: |
Expand Down
13 changes: 5 additions & 8 deletions .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,11 @@ jobs:
uses: actions/checkout@v2

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

- name: Install OpenMPI
run: |
Expand Down
2 changes: 2 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions docs/replay.ron
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
/* selection of event log segments which will be analysed in the replay */
segments: [
/* a PathBuf which can contain Unix glob patterns
* e.g. use "event_log / ** / *" (without spaces)
* where the event log was stored to the "event_log" directory */
* e.g. use "event_log / ** / *" (without spaces)
* where the event log was stored to the "event_log" directory */
(GlobPathBuf),
],
/* in-memory buffering capacity of each log segment
* a higher capacity will batch up disk read calls but use more RAM */
/* optional, default = 100000 */
* a higher capacity will batch up disk read calls but use more RAM
* optional, default = 100000 */
capacity: (0 < usize),
),

Expand Down
Loading

0 comments on commit cea74d7

Please sign in to comment.