From adccbc172b71888691edb9acd4ddde1053cfb82e Mon Sep 17 00:00:00 2001
From: Thomas Roeblitz <thomas.roblitz@uib.no>
Date: Wed, 17 Apr 2024 22:18:47 +0200
Subject: [PATCH 1/3] {2023.06}[foss/2023a] Modflow v6.4.4 and deps

---
 .../2023.06/eessi-2023.06-eb-4.9.1-2023a.yml           | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/easystacks/pilot.nessi.no/2023.06/eessi-2023.06-eb-4.9.1-2023a.yml b/easystacks/pilot.nessi.no/2023.06/eessi-2023.06-eb-4.9.1-2023a.yml
index a271eede48..b4884357f5 100644
--- a/easystacks/pilot.nessi.no/2023.06/eessi-2023.06-eb-4.9.1-2023a.yml
+++ b/easystacks/pilot.nessi.no/2023.06/eessi-2023.06-eb-4.9.1-2023a.yml
@@ -12,3 +12,13 @@ easyconfigs:
   - OpenFOAM-10-foss-2023a.eb
   - PyOpenGL-3.1.7-GCCcore-12.3.0.eb
   - ipympl-0.9.3-foss-2023a.eb
+  - SuperLU_DIST-8.1.2-foss-2023a.eb:
+      options:
+        from-pr: 20162
+  - PETSc-3.20.3-foss-2023a.eb:
+      options:
+        include-easyblocks-from-pr: 3086
+        from-pr: 19686
+  - MODFLOW-6.4.4-foss-2023a.eb:
+      options:
+        from-pr: 20142

From 5b7daf0a871f202db8a6bfed155ea3601fdb2834 Mon Sep 17 00:00:00 2001
From: Thomas Roeblitz <thomas.roblitz@uib.no>
Date: Wed, 24 Apr 2024 22:36:47 +0200
Subject: [PATCH 2/3] try limit number of used cpus

---
 EESSI-install-software.sh | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/EESSI-install-software.sh b/EESSI-install-software.sh
index f996fd626d..533ee87e63 100755
--- a/EESSI-install-software.sh
+++ b/EESSI-install-software.sh
@@ -212,6 +212,15 @@ fi
 #       if not, an error is produced, and the bot flags the whole build as failed (even when not installing GPU software)
 # ${EESSI_PREFIX}/scripts/gpu_support/nvidia/link_nvidia_host_libraries.sh
 
+# determine num cores allocated to job
+# - get job id
+# - run some squeue ... command that just spits out the number of cores allocated
+slurm_jobid=$(ls slurm-*.out | sed -e 's/slurm-//' | sed -e 's/\.out//')
+command -V squeue
+numcpus=$(squeue -j $slurm_jobid -O numcpus || true)
+if [[ numcpus -lt 1 ]];
+    numcpus=1
+fi
 # use PR patch file to determine in which easystack files stuff was added
 changed_easystacks=$(cat ${pr_diff} | grep '^+++' | cut -f2 -d' ' | sed 's@^[a-z]/@@g' | grep '^easystacks/.*yml$' | egrep -v 'known-issues|missing') 
 if [ -z "${changed_easystacks}" ]; then
@@ -239,7 +248,7 @@ else
         if [ -f ${easystack_file} ]; then
             echo_green "Feeding easystack file ${easystack_file} to EasyBuild..."
 
-            ${EB} --easystack ${TOPDIR}/${easystack_file} --robot
+            ${EB} --parallel ${numcpus} --easystack ${TOPDIR}/${easystack_file} --robot
             ec=$?
 
             # copy EasyBuild log file if EasyBuild exited with an error

From 8fea4cb1ac001188a648f6799083fb36b71e1923 Mon Sep 17 00:00:00 2001
From: Thomas Roeblitz <thomas.roblitz@uib.no>
Date: Wed, 24 Apr 2024 22:43:12 +0200
Subject: [PATCH 3/3] roll back limit parallel

---
 EESSI-install-software.sh | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/EESSI-install-software.sh b/EESSI-install-software.sh
index 533ee87e63..f996fd626d 100755
--- a/EESSI-install-software.sh
+++ b/EESSI-install-software.sh
@@ -212,15 +212,6 @@ fi
 #       if not, an error is produced, and the bot flags the whole build as failed (even when not installing GPU software)
 # ${EESSI_PREFIX}/scripts/gpu_support/nvidia/link_nvidia_host_libraries.sh
 
-# determine num cores allocated to job
-# - get job id
-# - run some squeue ... command that just spits out the number of cores allocated
-slurm_jobid=$(ls slurm-*.out | sed -e 's/slurm-//' | sed -e 's/\.out//')
-command -V squeue
-numcpus=$(squeue -j $slurm_jobid -O numcpus || true)
-if [[ numcpus -lt 1 ]];
-    numcpus=1
-fi
 # use PR patch file to determine in which easystack files stuff was added
 changed_easystacks=$(cat ${pr_diff} | grep '^+++' | cut -f2 -d' ' | sed 's@^[a-z]/@@g' | grep '^easystacks/.*yml$' | egrep -v 'known-issues|missing') 
 if [ -z "${changed_easystacks}" ]; then
@@ -248,7 +239,7 @@ else
         if [ -f ${easystack_file} ]; then
             echo_green "Feeding easystack file ${easystack_file} to EasyBuild..."
 
-            ${EB} --parallel ${numcpus} --easystack ${TOPDIR}/${easystack_file} --robot
+            ${EB} --easystack ${TOPDIR}/${easystack_file} --robot
             ec=$?
 
             # copy EasyBuild log file if EasyBuild exited with an error