Skip to content

Commit

Permalink
Sirius a100 (#57)
Browse files Browse the repository at this point in the history
also update stackinator too support latest spack version
  • Loading branch information
bcumming authored Dec 13, 2023
1 parent b5b5417 commit e32e269
Show file tree
Hide file tree
Showing 13 changed files with 29 additions and 27 deletions.
2 changes: 1 addition & 1 deletion ci/config/ci.py
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ def readenv(config):
if os.getenv("UENVCITEST", default=None) is not None:
os.environ["system"] = "clariden"
os.environ["uarch"] = "a100"
os.environ["uenv"] = "gromacs:2023"
os.environ["uenv"] = "sirius:v7.5"

# read and validate the configuration
print(recipe_path)
Expand Down
2 changes: 1 addition & 1 deletion ci/config/templates/pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ build-{{job.uenv}}/{{job.version}}-{{job.system}}/{{job.uarch}}:
tags: ["{{job.slurm_runner}}"]
variables:
STACK_MOUNT: "{{job.mount}}"
SPACK_DEVELOP: "{{job.develop}}"
SPACK_DEVELOP: "{{job.spack_develop}}"
STACK_NAME: "{{job.uenv}}/{{job.version}}"
STACK_SYSTEM: "{{job.system}}"
SLURM_PARTITION: "{{job.partition}}"
Expand Down
3 changes: 0 additions & 3 deletions ci/configure-pipeline
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,6 @@ log "root_path =$root_path"
log "script_path=$script_path"
log "config_path=$config_path"

log "here are all the env vars"
printenv | grep CI_

#
# create temporary working path for python
#
Expand Down
7 changes: 7 additions & 0 deletions config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,13 @@ uenvs:
eiger: [zen2]
clariden: [a100]
#develop: False
sirius:
"v7.5":
recipes:
a100: v7.5/a100
deploy:
clariden: [a100]
develop: True
prgenv-gnu:
"23.11":
recipes:
Expand Down
7 changes: 0 additions & 7 deletions recipes/sirius/ci.yml

This file was deleted.

5 changes: 0 additions & 5 deletions recipes/sirius/compilers.yaml

This file was deleted.

6 changes: 0 additions & 6 deletions recipes/sirius/config.yaml

This file was deleted.

5 changes: 5 additions & 0 deletions recipes/sirius/v7.5/a100/compilers.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
bootstrap:
spec: [email protected]
gcc:
specs:
- [email protected]
7 changes: 7 additions & 0 deletions recipes/sirius/v7.5/a100/config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
name: sirius-a100
store: /user-environment
description: The latest version of Sirius (v7.5.0) and the tools for building it, configured for A100 GPUs.
spack:
repo: https://github.com/spack/spack.git
# commit on develop that updated the sirius package.py for v7.5.0 of sirius
commit: 13b711f
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ gcc-env:
- py-scipy
- py-voluptuous
- [email protected] ~cuda
- sirius@develop +python +tests +fortran +cuda +scalapack +elpa ^elpa+cuda ^intel-oneapi-mkl+cluster
- sirius@7.5 +python +tests +fortran +cuda +scalapack +elpa ^elpa+cuda ^intel-oneapi-mkl+cluster
variants:
- +mpi
- +cuda
Expand Down
6 changes: 6 additions & 0 deletions recipes/sirius/v7.5/a100/extra/reframe.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
default:
features: [sirius, mpi, openmp]
cc: mpicc
cxx: mpic++
ftn: mpifort
activation: /user-environment/env/default/activate.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,3 @@ modules:
exclude: ['%[email protected]', 'gcc %[email protected]']
projections:
all: '{name}/{version}'
#cray-mpich-binary: 'cray-mpich-{compiler.name}'
#libxc: '{name}/{version}-{compiler.name}'
2 changes: 1 addition & 1 deletion scripts/setup-stackinator
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ tool_base_path="$(pwd)"
# builds in the same pipeline do not conflict
tool_path=`mktemp -d`
tool_repo=https://github.com/eth-cscs/stackinator.git
tool_version=9f21a18cdef561e13bc88706ebf4aea3c7ccd1e0
tool_version=ad2281b2c094b043b2dd256ea224613943f47c14

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

Expand Down

0 comments on commit e32e269

Please sign in to comment.