Commit c0de94d8 authored by Mark Olesen's avatar Mark Olesen
Browse files

STYLE: drop -thread/-no-thread option for makeOPENMPI

- made redundant by 19f241fa. Multiple threads are needed by the
  collated format and are now always enabled.
parent 19f241fa
...@@ -71,9 +71,6 @@ _foamEtc config.sh/mpi ...@@ -71,9 +71,6 @@ _foamEtc config.sh/mpi
mpiPACKAGE=${FOAM_MPI:-openmpi-system} mpiPACKAGE=${FOAM_MPI:-openmpi-system}
# Configure with/without mpi-threads
unset optMpiThreads
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
usage() { usage() {
exec 1>&2 exec 1>&2
...@@ -83,8 +80,6 @@ usage() { ...@@ -83,8 +80,6 @@ usage() {
usage: ${0##*/} [OPTION] [openmpi-VERSION] usage: ${0##*/} [OPTION] [openmpi-VERSION]
options: options:
-gcc force gcc/g++ instead of the values from \$WM_CC, \$WM_CXX -gcc force gcc/g++ instead of the values from \$WM_CC, \$WM_CXX
-no-thread disable multiple mpi threads
-thread enable multiple mpi threads
-help -help
* build openmpi with * build openmpi with
...@@ -105,8 +100,6 @@ do ...@@ -105,8 +100,6 @@ do
'') ;; # Ignore empty '') ;; # Ignore empty
-h | -help) usage ;; -h | -help) usage ;;
-gcc) useGcc ;; -gcc) useGcc ;;
-no-thread*) optMpiThreads=disable ;;
-thread*) optMpiThreads=enable ;;
openmpi-[0-9]* | openmpi_[0-9]* | openmpi-system ) openmpi-[0-9]* | openmpi_[0-9]* | openmpi-system )
mpiPACKAGE="${1%%/}" mpiPACKAGE="${1%%/}"
...@@ -164,12 +157,6 @@ else ...@@ -164,12 +157,6 @@ else
configOpt="$configOpt --with-verbs=$ibDir --with-verbs-lib=$ibLib" configOpt="$configOpt --with-verbs=$ibDir --with-verbs-lib=$ibLib"
fi fi
# Explicitly enable/disable multiple mpi threads
if [ -n "$optMpiThreads" ]
then
configOpt="$configOpt -${optMpiThreads}-mpi-thread-multiple"
fi
# end of configuration options # end of configuration options
# ---------------------------- # ----------------------------
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment