Support multiple EESSI versions by using ReFrame environments

.github/workflows/pip_install.yml

@@ -30,9 +30,9 @@
 
         - name: Install ReFrame
           run: |
-            python -m pip install --user reframe-hpc
+            python -m pip install --user reframe-hpc==4.9.3
             # remove hpctestlib directory, which is automatically installed with reframe-hpc
-            pip show reframe-hpc | grep Location | cut -d ' ' -f 2 | xargs -I {} rm -r {}/hpctestlib
+            pip show reframe-hpc | grep Location | cut -d ' ' -f 2 | xargs -I {} rm -rf {}/hpctestlib
 
         - name: Install EESSI test suite with 'pip install'
           run: |

config/aws_mc.py

@@ -12,7 +12,7 @@
 
 import os
 
-from eessi.testsuite.common_config import (common_eessi_init, common_general_config, common_logging_config,
+from eessi.testsuite.common_config import (common_general_config, common_logging_config,
                                            set_common_required_config)
 from eessi.testsuite.constants import EXTRAS, FEATURES, SCALES
 
@@ -112,7 +112,9 @@
         FEATURES.CPU
     ] + list(SCALES.keys()),
     'prepare_cmds': [
-        common_eessi_init(),
+        # This system doesn't have an lmod installation by default, so source one from EESSI
+        'source /cvmfs/software.eessi.io/2025.06/init/lmod/bash',
+        'module unload EESSI',
         # Required when using srun as launcher with --export=NONE in partition access, in order to ensure job
         # steps inherit environment. It doesn't hurt to define this even if srun is not used
         'export SLURM_EXPORT_ENV=ALL'

config/bsc_marenostrum5.py

@@ -1,6 +1,6 @@
 import os
 
-from eessi.testsuite.common_config import (common_eessi_init, common_general_config, common_logging_config,
+from eessi.testsuite.common_config import (common_general_config, common_logging_config,
                                            get_sbatch_account, set_common_required_config)
 from eessi.testsuite.constants import DEVICE_TYPES, EXTRAS, FEATURES, GPU_VENDORS, SCALES
 
@@ -30,7 +30,6 @@
                     'env_vars': [],
                     'prepare_cmds': [
                         "module unuse /apps/GPP/modulefiles/applications",
-                        common_eessi_init(),
                         'export OMPI_MCA_pml=ucx',
                         # Work around "Failed to modify UD QP to INIT on mlx5_0: Operation not permitted" issue
                         # until we can resolve this through an LMOD hook in host_injections.
@@ -60,7 +59,6 @@
                     'env_vars': [],
                     'prepare_cmds': [
                         "module unuse /apps/GPP/modulefiles/applications",
-                        common_eessi_init(),
                         'export OMPI_MCA_pml=ucx',
                         # Work around "Failed to modify UD QP to INIT on mlx5_0: Operation not permitted" issue
                         # until we can resolve this through an LMOD hook in host_injections.

config/github_actions.py

@@ -16,7 +16,6 @@
                     'name': 'default',
                     'scheduler': 'local',
                     'launcher': 'local',
-                    'environs': ['default'],
                     'features': [FEATURES.CPU] + list(SCALES.keys()),
                     'processor': {
                         'num_cpus': 2,

config/it4i_karolina.py

@@ -15,7 +15,7 @@
 
 import os
 
-from eessi.testsuite.common_config import (common_eessi_init, common_general_config, common_logging_config,
+from eessi.testsuite.common_config import (common_general_config, common_logging_config,
                                            get_sbatch_account, set_common_required_config)
 from eessi.testsuite.constants import EXTRAS, FEATURES, SCALES
 
@@ -42,7 +42,6 @@
                     'name': 'qcpu',
                     'scheduler': 'slurm',
                     'prepare_cmds': [
-                        common_eessi_init(),
                         # Pass job environment variables like $PATH, etc., into job steps
                         'export SLURM_EXPORT_ENV=ALL',
                         # Needed when using srun launcher
@@ -77,7 +76,6 @@
                 #     'name': 'qgpu',
                 #     'scheduler': 'slurm',
                 #     'prepare_cmds': [
-                #         common_eessi_init(),
                 #         # Pass job environment variables like $PATH, etc., into job steps
                 #         'export SLURM_EXPORT_ENV=ALL',
                 #         # Needed when using srun launcher

config/izum_vega.py

@@ -15,7 +15,7 @@
 
 import os
 
-from eessi.testsuite.common_config import (common_eessi_init, common_general_config, common_logging_config,
+from eessi.testsuite.common_config import (common_general_config, common_logging_config,
                                            set_common_required_config)
 from eessi.testsuite.constants import EXTRAS, DEVICE_TYPES, FEATURES, GPU_VENDORS, SCALES
 
@@ -37,7 +37,6 @@
                     'name': 'cpu',
                     'scheduler': 'slurm',
                     'prepare_cmds': [
-                        common_eessi_init(),
                         # Pass job environment variables like $PATH, etc., into job steps
                         'export SLURM_EXPORT_ENV=ALL',
                         # Needed when using srun launcher
@@ -66,7 +65,6 @@
                     'name': 'gpu',
                     'scheduler': 'slurm',
                     'prepare_cmds': [
-                        common_eessi_init(),
                         # Pass job environment variables like $PATH, etc., into job steps
                         'export SLURM_EXPORT_ENV=ALL',
                         # Needed when using srun launcher

config/macc_deucalion.py

@@ -1,6 +1,6 @@
 import os
 
-from eessi.testsuite.common_config import (common_eessi_init, common_general_config, common_logging_config,
+from eessi.testsuite.common_config import (common_general_config, common_logging_config,
                                            set_common_required_config)
 from eessi.testsuite.constants import EXTRAS, FEATURES, SCALES
 
@@ -26,7 +26,6 @@
                         # bypass CPU autodetection for now aarch64/a64fx,
                         # see https://github.com/EESSI/software-layer/pull/608
                         'export EESSI_SOFTWARE_SUBDIR_OVERRIDE=aarch64/a64fx',
-                        common_eessi_init(),
                         # Pass job environment variables like $PATH, etc., into job steps
                         'export SLURM_EXPORT_ENV=HOME,PATH,LD_LIBRARY_PATH,PYTHONPATH',
                     ],

config/settings_example.py

@@ -41,7 +41,12 @@
                     'launcher': 'mpirun',
                     'access': ['-p cpu', '--export=None'],
                     'prepare_cmds': [
-                        common_eessi_init(),
+                        # If your system doesn't have an Lmod installation by default on the batch nodes
+                        # Uncommenting the following two lines will use one from EESSI. Note that it is up to you
+                        # to pick a version for EESSI from which you'd like to use the lmod installation - it's
+                        # hard-coded to 2025.06 here.
+                        # 'source /cvmfs/software.eessi.io/2025.06/init/lmod/bash',
+                        # 'module unload EESSI',
                         # Pass job environment variables like $PATH, etc., into job steps
                         'export SLURM_EXPORT_ENV=ALL',
                     ],

config/surf_snellius.py

@@ -15,7 +15,7 @@
 
 import os
 
-from eessi.testsuite.common_config import (common_eessi_init, common_general_config, common_logging_config,
+from eessi.testsuite.common_config import (common_general_config, common_logging_config,
                                            set_common_required_config)
 from eessi.testsuite.constants import EXTRAS, DEVICE_TYPES, FEATURES, GPU_VENDORS, SCALES
 
@@ -42,7 +42,6 @@
                 {
                     'name': 'rome',
                     'scheduler': 'slurm',
-                    'prepare_cmds': [common_eessi_init()],
                     'launcher': 'mpirun',
                     'access': ['-p rome', '--export=None'],
                     'max_jobs': 120,
@@ -59,12 +58,6 @@
                 {
                     'name': 'genoa',
                     'scheduler': 'slurm',
-                    'prepare_cmds': [
-                        # EESSI init script (for now) falls back to zen3, since the zen4 is incomplete
-                        # But, we want to really test the zen4 branch on these nodes
-                        'export EESSI_SOFTWARE_SUBDIR_OVERRIDE=x86_64/amd/zen4',
-                        common_eessi_init()
-                    ],
                     'launcher': 'mpirun',
                     'access': ['-p genoa', '--export=None'],
                     'max_jobs': 120,
@@ -81,7 +74,6 @@
                 {
                     'name': 'gpu_A100',
                     'scheduler': 'slurm',
-                    'prepare_cmds': [common_eessi_init()],
                     'launcher': 'mpirun',
                     'access': ['-p gpu_a100', '--export=None'],
                     'max_jobs': 60,
@@ -106,7 +98,6 @@
                 {
                     'name': 'gpu_H100',
                     'scheduler': 'slurm',
-                    'prepare_cmds': [common_eessi_init()],
                     'launcher': 'mpirun',
                     'access': ['-p gpu_h100', '--export=None'],
                     'max_jobs': 60,

config/vsc_hortense.py

@@ -22,11 +22,11 @@
 # ```
 import os
 
-from eessi.testsuite.common_config import (common_eessi_init, common_general_config, common_logging_config,
+from eessi.testsuite.common_config import (common_general_config, common_logging_config,
                                            get_sbatch_account, set_common_required_config)
 from eessi.testsuite.constants import EXTRAS, DEVICE_TYPES, FEATURES, GPU_VENDORS, SCALES
 
-hortense_access = ['--export=NONE', '--get-user-env=60L']
+hortense_access = ['--export=NONE', '--get-user-env']
 
 # Note that we rely on the SBATCH_ACCOUNT environment variable to be specified
 # From ReFrame 4.8.1 we can no longer rely on SBATCH_ACCOUNT completely
@@ -46,9 +46,10 @@
 post_init = 'unset SLURM_EXPORT_ENV'
 launcher = "mpirun"
 
-eessi_cvmfs_repo = os.getenv('EESSI_CVMFS_REPO', None)
-if eessi_cvmfs_repo is not None:
-    prepare_eessi_init = "module --force purge"
+eessi_modulepath = '/cvmfs/software.eessi.io/init/modules'
+modulepaths = os.getenv('MODULEPATH', '').split(':')
+if eessi_modulepath in modulepaths:
+    prepare_eessi_init = f"module --force purge && module use {eessi_modulepath}"
     mpi_module = "env/vsc/dodrio/{}"
 else:
     prepare_eessi_init = ""
@@ -70,7 +71,6 @@
                     'scheduler': 'slurm',
                     'prepare_cmds': [
                         prepare_eessi_init,
-                        common_eessi_init(),
                         post_init,
                     ],
                     'access': hortense_access + ['--partition=cpu_rome_rhel9'],
@@ -81,6 +81,7 @@
                     'descr': 'CPU nodes (AMD Rome, 256GiB RAM)',
                     'max_jobs': 20,
                     'launcher': launcher,
+                    'environs': ['default'],
                     'modules': [mpi_module.format('cpu_rome_rhel9')],
                     'features': [
                         FEATURES.CPU,
@@ -96,7 +97,6 @@
                     'scheduler': 'slurm',
                     'prepare_cmds': [
                         prepare_eessi_init,
-                        common_eessi_init(),
                         post_init,
                     ],
                     'access': hortense_access + ['--partition=cpu_rome_512_rhel9'],
@@ -107,6 +107,7 @@
                     'descr': 'CPU nodes (AMD Rome, 512GiB RAM)',
                     'max_jobs': 20,
                     'launcher': launcher,
+                    'environs': ['default'],
                     'modules': [mpi_module.format('cpu_rome_512_rhel9')],
                     'features': [
                         FEATURES.CPU,
@@ -122,7 +123,6 @@
                     'scheduler': 'slurm',
                     'prepare_cmds': [
                         prepare_eessi_init,
-                        common_eessi_init(),
                         post_init,
                     ],
                     'access': hortense_access + ['--partition=cpu_milan_rhel9'],
@@ -133,6 +133,7 @@
                     'descr': 'CPU nodes (AMD Milan, 256GiB RAM)',
                     'max_jobs': 20,
                     'launcher': launcher,
+                    'environs': ['default'],
                     'modules': [mpi_module.format('cpu_milan_rhel9')],
                     'features': [
                         FEATURES.CPU,
@@ -148,7 +149,6 @@
                     'scheduler': 'slurm',
                     'prepare_cmds': [
                         prepare_eessi_init,
-                        common_eessi_init(),
                         post_init,
                     ],
                     'access': hortense_access + ['--partition=gpu_rome_a100_40'],
@@ -159,6 +159,7 @@
                     'descr': 'GPU nodes (A100 40GB)',
                     'max_jobs': 20,
                     'launcher': launcher,
+                    'environs': ['default'],
                     'modules': [mpi_module.format('gpu_rome_a100_40')],
                     'features': [
                         FEATURES.GPU,
@@ -182,7 +183,6 @@
                     'scheduler': 'slurm',
                     'prepare_cmds': [
                         prepare_eessi_init,
-                        common_eessi_init(),
                         post_init,
                     ],
                     'access': hortense_access + ['--partition=gpu_rome_a100_80'],
@@ -193,6 +193,7 @@
                     'descr': 'GPU nodes (A100 80GB)',
                     'max_jobs': 20,
                     'launcher': launcher,
+                    'environs': ['default'],
                     'modules': [mpi_module.format('gpu_rome_a100_80')],
                     'features': [
                         FEATURES.GPU,
@@ -214,11 +215,15 @@
             ]
         },
     ],
+    'environments': [
+        {
+            'name': 'default',
+        },
+    ],
     'general': [
         {
             'remote_detect': True,
             'purge_environment': True,
-            'resolve_module_conflicts': False,  # avoid loading the module before submitting the job
             **common_general_config()
         }
     ],