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

Add almost-infinite scenario with Clark2Dt dispersal #273

Merged
merged 17 commits into from
Mar 2, 2024
Merged

Add almost-infinite scenario with Clark2Dt dispersal #273

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
a1dbd6e
Sketch out Clark scenario code skeleton
juntyr Feb 19, 2024
af54026
Fix rustfmt
juntyr Feb 19, 2024
85653a5
Implement Clark2Dt dispersal using inverse sampling
juntyr Feb 20, 2024
1a44fc8
Implement Clark2Dt self-dispersal probability using numerical integra…
juntyr Feb 20, 2024
f3d070b
Generalise Clark2Dt to p/=0 + add tests
juntyr Feb 21, 2024
8339b25
Make p=1 the default
juntyr Feb 21, 2024
2a5c486
Experiment with more concise scenario configs, first by merging spati…
juntyr Feb 22, 2024
9a06210
Start merging the Clark2Dt scenario into the AlmostInfinite scenario
juntyr Feb 23, 2024
e54d041
Allow arbitrary sample circle centres
juntyr Feb 24, 2024
d79e2d7
Enable circle and rectangle origin sampling for both Normal and Clark…
juntyr Feb 24, 2024
3a3db15
Refactor to address comments
juntyr Feb 29, 2024
582b39c
More docs fixes
juntyr Feb 29, 2024
64fc082
Try using cuda-toolkit action in CI
juntyr Mar 2, 2024
5b20c68
Use explicit cuda-toolkit version
juntyr Mar 2, 2024
c0d0115
Try network installation method
juntyr Mar 2, 2024
aabd18e
Install cuda-toolkit using network in CI
juntyr Mar 2, 2024
e95edaa
Use cuda-toolkit action in coverage CI
juntyr Mar 2, 2024
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
39 changes: 15 additions & 24 deletions .github/workflows/ci.yml
View file
Open in desktop
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/[email protected]
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/[email protected]
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/[email protected]
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
View file
Open in desktop
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/[email protected]
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
View file
Open in desktop

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
View file
Open in desktop
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
Loading