diff --git a/CI/hortense_EESSI_ss/ci_config.sh b/CI/hortense_EESSI_ss/ci_config.sh index 6ecaad39..bd407515 100644 --- a/CI/hortense_EESSI_ss/ci_config.sh +++ b/CI/hortense_EESSI_ss/ci_config.sh @@ -1,19 +1,21 @@ # Configurable items -if [ -z "${TEST_SUITE_PARTITION}" ]; then - echo "You have to indicate on which partition the test-suite will run on vsc-Hortense" - echo "This environment variable needs to be set TEST_SUITE_PARTITION=cpu_rome_256gb" - echo "Can only set to 'cpu_rome_256gb' untill new functionality of 'sched_options' is part of" - echo "the ReFrame release https://github.com/reframe-hpc/reframe/issues/2970" - exit 1 +if [ -z "${UNSET_MODULEPATH}" ]; then + export UNSET_MODULEPATH=False + module --force purge fi -if [ -z "${REFRAME_ARGS}" ]; then - REFRAME_ARGS="--tag CI --tag 1_core --system hortense:${TEST_SUITE_PARTITION}" +if [[ "$TEST_SUITE_PARTITION" == "GPU" ]]; then + if [ -z "${SET_LOCAL_MODULE_ENV}"]; then + export SET_LOCAL_MODULE_ENV=True + fi + if [ -z "${LOCAL_MODULES}"]; then + export LOCAL_MODULES="env/slurm/dodrio/gpu_rome_a100" + module use /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/amd/zen2/accel/nvidia/cc80/modules/all + fi fi -if [ -z "${UNSET_MODULEPATH}" ]; then - export UNSET_MODULEPATH=False - module --force purge +if [ -z "${REFRAME_ARGS}" ]; then + REFRAME_ARGS="--tag CI --tag 1_core" fi if [ -z "${USE_EESSI_SOFTWARE_STACK}" ]; then @@ -29,5 +31,5 @@ if [ -z "${SET_LOCAL_MODULE_ENV}"]; then fi if [ -z "${LOCAL_MODULES}"]; then - export LOCAL_MODULES="env/vsc/dodrio/${TEST_SUITE_PARTITION} env/slurm/dodrio/${TEST_SUITE_PARTITION}" + export LOCAL_MODULES="env/slurm/dodrio/cpu_rome" fi diff --git a/config/vsc_hortense.py b/config/vsc_hortense.py index c885d4ee..7f74f79d 100644 --- a/config/vsc_hortense.py +++ b/config/vsc_hortense.py @@ -57,6 +57,9 @@ def command(self, job): 'descr': 'Hortense', 'hostnames': ['login.*.dodrio.os'], 'modules_system': 'lmod', + # Need to set the environment variable to be able to submit to GPU_partitions + # see https://github.com/EESSI/test-suite/issues/242 + 'env_vars': [['SLURM_CONF', '/etc/slurm/slurm.conf_dodrio']], 'partitions': [ { 'name': 'cpu_rome', @@ -145,7 +148,10 @@ def command(self, job): { 'name': 'gpu_rome_a100_40', 'scheduler': 'slurm', - 'prepare_cmds': [prepare_eessi_init, common_eessi_init()], + 'prepare_cmds': [ + prepare_eessi_init, + common_eessi_init(), + ], 'access': hortense_access + ['--partition=gpu_rome_a100_40'], 'sched_options': { 'sched_access_in_submit': True, @@ -185,7 +191,10 @@ def command(self, job): { 'name': 'gpu_rome_a100_80', 'scheduler': 'slurm', - 'prepare_cmds': [prepare_eessi_init, common_eessi_init()], + 'prepare_cmds': [ + prepare_eessi_init, + common_eessi_init(), + ], 'access': hortense_access + ['--partition=gpu_rome_a100_80'], 'sched_options': { 'sched_access_in_submit': True,