From ce5ec30a7f5d0065087c71c6e04294f1464ce0cc Mon Sep 17 00:00:00 2001
From: Pietro Incardona <incardon@mpi-cbg.de>
Date: Sat, 18 Jul 2020 16:00:33 +0200
Subject: [PATCH] Fixing installtion of MPI
---
build.sh | 5 ++---
script/install_MPI.sh | 8 ++++++--
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/build.sh b/build.sh
index c8c496ea9..d49d6d5d0 100755
--- a/build.sh
+++ b/build.sh
@@ -43,11 +43,10 @@ if [ x"$hostname" == x"falcon1" ]; then
echo "falcon1 settings"
if [ x"$comp_type" == x"intel" ]; then
module load parallel_studio_xe/2019u1
- mkdir $HOME/openfpm_dependencies_intel/openfpm_pdata/$branch
dependency_dir=/projects/ppm/rundeck/openfpm_dependencies_intel/
else
- mkdir $HOME/openfpm_dependencies/openfpm_pdata/$branch
- dependency_dir=/projects/ppm/rundeck/openfpm_dependencies/
+ mkdir /projects/ppm/rundeck/openfpm_dependencies_$branch/
+ dependency_dir=/projects/ppm/rundeck/openfpm_dependencies_$branch/
fi
else
dependency_dir=$HOME/openfpm_dependencies/openfpm_pdata/$branch
diff --git a/script/install_MPI.sh b/script/install_MPI.sh
index 660c7eb75..58091de4d 100755
--- a/script/install_MPI.sh
+++ b/script/install_MPI.sh
@@ -10,16 +10,20 @@ fi
./script/download_MPI.sh
cd openmpi-4.0.4
+if [ -f mpi_add_options ]; then
+ mpi_options=$(cat mpi_add_options)
+fi
+
if [ x"$3" == x"1" ]; then
echo "Installing MPI with GPU support"
# Detect where is nvcc
cuda_location=$(dirname $(dirname $(which nvcc)) )
- ./configure --with-cuda=$cuda_location --prefix=$1/MPI --enable-mpi-fortran=yes CC=$4 CXX=$5 F77=$6 FC=$7 $8
+ ./configure $mpi_options --with-cuda=$cuda_location --prefix=$1/MPI --enable-mpi-fortran=yes CC=$4 CXX=$5 F77=$6 FC=$7 $8
else
echo "Installing MPI without GPU support"
- ./configure --prefix=$1/MPI --enable-mpi-fortran=yes CC=$4 CXX=$5 F77=$6 FC=$7 $8
+ ./configure $mpi_options --prefix=$1/MPI --enable-mpi-fortran=yes CC=$4 CXX=$5 F77=$6 FC=$7 $8
fi
make -j $2
make install
--
GitLab