have different launcher depending on using EESSI or not

EESSI · Dec 11, 2024 · c74d4af · c74d4af
1 parent 5637be5
commit c74d4af
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 12 deletions.
diff --git a/CI/hortense_EESSI_ss/ci_config.sh b/CI/hortense_EESSI_ss/ci_config.sh
@@ -1,14 +1,14 @@
 # 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 needs to be TEST_SUITE_PARTITION=cpu_rome_256gb"
-   echo "untill new functionality of `sched_options` is part of"
-   echo "# the ReFrame release https://github.com/reframe-hpc/reframe/issues/2970"
+   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
 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_core --system hortense:${TEST_SUITE_PARTITION}"
 fi
 
 if [ -z "${UNSET_MODULEPATH}" ]; then

diff --git a/config/vsc_hortense.py b/config/vsc_hortense.py
@@ -21,6 +21,7 @@
 #    reframe --detect-host-topology \
 #        ~/.reframe/topology/hortense-{partition_name}/processor.json
 # ```
+import os
 
 from reframe.core.backends import register_launcher
 from reframe.core.launchers import JobLauncher
@@ -44,13 +45,11 @@ def command(self, job):
 if eessi_cvmfs_repo is not None:
     prepare_eessi_init = "module --force purge"
     launcher = "mpirun"
-    env_module = "env/vsc/dodrio/%(partition)s env/slurm/dodrio/%(partition)s"
-    mpi_module = ""
+    mpi_module = "env/vsc/dodrio/%s"
 else:
     prepare_eessi_init = ""
     launcher = "mympirun"
     mpi_module = "vsc-mympirun"
-    env_module = ""
 
 site_configuration = {
     'systems': [
@@ -69,7 +68,7 @@ def command(self, job):
                     'descr': 'CPU nodes (AMD Rome, 256GiB RAM)',
                     'max_jobs': 20,
                     'launcher': launcher,
-                    'modules': [mpi_module, env_module % {'partition': "cpu_rome"}],
+                    'modules': [mpi_module % 'cpu_rome'],
                     'resources': [
                         {
                             'name': 'memory',
@@ -94,7 +93,7 @@ def command(self, job):
                     'descr': 'CPU nodes (AMD Rome, 512GiB RAM)',
                     'max_jobs': 20,
                     'launcher': launcher,
-                    'modules': [mpi_module, env_module % {'partition': "cpu_rome_512"}],
+                    'modules': [mpi_module % 'cpu_rome_512'],
                     'resources': [
                         {
                             'name': 'memory',
@@ -119,7 +118,7 @@ def command(self, job):
                     'descr': 'CPU nodes (AMD Milan, 256GiB RAM)',
                     'max_jobs': 20,
                     'launcher': launcher,
-                    'modules': [mpi_module, env_module % {'partition': "cpu_milan"}],
+                    'modules': [mpi_module % 'cpu_milan'],
                     'resources': [
                         {
                             'name': 'memory',
@@ -144,7 +143,7 @@ def command(self, job):
                     'descr': 'GPU nodes (A100 40GB)',
                     'max_jobs': 20,
                     'launcher': launcher,
-                    'modules': [mpi_module, env_module % {'partition': "gpu_rome_a100_40"}],
+                    'modules': [mpi_module % 'gpu_rome_a100_40'],
                     'features': [
                         FEATURES[GPU],
                     ] + list(SCALES.keys()),
@@ -181,7 +180,7 @@ def command(self, job):
                     'descr': 'GPU nodes (A100 80GB)',
                     'max_jobs': 20,
                     'launcher': launcher,
-                    'modules': [mpi_module, env_module % {'partition': "gpu_rome_a100_80"}],
+                    'modules': [mpi_module % 'gpu_rome_a100_80'],
                     'features': [
                         FEATURES[GPU],
                     ] + list(SCALES.keys()),