From b201c533c2271f6b4815661850570c26576e120c Mon Sep 17 00:00:00 2001
From: Caspar van Leeuwen <casparl@tcn1.local.snellius.surf.nl>
Date: Wed, 18 Sep 2024 21:26:17 +0200
Subject: [PATCH 1/6] Added CUDA-12.1.1

---
 .../2023.06/eessi-2023.06-eb-4.9.3-001-system-CUDA.yml          | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.3-001-system-CUDA.yml

diff --git a/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.3-001-system-CUDA.yml b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.3-001-system-CUDA.yml
new file mode 100644
index 0000000000..630bf6aa25
--- /dev/null
+++ b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.3-001-system-CUDA.yml
@@ -0,0 +1,2 @@
+easyconfigs:
+  - CUDA-12.1.1.eb

From e8f92f62f83c5c939467edb863c995e829a808d1 Mon Sep 17 00:00:00 2001
From: Caspar van Leeuwen <casparl@tcn1.local.snellius.surf.nl>
Date: Wed, 18 Sep 2024 21:54:24 +0200
Subject: [PATCH 2/6] Rebuild CUDA in accelerator prefix

---
 .../2023.06/eessi-2023.06-eb-4.9.3-001-system-CUDA.yml     | 2 --
 .../20240918-eb-4.9.3-CUDA-12.1.1-in-accel-prefix.yml      | 7 +++++++
 2 files changed, 7 insertions(+), 2 deletions(-)
 delete mode 100644 easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.3-001-system-CUDA.yml
 create mode 100644 easystacks/software.eessi.io/2023.06/rebuilds/20240918-eb-4.9.3-CUDA-12.1.1-in-accel-prefix.yml

diff --git a/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.3-001-system-CUDA.yml b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.3-001-system-CUDA.yml
deleted file mode 100644
index 630bf6aa25..0000000000
--- a/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.3-001-system-CUDA.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-easyconfigs:
-  - CUDA-12.1.1.eb
diff --git a/easystacks/software.eessi.io/2023.06/rebuilds/20240918-eb-4.9.3-CUDA-12.1.1-in-accel-prefix.yml b/easystacks/software.eessi.io/2023.06/rebuilds/20240918-eb-4.9.3-CUDA-12.1.1-in-accel-prefix.yml
new file mode 100644
index 0000000000..755bea096e
--- /dev/null
+++ b/easystacks/software.eessi.io/2023.06/rebuilds/20240918-eb-4.9.3-CUDA-12.1.1-in-accel-prefix.yml
@@ -0,0 +1,7 @@
+# 2024.09.18
+# We need to reinstall CUDA in the accelerator prefixes
+# See https://github.com/EESSI/software-layer/pull/720
+easyconfigs:
+  - CUDA-12.1.1.eb:
+      options:
+        accept-eula-for: CUDA

From 78fbc1e86412379e382e473f36bf7ae98b1613e2 Mon Sep 17 00:00:00 2001
From: Caspar van Leeuwen <casparl@tcn1.local.snellius.surf.nl>
Date: Wed, 18 Sep 2024 22:17:47 +0200
Subject: [PATCH 3/6] make sure removal script also takes software prefix into
 account

---
 EESSI-remove-software.sh | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/EESSI-remove-software.sh b/EESSI-remove-software.sh
index 446a156cb8..e435dd8088 100755
--- a/EESSI-remove-software.sh
+++ b/EESSI-remove-software.sh
@@ -79,6 +79,17 @@ echo ">> Setting up \$MODULEPATH..."
 module --force purge
 # ignore current $MODULEPATH entirely
 module unuse $MODULEPATH
+
+# if an accelerator target is specified, we need to make sure that the CPU-only modules are also still available
+if [ ! -z ${EESSI_ACCELERATOR_TARGET} ]; then
+    CPU_ONLY_MODULES_PATH=$(echo $EASYBUILD_INSTALLPATH | sed "s@/accel/${EESSI_ACCELERATOR_TARGET}@@g")/modules/all
+    if [ -d ${CPU_ONLY_MODULES_PATH} ]; then
+        module use ${CPU_ONLY_MODULES_PATH}
+    else
+        fatal_error "Derived path to CPU-only modules does not exist: ${CPU_ONLY_MODULES_PATH}"
+    fi
+fi
+
 module use $EASYBUILD_INSTALLPATH/modules/all
 if [[ -z ${MODULEPATH} ]]; then
     fatal_error "Failed to set up \$MODULEPATH?!"

