From 2c7232724127fb7f7d20b84208bfd8e0bdb931e6 Mon Sep 17 00:00:00 2001
From: Achim Gsell <achim.gsell@psi.ch>
Date: Tue, 5 Nov 2019 16:17:21 +0100
Subject: [PATCH 1/2] openmpi: bugfixs in build script

---
 Compiler/openmpi/build | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/Compiler/openmpi/build b/Compiler/openmpi/build
index b53e5f1..e3e1bb7 100755
--- a/Compiler/openmpi/build
+++ b/Compiler/openmpi/build
@@ -24,7 +24,9 @@ pbuild::pre_configure() {
 	pbuild::add_configure_args "--enable-static"
 	pbuild::add_configure_args "--with-sge=yes"
 	pbuild::add_configure_args "--with-slurm=yes"
-	if (( V_MAJOR < 4 )); then
+	local version
+	(( version = (${V_MAJOR} * 100 + ${V_MINOR}) * 100 + V_PATCHLVL ))
+	if (( version < 30104 )) ; then
 		pbuild::add_configure_args "--enable-mpi-f90"
 		pbuild::add_configure_args "--enable-mpi-profile"
 		pbuild::add_configure_args "--enable-smp-locks"
@@ -34,13 +36,10 @@ pbuild::pre_configure() {
 }
 
 pbuild::post_install() {
-	if [[ -r /usr/lib64/libnuma.so ]]; then
-		cp -av /usr/lib64/libnuma.so.* "${PREFIX}/lib/fallback"
-	fi
-	if [[ -r /usr/lib64/libibverbs.so ]]; then
-		cp -av /usr/lib64/libibverbs.so.* "${PREFIX}/lib/fallback"
-	fi
-	if [[ -r /usr/lib64/librdmacm.so ]]; then
-		cp -av /usr/lib64/librdmacm.so.* "${PREFIX}/lib/fallback"
-	fi
+	mkdir -p "${PREFIX}/lib/fallback"
+	local -r binary=$(ls "${PREFIX}"/lib/libmpi.so.*.*.*)
+	pbuild::install_shared_libs "${binary}" "${PREFIX}/lib/fallback" '/usr/.*/libuc[mpst].so'
+	pbuild::install_shared_libs "${binary}" "${PREFIX}/lib/fallback" '/usr/.*/libnuma.so'
+	pbuild::install_shared_libs "${binary}" "${PREFIX}/lib/fallback" '/usr/.*/libbverbs.so'
+	pbuild::install_shared_libs "${binary}" "${PREFIX}/lib/fallback" '/usr/.*/librdmacm.so'
 }

From a089d9a44fe73fed6763daf32576aa1a3321cf1b Mon Sep 17 00:00:00 2001
From: Achim Gsell <achim.gsell@psi.ch>
Date: Tue, 5 Nov 2019 16:19:21 +0100
Subject: [PATCH 2/2] openmpi: use libuc[mpst] from module if not available on
 system

---
 Compiler/openmpi/modulefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Compiler/openmpi/modulefile b/Compiler/openmpi/modulefile
index b4673de..68458ac 100644
--- a/Compiler/openmpi/modulefile
+++ b/Compiler/openmpi/modulefile
@@ -28,8 +28,9 @@ setenv		MPIRUN			$PREFIX/bin/mpirun
 set libibverbs  [glob -nocomplain /usr/lib{64,}/libibverbs.so.1*]
 set libnuma     [glob -nocomplain /usr/lib{64,}/libnuma.so.1*]
 set librdmacm   [glob -nocomplain /usr/lib{64,}/librdmacm.so.1*]
+set libucx      [glob -nocomplain /usr/lib{64,}/libuc[mpst].so.0*]
 
-if { $libibverbs eq "" || $libnuma eq "" || $librdmacm eq "" } {
+if { $libibverbs eq "" || $libnuma eq "" || $librdmacm eq "" || $libucx eq "" } {
     if { [file isdirectory $PREFIX/lib/fallback] } {
         prepend-path LD_LIBRARY_PATH      $PREFIX/lib/fallback
     }