From 9bdea87692e540265fce6cf1aabdf689dff362f9 Mon Sep 17 00:00:00 2001
From: vsc46128 vscuser <vsc46128@login56.dodrio.os>
Date: Wed, 11 Dec 2024 17:57:45 +0100
Subject: [PATCH] rename partitions in config + add extra logging

---
 CI/hortense_EESSI_ss/ci_config.sh | 12 +-----------
 CI/hortense_local_ss/ci_config.sh | 19 +++++++------------
 CI/run_reframe.sh                 |  4 ++++
 config/vsc_hortense.py            |  8 ++++----
 4 files changed, 16 insertions(+), 27 deletions(-)

diff --git a/CI/hortense_EESSI_ss/ci_config.sh b/CI/hortense_EESSI_ss/ci_config.sh
index af0c78e1..1fd49eb6 100644
--- a/CI/hortense_EESSI_ss/ci_config.sh
+++ b/CI/hortense_EESSI_ss/ci_config.sh
@@ -29,15 +29,5 @@ if [ -z "${SET_LOCAL_MODULE_ENV}"]; then
 fi
 
 if [ -z "${LOCAL_MODULES}"]; then
-    if [ "$TEST_SUITE_PARTITION" == "cpu_rome_256gb" ]; then
-        export LOCAL_MODULES="env/vsc/dodrio/cpu_rome env/slurm/dodrio/cpu_rome"
-    elif [ "$TEST_SUITE_PARTITION" == "cpu_rome_512gb" ]; then
-        export LOCAL_MODULES="env/vsc/dodrio/cpu_rome_512 env/slurm/dodrio/cpu_rome_512"
-    elif [ "$TEST_SUITE_PARTITION" == "gpu_rome_a100_40gb" ]; then
-        export LOCAL_MODULES="env/vsc/dodrio/gpu_rome_a100_40 env/slurm/dodrio/gpu_rome_a100_40"
-    elif [ "$TEST_SUITE_PARTITION" == "gpu_rome_a100_80gb" ]; then
-        export LOCAL_MODULES="env/vsc/dodrio/gpu_rome_a100_80 env/slurm/dodrio/gpu_rome_a100_80"
-    else
-        export LOCAL_MODULES="env/vsc/dodrio/${TEST_SUITE_PARTITION} env/slurm/dodrio/${TEST_SUITE_PARTITION}"
-    fi
+    export LOCAL_MODULES="env/vsc/dodrio/${TEST_SUITE_PARTITION} env/slurm/dodrio/${TEST_SUITE_PARTITION}"
 fi
diff --git a/CI/hortense_local_ss/ci_config.sh b/CI/hortense_local_ss/ci_config.sh
index d6346f9f..4fd21271 100644
--- a/CI/hortense_local_ss/ci_config.sh
+++ b/CI/hortense_local_ss/ci_config.sh
@@ -23,20 +23,15 @@ if [ -z "${RFM_CONFIG_FILES}" ]; then
     export RFM_CONFIG_FILES="${TEMPDIR}/test-suite/config/vsc_hortense.py"
 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
-    if [ "$TEST_SUITE_PARTITION" == "cpu_rome_256gb" ]; then
-        export LOCAL_MODULES="cluster/dodrio/cpu_rome"
-    elif [ "$TEST_SUITE_PARTITION" == "cpu_rome_512gb" ]; then
-	export LOCAL_MODULES="cluster/dodrio/cpu_rome_512"
-    elif [ "$TEST_SUITE_PARTITION" == "gpu_rome_a100_40gb" ]; then
-        export LOCAL_MODULES="cluster/dodrio/gpu_rome_a100_40"
-    elif [ "$TEST_SUITE_PARTITION" == "gpu_rome_a100_80gb" ]; then
-        export LOCAL_MODULES="cluster/dodrio/gpu_rome_a100_80"
-    else
-        export LOCAL_MODULES="cluster/dodrio/${TEST_SUITE_PARTITION}"
-    fi
-fi    
+    export LOCAL_MODULES="cluster/dodrio/${TEST_SUITE_PARTITION}"
+fi
diff --git a/CI/run_reframe.sh b/CI/run_reframe.sh
index 0dd4cfd2..e458ffc2 100755
--- a/CI/run_reframe.sh
+++ b/CI/run_reframe.sh
@@ -81,6 +81,9 @@ fi
 if [ -z "${UNSET_MODULEPATH}" ]; then
     export UNSET_MODULEPATH=True
 fi
+if [ -z "${SET_LOCAL_MODULE_ENV}" ]; then
+    export SET_LOCAL_MODULE_ENV=False
+fi
 
 # Create virtualenv for ReFrame using system python
 python3 -m venv "${TEMPDIR}"/reframe_venv
@@ -143,6 +146,7 @@ echo "ReFrame check search recursive: ${RFM_CHECK_SEARCH_RECURSIVE}"
 echo "ReFrame prefix: ${RFM_PREFIX}"
 echo "ReFrame args: ${REFRAME_ARGS}"
 echo "Using EESSI: ${USE_EESSI_SOFTWARE_STACK}"
+echo "Using local software stack ${SET_LOCAL_MODULE_ENV}"
 echo "MODULEPATH: ${MODULEPATH}"
 echo ""
 
diff --git a/config/vsc_hortense.py b/config/vsc_hortense.py
index ba06d690..99157250 100644
--- a/config/vsc_hortense.py
+++ b/config/vsc_hortense.py
@@ -60,7 +60,7 @@ def command(self, job):
             'modules_system': 'lmod',
             'partitions': [
                 {
-                    'name': 'cpu_rome_256gb',
+                    'name': 'cpu_rome',
                     'scheduler': 'slurm',
                     'prepare_cmds': [prepare_eessi_init, common_eessi_init()],
                     'access': hortense_access + ['--partition=cpu_rome'],
@@ -85,7 +85,7 @@ def command(self, job):
                     },
                 },
                 {
-                    'name': 'cpu_rome_512gb',
+                    'name': 'cpu_rome_512',
                     'scheduler': 'slurm',
                     'prepare_cmds': [prepare_eessi_init, common_eessi_init()],
                     'access': hortense_access + ['--partition=cpu_rome_512'],
@@ -135,7 +135,7 @@ def command(self, job):
                     },
                 },
                 {
-                    'name': 'gpu_rome_a100_40gb',
+                    'name': 'gpu_rome_a100_40',
                     'scheduler': 'slurm',
                     'prepare_cmds': [prepare_eessi_init, common_eessi_init()],
                     'access': hortense_access + ['--partition=gpu_rome_a100_40'],
@@ -172,7 +172,7 @@ def command(self, job):
 
                 },
                 {
-                    'name': 'gpu_rome_a100_80gb',
+                    'name': 'gpu_rome_a100_80',
                     'scheduler': 'slurm',
                     'prepare_cmds': [prepare_eessi_init, common_eessi_init()],
                     'access': hortense_access + ['--partition=gpu_rome_a100_80'],