Merge pull request #223 from laraPPr/CI_Hortense

Run local stack of Hortense using `shed_access_in_submit`
EESSI · Jan 6, 2025 · 8f2e7aa · 8f2e7aa
2 parents 82bd926 + 9323665
commit 8f2e7aa
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 18 deletions.
diff --git a/CI/hortense_local_ss/ci_config.sh b/CI/hortense_local_ss/ci_config.sh
@@ -1,14 +1,16 @@
 # 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 [[ "$TEST_SUITE_PARTITION" == "GPU" ]]; then
+    module --force purge
+    if [ -z "${SET_LOCAL_MODULE_ENV}"]; then
+        export SET_LOCAL_MODULE_ENV=True
+    fi
+    if [ -z "${LOCAL_MODULES}"]; then
+        export LOCAL_MODULES="cluster/dodrio/gpu_rome_a100"
+    fi
 fi
 
 if [ -z "${REFRAME_ARGS}" ]; then
-    REFRAME_ARGS="--tag CI --tag 1_node|2_nodes --system hortense:${TEST_SUITE_PARTITION}"
+    REFRAME_ARGS="--tag CI --tag 1_node|2_nodes"
 fi
 
 if [ -z "${USE_EESSI_SOFTWARE_STACK}" ]; then
@@ -21,13 +23,4 @@ fi
 
 if [ -z "${UNSET_MODULEPATH}" ]; then
     export UNSET_MODULEPATH=False
-    module --force purge
-fi
-
-if [ -z "${SET_LOCAL_MODULE_ENV}"]; then
-    export SET_LOCAL_MODULE_ENV=True
-fi
-
-if [ -z "${LOCAL_MODULES}"]; then
-    export LOCAL_MODULES="cluster/dodrio/${TEST_SUITE_PARTITION}"
 fi
diff --git a/config/vsc_hortense.py b/config/vsc_hortense.py
@@ -4,8 +4,7 @@
 # authors: Samuel Moors (VUB-HPC), Kenneth Hoste (HPC-UGent), Lara Peeters (HPC-UGent)
 
 # Use generated topology file by ReFrame for CPU partitions
-# Cannot use autodetection untill new functionality of `sched_options` is part of
-# the ReFrame release https://github.com/reframe-hpc/reframe/issues/2970
+# `shed_access_in_submit` does not work with setting `'remote_detect': True,`
 
 # Instructions on generating topology file
 # ```
@@ -64,6 +63,9 @@ def command(self, job):
                     'scheduler': 'slurm',
                     'prepare_cmds': [prepare_eessi_init, common_eessi_init()],
                     'access': hortense_access + ['--partition=cpu_rome'],
+                    'sched_options': {
+                        'shed_access_in_submit': True,
+                    },
                     'environs': ['default'],
                     'descr': 'CPU nodes (AMD Rome, 256GiB RAM)',
                     'max_jobs': 20,
@@ -89,6 +91,9 @@ def command(self, job):
                     'scheduler': 'slurm',
                     'prepare_cmds': [prepare_eessi_init, common_eessi_init()],
                     'access': hortense_access + ['--partition=cpu_rome_512'],
+                    'sched_options': {
+                        'shed_access_in_submit': True,
+                    },
                     'environs': ['default'],
                     'descr': 'CPU nodes (AMD Rome, 512GiB RAM)',
                     'max_jobs': 20,
@@ -114,6 +119,9 @@ def command(self, job):
                     'scheduler': 'slurm',
                     'prepare_cmds': [prepare_eessi_init, common_eessi_init()],
                     'access': hortense_access + ['--partition=cpu_milan'],
+                    'sched_options': {
+                        'shed_access_in_submit': True,
+                    },
                     'environs': ['default'],
                     'descr': 'CPU nodes (AMD Milan, 256GiB RAM)',
                     'max_jobs': 20,
@@ -139,6 +147,9 @@ def command(self, job):
                     'scheduler': 'slurm',
                     'prepare_cmds': [prepare_eessi_init, common_eessi_init()],
                     'access': hortense_access + ['--partition=gpu_rome_a100_40'],
+                    'sched_options': {
+                        'shed_access_in_submit': True,
+                    },
                     'environs': ['default'],
                     'descr': 'GPU nodes (A100 40GB)',
                     'max_jobs': 20,
@@ -176,6 +187,9 @@ def command(self, job):
                     'scheduler': 'slurm',
                     'prepare_cmds': [prepare_eessi_init, common_eessi_init()],
                     'access': hortense_access + ['--partition=gpu_rome_a100_80'],
+                    'sched_options': {
+                        'shed_access_in_submit': True,
+                    },
                     'environs': ['default'],
                     'descr': 'GPU nodes (A100 80GB)',
                     'max_jobs': 20,