From 45074ce288d2083af50bd431ca937a202665e0bc Mon Sep 17 00:00:00 2001 From: Pietro Incardona <incardon@mpi-cbg.de> Date: Wed, 2 Jan 2019 14:07:13 +0100 Subject: [PATCH] Fixing MPI vendor when is openmpi --- script/pre_req | 2 ++ script/set_mpi | 6 +++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/script/pre_req b/script/pre_req index f98b9d183..42347be5f 100755 --- a/script/pre_req +++ b/script/pre_req @@ -175,6 +175,7 @@ if [ -d "$i_dir/MPI" ]; then export PATH="$i_dir/MPI/bin:$PATH" fi +is_mpi_openmpi=0 MPI_valid=no if haveProg mpirun; then @@ -188,6 +189,7 @@ if haveProg mpirun; then if [ x"$version" == x"openmpi" ]; then + is_mpi_openmpi=1 # Check if we are compiling with GPU support if [ x"$gpu_support" == x"1" ]; then diff --git a/script/set_mpi b/script/set_mpi index 4d93c5ba0..e909da50f 100755 --- a/script/set_mpi +++ b/script/set_mpi @@ -3,7 +3,11 @@ function set_mpi() { if [ x"$MPI_valid" == x"yes" ]; then - configure_options="$configure_options CXX=mpic++ " + if [ is_mpi_openmpi -eq 1 ]; then + configure_options="$configure_options CXX=mpic++ --mpivendor=openmpi" + else + configure_options="$configure_options CXX=mpic++ " + fi else if [ $call_test_working_mpi_options -eq 1 ]; then test_working_mpi_options -- GitLab