Skip to content

Commit 5f93264

Browse files
jgphpcjgphpc
authored
Update uenv/cuda version (#589)
1 parent 6a1b00e commit 5f93264

10 files changed

Lines changed: 142 additions & 126 deletions

‎ci/cscs.yml‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
1+
variables:
2+
MYUENV: prgenv-gnu/26.3:v1
3+
14
include:
25
# NVIDIA/GH200:
3-
# - local: 'ci/cuda12/build_base.yml'
46
- local: 'ci/test_venv_setup.yml'
5-
- local: 'ci/cuda12/build_debug_sm90.yml'
6-
- local: 'ci/cuda12/run_debug_sm90.yml'
7-
- local: 'ci/cuda12/build_release_sm90.yml'
8-
- local: 'ci/cuda12/run_release_sm90.yml'
7+
- local: 'ci/cuda13/build_debug_sm90.yml'
8+
- local: 'ci/cuda13/run_debug_sm90.yml'
9+
- local: 'ci/cuda13/build_release_sm90.yml'
10+
- local: 'ci/cuda13/run_release_sm90.yml'
911

‎ci/cuda12/run_debug_sm90.yml‎

Lines changed: 0 additions & 46 deletions
This file was deleted.

‎ci/cuda12/run_release_sm90.yml‎

Lines changed: 0 additions & 46 deletions
This file was deleted.

ci/cuda12/build_debug_sm90.yml renamed to ci/cuda13/build_debug_sm90.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ include:
44
variables:
55
# GIT_SUBMODULE_STRATEGY: "recursive"
66

7-
sph-build-cuda12-sm90-debug:
7+
sph-build-cuda13-sm90-debug:
88
stage: sphexa_build
9-
image: prgenv-gnu/25.11:v1
9+
image: $MYUENV
1010
extends: [.uenv-runner-daint-gh200]
1111
variables:
1212
SLURM_TIMELIMIT: '01:00:00'
13-
PERSIST_IMAGE_NAME: ${CSCS_REGISTRY_PATH}/sphexa_cuda12_debug:${CI_COMMIT_SHORT_SHA}
13+
PERSIST_IMAGE_NAME: ${CSCS_REGISTRY_PATH}/sphexa_cuda13_debug:${CI_COMMIT_SHORT_SHA}
1414
WITH_UENV_VIEW: 'spack' # this is not 'default' view
1515
# SLURM_PARTITION: 'debug'
1616
SLURM_JOB_NUM_NODES: 1
@@ -33,9 +33,12 @@ sph-build-cuda12-sm90-debug:
3333
script:
3434
- cd sphexa+spack
3535
- mkdir -p ./env/repo/packages/sphexa
36+
# match pull request's branch:
3637
- 'sed -e "s/ci_fake_version/$CI_COMMIT_SHORT_SHA/" -e "s/ci_sha/$CI_COMMIT_SHA/" -e "s!ci_git!$CI_PROJECT_URL.git!" ../ci/scripts/package.py > env/repo/packages/sphexa/package.py'
38+
# match cray-mpich version in uenv:
39+
- 'sed -i "s-8.1.32-9.1.0-" ./config/system/packages.yaml'
3740
- ln -fs ./env/repo/packages/sphexa/package.py .
38-
- 'grep specs: ./env/spack.yaml'
41+
- cat ./env/spack.yaml
3942
- ./build
4043
- cd ..
4144
artifacts:

ci/cuda12/build_release_sm90.yml renamed to ci/cuda13/build_release_sm90.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ include:
44
variables:
55
# GIT_SUBMODULE_STRATEGY: "recursive"
66

7-
sph-build-cuda12-sm90-release:
7+
sph-build-cuda13-sm90-release:
88
stage: sphexa_build
9-
image: prgenv-gnu/25.11:v1
9+
image: $MYUENV
1010
extends: [.uenv-runner-daint-gh200]
1111
variables:
1212
SLURM_TIMELIMIT: '01:00:00'
13-
PERSIST_IMAGE_NAME: ${CSCS_REGISTRY_PATH}/sphexa_cuda12_release:${CI_COMMIT_SHORT_SHA}
13+
PERSIST_IMAGE_NAME: ${CSCS_REGISTRY_PATH}/sphexa_cuda13_release:${CI_COMMIT_SHORT_SHA}
1414
WITH_UENV_VIEW: 'spack' # this is not 'default' view
1515
# SLURM_PARTITION: 'debug'
1616
SLURM_JOB_NUM_NODES: 1
@@ -33,9 +33,12 @@ sph-build-cuda12-sm90-release:
3333
script:
3434
- cd sphexa+spack
3535
- mkdir -p ./env/repo/packages/sphexa
36+
# match pull request's branch:
3637
- 'sed -e "s/ci_fake_version/$CI_COMMIT_SHORT_SHA/" -e "s/ci_sha/$CI_COMMIT_SHA/" -e "s!ci_git!$CI_PROJECT_URL.git!" ../ci/scripts/package.py > env/repo/packages/sphexa/package.py'
38+
# match cray-mpich version in uenv:
39+
- 'sed -i "s-8.1.32-9.1.0-" ./config/system/packages.yaml'
3740
- ln -fs ./env/repo/packages/sphexa/package.py .
38-
- 'grep specs: ./env/spack.yaml'
41+
- cat ./env/spack.yaml
3942
- ./build
4043
- cd ..
4144
artifacts:

‎ci/cuda13/run_debug_sm90.yml‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
include:
2+
- local: 'ci/cuda13/run_template_sm90.yml'
3+
4+
sph-run-cuda13-sm90-debug-1rank:
5+
extends: [.sph-run-cuda13-sm90-1rank]
6+
needs: ['sph-build-cuda13-sm90-debug']
7+
8+
sph-run-cuda13-sm90-debug-2ranks:
9+
extends: [.sph-run-cuda13-sm90-2ranks]
10+
needs: ['sph-build-cuda13-sm90-debug']
11+
12+
sph-run-cuda13-sm90-debug-4ranks:
13+
extends: [.sph-run-cuda13-sm90-4ranks]
14+
needs: ['sph-build-cuda13-sm90-debug']
15+
16+
sph-run-cuda13-sm90-debug-12ranks:
17+
extends: [.sph-run-cuda13-sm90-12ranks]
18+
needs: ['sph-build-cuda13-sm90-debug']
19+
20+
sph-run-cuda13-sm90-debug-sphexa-cuda:
21+
extends: [.sph-run-cuda13-sm90-sphexa-cuda]
22+
needs:
23+
- job: sph-build-cuda13-sm90-debug
24+
- job: sph-test-venv-setup
25+
artifacts: true
26+
27+
sph-run-cuda13-sm90-debug-sphexa-cpu:
28+
extends: [.sph-run-cuda13-sm90-sphexa-cpu]
29+
needs:
30+
- job: sph-build-cuda13-sm90-debug
31+
- job: sph-test-venv-setup
32+
artifacts: true
33+
34+
sph-compare-constants-cuda13-sm90-debug-sphexa-cuda:
35+
extends: [.sph-compare-constants-cuda13-sm90-sphexa-cuda]
36+
needs:
37+
- job: sph-build-cuda13-sm90-debug
38+
- job: sph-test-venv-setup
39+
artifacts: true
40+
41+
sph-compare-constants-cuda13-sm90-debug-sphexa-cpu:
42+
extends: [.sph-compare-constants-cuda13-sm90-sphexa-cpu]
43+
needs:
44+
- job: sph-build-cuda13-sm90-debug
45+
- job: sph-test-venv-setup
46+
artifacts: true

‎ci/cuda13/run_release_sm90.yml‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
include:
2+
- local: 'ci/cuda13/run_template_sm90.yml'
3+
4+
sph-run-cuda13-sm90-release-1rank:
5+
extends: [.sph-run-cuda13-sm90-1rank]
6+
needs: ['sph-build-cuda13-sm90-release']
7+
8+
sph-run-cuda13-sm90-release-2ranks:
9+
extends: [.sph-run-cuda13-sm90-2ranks]
10+
needs: ['sph-build-cuda13-sm90-release']
11+
12+
sph-run-cuda13-sm90-release-4ranks:
13+
extends: [.sph-run-cuda13-sm90-4ranks]
14+
needs: ['sph-build-cuda13-sm90-release']
15+
16+
sph-run-cuda13-sm90-release-12ranks:
17+
extends: [.sph-run-cuda13-sm90-12ranks]
18+
needs: ['sph-build-cuda13-sm90-release']
19+
20+
sph-run-cuda13-sm90-release-sphexa-cuda:
21+
extends: [.sph-run-cuda13-sm90-sphexa-cuda]
22+
needs:
23+
- job: sph-build-cuda13-sm90-release
24+
- job: sph-test-venv-setup
25+
artifacts: true
26+
27+
sph-run-cuda13-sm90-release-sphexa-cpu:
28+
extends: [.sph-run-cuda13-sm90-sphexa-cpu]
29+
needs:
30+
- job: sph-build-cuda13-sm90-release
31+
- job: sph-test-venv-setup
32+
artifacts: true
33+
34+
sph-compare-constants-cuda13-sm90-release-sphexa-cuda:
35+
extends: [.sph-compare-constants-cuda13-sm90-sphexa-cuda]
36+
needs:
37+
- job: sph-build-cuda13-sm90-release
38+
- job: sph-test-venv-setup
39+
artifacts: true
40+
41+
sph-compare-constants-cuda13-sm90-release-sphexa-cpu:
42+
extends: [.sph-compare-constants-cuda13-sm90-sphexa-cpu]
43+
needs:
44+
- job: sph-build-cuda13-sm90-release
45+
- job: sph-test-venv-setup
46+
artifacts: true

ci/cuda12/run_template_sm90.yml renamed to ci/cuda13/run_template_sm90.yml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ variables:
55
TEST_INSTALL_DIR: 'sphexa+spack/store/linux-neoverse_v2/sphexa-*/sbin'
66
APP_INSTALL_DIR: 'sphexa+spack/store/linux-neoverse_v2/sphexa-*/bin'
77

8-
.sph-run-cuda12-sm90-1rank:
8+
.sph-run-cuda13-sm90-1rank:
99
stage: sphexa_run
10-
image: prgenv-gnu/25.11:v1
10+
image: $MYUENV
1111
extends: [.uenv-runner-daint-gh200]
1212
variables:
1313
SLURM_TIMELIMIT: '01:00:00'
@@ -46,9 +46,9 @@ variables:
4646
- $TEST_INSTALL_DIR/unit_cuda/component_units_cuda
4747
- date
4848

49-
.sph-run-cuda12-sm90-2ranks:
49+
.sph-run-cuda13-sm90-2ranks:
5050
stage: sphexa_run
51-
image: prgenv-gnu/25.11:v1
51+
image: $MYUENV
5252
extends: [.uenv-runner-daint-gh200]
5353
variables:
5454
WITH_UENV_VIEW: 'default'
@@ -78,9 +78,9 @@ variables:
7878
- $TEST_INSTALL_DIR/integration_mpi/exchange_halos_gpu
7979
- date
8080

81-
.sph-run-cuda12-sm90-4ranks:
81+
.sph-run-cuda13-sm90-4ranks:
8282
stage: sphexa_run
83-
image: prgenv-gnu/25.11:v1
83+
image: $MYUENV
8484
extends: [.uenv-runner-daint-gh200]
8585
variables:
8686
WITH_UENV_VIEW: 'default'
@@ -96,9 +96,9 @@ variables:
9696
- $TEST_INSTALL_DIR/ryoanji/global_upsweep_gpu
9797
- date
9898

99-
.sph-run-cuda12-sm90-12ranks:
99+
.sph-run-cuda13-sm90-12ranks:
100100
stage: sphexa_run
101-
image: prgenv-gnu/25.11:v1
101+
image: $MYUENV
102102
extends: [.uenv-runner-daint-gh200]
103103
variables:
104104
WITH_UENV_VIEW: 'default'
@@ -116,9 +116,9 @@ variables:
116116
- $TEST_INSTALL_DIR/integration_mpi/domain_nranks
117117
- date
118118

119-
.sph-run-cuda12-sm90-sphexa-cuda:
119+
.sph-run-cuda13-sm90-sphexa-cuda:
120120
stage: sphexa_run
121-
image: prgenv-gnu/25.11:v1
121+
image: $MYUENV
122122
extends: [.uenv-runner-daint-gh200]
123123
variables:
124124
WITH_UENV_VIEW: 'default'
@@ -147,9 +147,9 @@ variables:
147147
fi
148148
- date
149149

150-
.sph-run-cuda12-sm90-sphexa-cpu:
150+
.sph-run-cuda13-sm90-sphexa-cpu:
151151
stage: sphexa_run
152-
image: prgenv-gnu/25.11:v1
152+
image: $MYUENV
153153
extends: [.uenv-runner-daint-gh200]
154154
variables:
155155
WITH_UENV_VIEW: 'default'
@@ -178,9 +178,9 @@ variables:
178178
fi
179179
- date
180180

181-
.sph-compare-constants-cuda12-sm90-sphexa-cuda:
181+
.sph-compare-constants-cuda13-sm90-sphexa-cuda:
182182
stage: sphexa_run
183-
image: prgenv-gnu/25.11:v1
183+
image: $MYUENV
184184
extends: [.uenv-runner-daint-gh200]
185185
variables:
186186
WITH_UENV_VIEW: 'default'
@@ -196,9 +196,9 @@ variables:
196196
- bash ci/scripts/run_constants_comparison.sh "$APP_INSTALL_DIR/sphexa-cuda"
197197
- date
198198

199-
.sph-compare-constants-cuda12-sm90-sphexa-cpu:
199+
.sph-compare-constants-cuda13-sm90-sphexa-cpu:
200200
stage: sphexa_run
201-
image: prgenv-gnu/25.11:v1
201+
image: $MYUENV
202202
extends: [.uenv-runner-daint-gh200]
203203
variables:
204204
WITH_UENV_VIEW: 'default'

0 commit comments

Comments
 (0)