From cc82468009449f3db2a4505c9c31bc6b291efac9 Mon Sep 17 00:00:00 2001
From: Achim Gsell <achim.gsell@psi.ch>
Date: Thu, 26 Sep 2024 14:40:54 +0200
Subject: [PATCH] openmpi: fixes for Ra, Merlin6 & 7

---
 Compiler/openmpi/build             |  4 ++++
 Compiler/openmpi/files/config.yaml | 13 ++++++++++---
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/Compiler/openmpi/build b/Compiler/openmpi/build
index a8091f1..d9bd927 100755
--- a/Compiler/openmpi/build
+++ b/Compiler/openmpi/build
@@ -13,6 +13,10 @@ pbuild::pre_configure() {
 		pbuild::add_configure_args "--with-pmi=/usr"
 		pbuild::add_configure_args "--with-pmi-libdir=/usr/lib64/slurmpmi"
 	fi
+	if (( V_MAJOR < 5 )) && pbuild::use_flag 'ra'; then
+		pbuild::add_configure_args "--with-pmi=/usr"
+		pbuild::add_configure_args "--with-pmi-libdir=/usr/lib64/slurm"
+	fi
 	if (( V_MAJOR >= 5 )); then
 		pbuild::add_configure_args "--enable-prte-prefix-by-default"
 	fi
diff --git a/Compiler/openmpi/files/config.yaml b/Compiler/openmpi/files/config.yaml
index f52a321..5a0e595 100644
--- a/Compiler/openmpi/files/config.yaml
+++ b/Compiler/openmpi/files/config.yaml
@@ -10,7 +10,7 @@ openmpi:
       - --enable-shared
       - --enable-static
     docfiles: [AUTHORS, LICENSE, NEWS, README]
-    urls:
+    Urls:
       - url: https://download.open-mpi.org/release/open-mpi/v${V_MAJOR}.${V_MINOR}/openmpi-${V_PKG}.tar.bz2
   shasums:
     openmpi-1.10.0.tar.bz2: 26b432ce8dcbad250a9787402f2c999ecb6c25695b00c9c6ee05a306c78b6490
@@ -64,25 +64,28 @@ openmpi:
           relstage: unstable
           overlay: Alps
           use_overlays: [PSI]
+          use_flags: [merlin7]
           group_deps:
             compiler: {gcc: [12.3.0], intelcc: [22.2]}
           build_requires: [pmix/5.0.3, hwloc/2.11.1, libfabric/1.15.2.0, patchelf/0.14.5]
           runtime_deps: [cuda/12.2.0]
           configure_args+:
-            - --with-ofi=/opt/cray/libfabric/1.15.2.0
+            - --with-ofi=${LIBFABRIC_VERSION}
             - --enable-mpi1-compatibility
             - --with-cxi
             - --with-lustre
             - --with-slingshot
 
     4.1.6:
+      config:
+        build_variants: first_match
       variants:
         - systems: [merlin-.*]
           suffix: _slurm
           relstage: unstable
           overlay: base
           group_deps:
-            compiler: {gcc: [9.5.0, 10.4.0, 11.4.0, 12.3.0, 12.4.0, 13.2.0, 14.2.0]}
+            compiler: {gcc: [9.5.0, 10.4.0, 11.4.0, 12.3.0, 12.4.0, 13.1.0, 13.2.0, 14.2.0]}
           build_requires:
             - pmix/4.2.4
             - ucx/1.14.1_slurm
@@ -98,10 +101,14 @@ openmpi:
 
         - systems: [ra-.*]
           suffix: _ra
+          use_flags: [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]
+          configure_args+:
+            - --with-gpfs=/usr/lpp/mmfs
+            - --with-pmi=/usr
 
         - systems: [.*.merlin7.psi.ch]
           relstage: unstable