From ea8207cfe75654a17bbc4bb477474b05abd3c13b Mon Sep 17 00:00:00 2001 From: Caubet Serrabou Marc Date: Thu, 16 Jul 2020 14:37:51 +0200 Subject: [PATCH] Changes in OpenMPI --- Compiler/openmpi/build | 9 ++++++++- Compiler/openmpi/files/variants.merlin6 | 4 ++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/Compiler/openmpi/build b/Compiler/openmpi/build index 44bd6c1..a7b0205 100755 --- a/Compiler/openmpi/build +++ b/Compiler/openmpi/build @@ -13,6 +13,8 @@ pbuild::install_docfiles 'AUTHORS' 'LICENSE' 'NEWS' 'README' pbuild::pre_configure() { + INSTALL_LIBPMIX=false + if [[ -n "${CUDA_VERSION}" ]]; then pbuild::add_configure_args "--with-cuda=${CUDA_HOME}" fi @@ -40,7 +42,11 @@ pbuild::pre_configure() { pbuild::add_configure_args "--enable-smp-locks" elif (( V_MAJOR >= 4 )); then pbuild::add_configure_args "--enable-mpi-fortran" - pbuild::add_configure_args "--without-verbs" + pbuild::add_configure_args "--without-verbs" + if ${INSTALL_LIBPMIX} ; then + echo "Enabling Install libpmix" + pbuild::add_configure_args "--enable-install-libpmix" + fi fi } @@ -48,6 +54,7 @@ pbuild::post_install() { mkdir -p "${PREFIX}/lib/fallback" local -r binary=$(ls "${PREFIX}"/lib/libmpi.so.*.*.*) pbuild::install_shared_libs "${binary}" "${PREFIX}/lib/fallback" '/libuc[mpst].so' + pbuild::install_shared_libs "${binary}" "${PREFIX}/lib/fallback" '/libuct_ib.so.0' pbuild::install_shared_libs "${binary}" "${PREFIX}/lib/fallback" '/libnuma.so' pbuild::install_shared_libs "${binary}" "${PREFIX}/lib/fallback" '/libibverbs.so' pbuild::install_shared_libs "${binary}" "${PREFIX}/lib/fallback" '/librdmacm.so' diff --git a/Compiler/openmpi/files/variants.merlin6 b/Compiler/openmpi/files/variants.merlin6 index 98f3a43..4fca9d8 100644 --- a/Compiler/openmpi/files/variants.merlin6 +++ b/Compiler/openmpi/files/variants.merlin6 @@ -15,5 +15,5 @@ openmpi/3.0.5_slurm unstable intel/{15.2,17.4,18.4} openmpi/3.1.6_slurm stable gcc/{4.9.4,5.5.0,6.5.0,7.5.0,8.4.0,9.3.0} openmpi/3.1.6_slurm stable intel/{15.2,17.4,18.4,20.1} -openmpi/4.0.3_slurm unstable gcc/{4.9.4,5.5.0,6.5.0,7.5.0,8.4.0,9.3.0} -openmpi/4.0.3_slurm unstable intel/{15.2,17.4,18.4,20.1} +openmpi/4.0.4_slurm unstable gcc/{4.9.4,5.5.0,6.5.0,7.5.0,8.4.0,9.3.0} +openmpi/4.0.4_slurm unstable intel/{15.2,17.4,18.4,20.1}