Skip to content

Commit e32e269

Browse files
authored
Sirius a100 (#57)
also update stackinator too support latest spack version
1 parent b5b5417 commit e32e269

File tree

13 files changed

+29
-27
lines changed

13 files changed

+29
-27
lines changed

Diff for: ci/config/ci.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ def readenv(config):
8686
if os.getenv("UENVCITEST", default=None) is not None:
8787
os.environ["system"] = "clariden"
8888
os.environ["uarch"] = "a100"
89-
os.environ["uenv"] = "gromacs:2023"
89+
os.environ["uenv"] = "sirius:v7.5"
9090

9191
# read and validate the configuration
9292
print(recipe_path)

Diff for: ci/config/templates/pipeline.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ build-{{job.uenv}}/{{job.version}}-{{job.system}}/{{job.uarch}}:
2828
tags: ["{{job.slurm_runner}}"]
2929
variables:
3030
STACK_MOUNT: "{{job.mount}}"
31-
SPACK_DEVELOP: "{{job.develop}}"
31+
SPACK_DEVELOP: "{{job.spack_develop}}"
3232
STACK_NAME: "{{job.uenv}}/{{job.version}}"
3333
STACK_SYSTEM: "{{job.system}}"
3434
SLURM_PARTITION: "{{job.partition}}"

Diff for: ci/configure-pipeline

-3
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,6 @@ log "root_path =$root_path"
2525
log "script_path=$script_path"
2626
log "config_path=$config_path"
2727

28-
log "here are all the env vars"
29-
printenv | grep CI_
30-
3128
#
3229
# create temporary working path for python
3330
#

Diff for: config.yaml

+7
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,13 @@ uenvs:
2222
eiger: [zen2]
2323
clariden: [a100]
2424
#develop: False
25+
sirius:
26+
"v7.5":
27+
recipes:
28+
a100: v7.5/a100
29+
deploy:
30+
clariden: [a100]
31+
develop: True
2532
prgenv-gnu:
2633
"23.11":
2734
recipes:

Diff for: recipes/sirius/ci.yml

-7
This file was deleted.

Diff for: recipes/sirius/compilers.yaml

-5
This file was deleted.

Diff for: recipes/sirius/config.yaml

-6
This file was deleted.

Diff for: recipes/sirius/v7.5/a100/compilers.yaml

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
bootstrap:
2+
3+
gcc:
4+
specs:
5+

Diff for: recipes/sirius/v7.5/a100/config.yaml

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
name: sirius-a100
2+
store: /user-environment
3+
description: The latest version of Sirius (v7.5.0) and the tools for building it, configured for A100 GPUs.
4+
spack:
5+
repo: https://github.com/spack/spack.git
6+
# commit on develop that updated the sirius package.py for v7.5.0 of sirius
7+
commit: 13b711f

Diff for: recipes/sirius/environments.yaml renamed to recipes/sirius/v7.5/a100/environments.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ gcc-env:
1919
- py-scipy
2020
- py-voluptuous
2121
22-
- sirius@develop +python +tests +fortran +cuda +scalapack +elpa ^elpa+cuda ^intel-oneapi-mkl+cluster
22+
- sirius@7.5 +python +tests +fortran +cuda +scalapack +elpa ^elpa+cuda ^intel-oneapi-mkl+cluster
2323
variants:
2424
- +mpi
2525
- +cuda

Diff for: recipes/sirius/v7.5/a100/extra/reframe.yaml

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
default:
2+
features: [sirius, mpi, openmp]
3+
cc: mpicc
4+
cxx: mpic++
5+
ftn: mpifort
6+
activation: /user-environment/env/default/activate.sh

Diff for: recipes/sirius/modules.yaml renamed to recipes/sirius/v7.5/a100/modules.yaml

-2
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,3 @@ modules:
2121
exclude: ['%[email protected]', 'gcc %[email protected]']
2222
projections:
2323
all: '{name}/{version}'
24-
#cray-mpich-binary: 'cray-mpich-{compiler.name}'
25-
#libxc: '{name}/{version}-{compiler.name}'

Diff for: scripts/setup-stackinator

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ tool_base_path="$(pwd)"
55
# builds in the same pipeline do not conflict
66
tool_path=`mktemp -d`
77
tool_repo=https://github.com/eth-cscs/stackinator.git
8-
tool_version=9f21a18cdef561e13bc88706ebf4aea3c7ccd1e0
8+
tool_version=ad2281b2c094b043b2dd256ea224613943f47c14
99

1010
log "installing stackinator from git in '${tool_path}'"
1111

0 commit comments

Comments
 (0)