From b65a2e7c38e046ed8213594e1e77770729e82a4d Mon Sep 17 00:00:00 2001
From: Nicolas Richart <nicolas.richart@epfl.ch>
Date: Wed, 24 Jan 2024 17:24:43 +0100
Subject: [PATCH] More unplaned changes to use jed
---
.gitlab-ci.yml | 16 ++++++++--------
spack.yaml | 6 ++++++
2 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 72d401e..534762a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -16,19 +16,13 @@ workflow:
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
variables:
- BUILDCACHE: "/work/scitas-ge/richart/buildcache"
- SPACK_PATH: "/work/scitas-ge/richart/ci_cache/spack/${CI_JOB_ID}"
- STACK_PATH: "/work/scitas-ge/richart/ci_cache/stack/${CI_JOB_ID}"
- SPACK_DISABLE_LOCAL_CONFIG: "true"
- SPACK_USER_CACHE_PATH: "/tmp/spack_cache_${CI_JOB_ID}"
- SPACK_SITE_CONFIG_PATH: "/stack/spack/etc"
# ------------------------------------------------------------------------------
.parallel_job:
image: registry.c4science.ch/scitas-stack/rhel:9.3
parallel:
matrix:
- - environment: [helvetios]
- slurm_options: ["-c 36"]
+# - environment: [helvetios]
+# slurm_options: ["-c 36"]
- environment: [jed]
slurm_options: ["-c 72 -p jed -q jed"]
# - environment: [izar]
@@ -40,6 +34,12 @@ variables:
variables:
COMMAND_OPTIONS_SBATCH: ${slurm_options}
APPTAINER_EXEC_OPTIONS: ${apptainer_options} --bind ${BUILDCACHE}:/buildcache:rw --bind ${SPACK_PATH}:/spack:rw --bind ${STACK_PATH}:/stack:rw --writable-tmpfs
+ SPACK_DISABLE_LOCAL_CONFIG: "true"
+ SPACK_USER_CACHE_PATH: "/tmp/spack_cache_${CI_JOB_ID}"
+ SPACK_SITE_CONFIG_PATH: "/stack/spack/etc"
+ BUILDCACHE: "/work/scitas-ge/richart/buildcache"
+ SPACK_PATH: "/work/scitas-ge/richart/ci_cache/spack/${environment}"
+ STACK_PATH: "/work/scitas-ge/richart/ci_cache/stack/${environment}"
# ------------------------------------------------------------------------------
spack:setup:
diff --git a/spack.yaml b/spack.yaml
index 380a36a..d465981 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -9,6 +9,9 @@ spack:
- when: env['environment'] == 'helvetios'
serial_codes_per_cluster:
- ucx +rdmacm +rc +dc +ud +cma +mlx5_dv +parameter_checking +thread_multiple +verbs ~cuda ~gdrcopy
+ - when: env['environment'] == 'jed'
+ serial_codes_per_cluster:
+ - ucx +rdmacm +rc +dc +ud +cma +mlx5_dv +parameter_checking +thread_multiple +verbs ~cuda ~gdrcopy
- when: env['environment'] == 'izar'
serial_codes_per_cluster:
- ucx +rdmacm +rc +dc +ud +cma +mlx5_dv +parameter_checking +thread_multiple +verbs +cuda cuda_arch=70 +gdrcopy
@@ -19,6 +22,9 @@ spack:
- when: env['environment'] == 'helvetios'
mpis:
- openmpi fabrics=ofi,ucx,verbs schedulers=slurm ~rsh +gpfs
+ - when: env['environment'] == 'jed'
+ mpis:
+ - openmpi fabrics=ofi,ucx,verbs schedulers=slurm ~rsh +gpfs
- when: env['environment'] == 'izar'
mpis:
- openmpi fabrics=ofi,ucx,verbs schedulers=slurm ~rsh +gpfs +cuda cuda_arch=70
--
GitLab