From 20b65e67e633f68f49c9beb5129d03043aee6ad6 Mon Sep 17 00:00:00 2001
From: Caspar van Leeuwen <casparl@tcn1.local.snellius.surf.nl>
Date: Wed, 18 Sep 2024 23:01:49 +0200
Subject: [PATCH 4/6] Make sure we remove from where the module is really
 located - and not just assume that it's in EASYBUILD_INSTALLPATH

---
 EESSI-remove-software.sh | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/EESSI-remove-software.sh b/EESSI-remove-software.sh
index e435dd8088..25593b5a79 100755
--- a/EESSI-remove-software.sh
+++ b/EESSI-remove-software.sh
@@ -120,8 +120,12 @@ if [ $EUID -eq 0 ]; then
                 #  * [R] $CFGS/s/someapp/someapp-someversion.eb (module: someapp/someversion)
                 rebuild_apps=$(eb --allow-use-as-root-and-accept-consequences --dry-run-short --rebuild --easystack ${easystack_file} | grep "^ \* \[R\]" | grep -o "module: .*[^)]" | awk '{print $2}')
                 for app in ${rebuild_apps}; do
-                    app_dir=${EASYBUILD_INSTALLPATH}/software/${app}
-                    app_module=${EASYBUILD_INSTALLPATH}/modules/all/${app}.lua
+                    # Returns e.g. /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/amd/zen2/modules/all:
+                    app_modulepath=$(module --terse av ${app} 2>&1 | head -n 1 | sed 's/://')
+                    # Two dirname invocations, so returns e.g. /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/amd/zen2
+                    app_installprefix=$(dirname $(dirname app_modulpath))
+                    app_dir=${app_installprefix}/software/${app}
+                    app_module=${app_installprefix}/modules/all/${app}.lua
                     echo_yellow "Removing ${app_dir} and ${app_module}..."
                     rm -rf ${app_dir}
                     rm -rf ${app_module}

From 4b3612dc807edc3988eb2d1727a812afcd751d7e Mon Sep 17 00:00:00 2001
From: Caspar van Leeuwen <casparl@tcn1.local.snellius.surf.nl>
Date: Wed, 18 Sep 2024 23:11:35 +0200
Subject: [PATCH 5/6] Fix typo

---
 EESSI-remove-software.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/EESSI-remove-software.sh b/EESSI-remove-software.sh
index 25593b5a79..05572257a5 100755
--- a/EESSI-remove-software.sh
+++ b/EESSI-remove-software.sh
@@ -123,7 +123,7 @@ if [ $EUID -eq 0 ]; then
                     # Returns e.g. /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/amd/zen2/modules/all:
                     app_modulepath=$(module --terse av ${app} 2>&1 | head -n 1 | sed 's/://')
                     # Two dirname invocations, so returns e.g. /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/amd/zen2
-                    app_installprefix=$(dirname $(dirname app_modulpath))
+                    app_installprefix=$(dirname $(dirname ${app_modulepath}))
                     app_dir=${app_installprefix}/software/${app}
                     app_module=${app_installprefix}/modules/all/${app}.lua
                     echo_yellow "Removing ${app_dir} and ${app_module}..."

From 4f732776fc96e1a779ffb053bd0937137ef6c020 Mon Sep 17 00:00:00 2001
From: Caspar van Leeuwen <casparl@tcn1.local.snellius.surf.nl>
Date: Thu, 19 Sep 2024 07:05:37 +0200
Subject: [PATCH 6/6] Limit this PR to only the EESSI-remove-software.sh change

---
 .../20240918-eb-4.9.3-CUDA-12.1.1-in-accel-prefix.yml      | 7 -------
 1 file changed, 7 deletions(-)
 delete mode 100644 easystacks/software.eessi.io/2023.06/rebuilds/20240918-eb-4.9.3-CUDA-12.1.1-in-accel-prefix.yml

diff --git a/easystacks/software.eessi.io/2023.06/rebuilds/20240918-eb-4.9.3-CUDA-12.1.1-in-accel-prefix.yml b/easystacks/software.eessi.io/2023.06/rebuilds/20240918-eb-4.9.3-CUDA-12.1.1-in-accel-prefix.yml
deleted file mode 100644
index 755bea096e..0000000000
--- a/easystacks/software.eessi.io/2023.06/rebuilds/20240918-eb-4.9.3-CUDA-12.1.1-in-accel-prefix.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-# 2024.09.18
-# We need to reinstall CUDA in the accelerator prefixes
-# See https://github.com/EESSI/software-layer/pull/720
-easyconfigs:
-  - CUDA-12.1.1.eb:
-      options:
-        accept-eula-for: CUDA