From e9bb74476437a6247ec554f0d2bd820051f19fd4 Mon Sep 17 00:00:00 2001
From: Achim Gsell <achim.gsell@psi.ch>
Date: Thu, 5 Sep 2024 11:01:22 +0200
Subject: [PATCH] openmpi: add config for 4.1.6 for Alps

---
 Compiler/openmpi/build             | 18 +++++++++---------
 Compiler/openmpi/files/config.yaml | 23 ++++++++++++++++++++++-
 2 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/Compiler/openmpi/build b/Compiler/openmpi/build
index 31bf3b5..4e5bb07 100755
--- a/Compiler/openmpi/build
+++ b/Compiler/openmpi/build
@@ -48,15 +48,15 @@ pbuild::pre_configure() {
                 pbuild::add_configure_args "LDFLAGS=-Wc,-static-intel,-O0"
         fi
 
-        if pbuild::use_flag slurm || pbuild::use_flag dgx || pbuild::use_flag merlin6; then
-		pbuild::add_configure_args "--with-gpfs=/usr/lpp/mmfs"
-		pbuild::add_configure_args "--with-pmi"
-		# pbuild::add_configure_args "--with-pmi-libdir=/usr/lib64/"
-
-                if pbuild::use_flag "libpmix"; then
-                  pbuild::add_configure_args "--enable-install-libpmix"
-                fi
-        fi
+#        if pbuild::use_flag slurm || pbuild::use_flag dgx || pbuild::use_flag merlin6; then
+#		pbuild::add_configure_args "--with-gpfs=/usr/lpp/mmfs"
+#		pbuild::add_configure_args "--with-pmi"
+#		# pbuild::add_configure_args "--with-pmi-libdir=/usr/lib64/"
+#
+#                if pbuild::use_flag "libpmix"; then
+#                  pbuild::add_configure_args "--enable-install-libpmix"
+#                fi
+#        fi
 
 	local version
 	(( version = (${V_MAJOR} * 100 + ${V_MINOR}) * 100 + V_PATCHLVL ))
diff --git a/Compiler/openmpi/files/config.yaml b/Compiler/openmpi/files/config.yaml
index a15cd1b..8fc082c 100644
--- a/Compiler/openmpi/files/config.yaml
+++ b/Compiler/openmpi/files/config.yaml
@@ -57,12 +57,33 @@ openmpi:
   versions:
     4.1.6:
       variants:
-        - systems: [merlin-*, ra-*]
+        - systems: [merlin-.*]
           suffix: _slurm
+          relstage: unstable
+          overlay: private
+          use_overlays: [private]
+          group_deps:
+            compiler: {gcc: [9.5.0, 10.4.0, 11.4.0, 12.3.0, 12.4.0, 13.1.0]}
+          build_requires: [pmix/4.2.4, ucx/1.14.1_slurm, libfabric/1.18.0, hwloc/2.9.1, patchelf/0.14.5]
+          runtime_deps: [cuda/12.1.1]
+          configure_args+:
+            - CFLAGS=-g -O0
+            - LDFLAGS=-g
+            - --with-gpfs=/usr/lpp/mmfs
+            - --with-pmi=/usr
+        - systems: [ra-.*]
+          suffix: _ra
           group_deps:
             compiler: {gcc: [9.5.0, 10.4.0, 11.4.0, 12.3.0, 13.1.0]}
           build_requires: [pmix/4.2.4, ucx/1.14.1_slurm, hwloc/2.9.1, patchelf/0.14.5]
           runtime_deps: [cuda/12.1.1]
+        - systems: [.*.merlin7.psi.ch]
+          overlay: Alps
+          used_overlays: [PSI, Alps]
+          group_deps:
+            compiler: {gcc: [12.3.0]}
+          build_requires: [pmix/5.0.3, ucx/1.14.1_slurm, hwloc/2.9.1, patchelf/0.14.5]
+          runtime_deps: [cuda/12.1.1]
 
     4.1.4:
       variants: