From b2dc06e2dfc046351a4464f556c271d39f03dad1 Mon Sep 17 00:00:00 2001 From: Caubet Serrabou Marc Date: Thu, 16 Jul 2020 17:05:19 +0200 Subject: [PATCH] Changes in OpenMPI --- Compiler/openmpi/build | 10 ++++------ Compiler/openmpi/files/variants.merlin6 | 2 ++ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Compiler/openmpi/build b/Compiler/openmpi/build index a7b0205..4884f5f 100755 --- a/Compiler/openmpi/build +++ b/Compiler/openmpi/build @@ -13,8 +13,6 @@ 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 @@ -32,6 +30,10 @@ pbuild::pre_configure() { if pbuild::use_flag slurm ; then 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 @@ -43,10 +45,6 @@ pbuild::pre_configure() { elif (( V_MAJOR >= 4 )); then pbuild::add_configure_args "--enable-mpi-fortran" pbuild::add_configure_args "--without-verbs" - if ${INSTALL_LIBPMIX} ; then - echo "Enabling Install libpmix" - pbuild::add_configure_args "--enable-install-libpmix" - fi fi } diff --git a/Compiler/openmpi/files/variants.merlin6 b/Compiler/openmpi/files/variants.merlin6 index 4fca9d8..9447f2d 100644 --- a/Compiler/openmpi/files/variants.merlin6 +++ b/Compiler/openmpi/files/variants.merlin6 @@ -17,3 +17,5 @@ openmpi/3.1.6_slurm stable 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} + +openmpi/4.0.4_slurm_libpmix unstable gcc/9.3.0