zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

CONFIG: update MPICH and MVAPICH versions/rules

Browse Source 
- Note: mpich now builds libmpi.so instead of libmpich.so

- define both -DMPICH_SKIP_MPICXX and -DOMPI_SKIP_MPICXX regardless of
  using openmpi or mpich. This simplifies the files and does not harm.
This commit is contained in:
Mark Olesen
2019-02-14 18:09:37 +01:00
committed by Andrew Heather
parent 6b9fe33275
commit fd8379fdbe
12 changed files with 37 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
etc/config.csh/mpi
View File

@ -130,7 +130,7 @@ case SYSTEMMPI:
breaksw breaksw
case MPICH: case MPICH:
setenv FOAM_MPI mpich-3.2 setenv FOAM_MPI mpich-3.3
setenv MPI_ARCH_PATH $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$FOAM_MPI setenv MPI_ARCH_PATH $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$FOAM_MPI
setenv MPI_HOME $MPI_ARCH_PATH setenv MPI_HOME $MPI_ARCH_PATH
@ -150,6 +150,14 @@ case MPICH-GM:
_foamAddLib $GM_LIB_PATH _foamAddLib $GM_LIB_PATH
breaksw breaksw
case MVA2MPI: # MVAMPICH2
setenv FOAM_MPI mvapich2-2.3
_foamAddPath $MPI_ARCH_PATH/bin
_foamAddMan $MPI_ARCH_PATH/share/man
_foamAddLibAuto $MPI_ARCH_PATH lib$WM_COMPILER_LIB_ARCH
breaksw
case CRAY-MPICH: case CRAY-MPICH:
if ( ! $?MPICH_DIR ) setenv MPICH_DIR /dev/null if ( ! $?MPICH_DIR ) setenv MPICH_DIR /dev/null
setenv FOAM_MPI cray-mpich setenv FOAM_MPI cray-mpich

15
etc/config.sh/mpi
View File

@ -145,7 +145,7 @@ SYSTEMMPI)
;; ;;
MPICH) MPICH)
export FOAM_MPI=mpich-3.2 export FOAM_MPI=mpich-3.3
export MPI_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$FOAM_MPI export MPI_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$FOAM_MPI
export MPI_HOME=$MPI_ARCH_PATH export MPI_HOME=$MPI_ARCH_PATH
@ -169,6 +169,19 @@ MPICH-GM)
_foamAddLib $GM_LIB_PATH _foamAddLib $GM_LIB_PATH
;; ;;
MVA2MPI) # MVAMPICH2
export FOAM_MPI=mvapich2-2.3
export MPI_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$FOAM_MPI
# Could be sourced from ThirdParty with incomplete environment
if command -v _foamAddLibAuto > /dev/null 2>&1 # Normal sourcing
then
_foamAddPath $MPI_ARCH_PATH/bin
_foamAddMan $MPI_ARCH_PATH/share/man
_foamAddLibAuto $MPI_ARCH_PATH lib$WM_COMPILER_LIB_ARCH
fi
;;
CRAY-MPICH) CRAY-MPICH)
export FOAM_MPI=cray-mpich export FOAM_MPI=cray-mpich
export MPI_ARCH_PATH=$MPICH_DIR export MPI_ARCH_PATH=$MPICH_DIR

4
wmake/rules/General/mplibMPICH
View File

@ -1,3 +1,3 @@
PFLAGS = -DMPICH_SKIP_MPICXX PFLAGS = -DMPICH_SKIP_MPICXX -DOMPI_SKIP_MPICXX
PINC = -isystem $(MPI_ARCH_PATH)/include PINC = -isystem $(MPI_ARCH_PATH)/include
PLIBS = -L$(MPI_ARCH_PATH)/lib$(WM_COMPILER_LIB_ARCH) -L$(MPI_ARCH_PATH)/lib -lmpich -lrt PLIBS = -L$(MPI_ARCH_PATH)/lib$(WM_COMPILER_LIB_ARCH) -L$(MPI_ARCH_PATH)/lib -lmpi -lrt

3
wmake/rules/General/mplibMVA2MPI Normal file
View File

@ -0,0 +1,3 @@
PFLAGS = -DMPICH_SKIP_MPICXX -DOMPI_SKIP_MPICXX
PINC = -isystem $(MPI_ARCH_PATH)/include
PLIBS = -L$(MPI_ARCH_PATH)/lib$(WM_COMPILER_LIB_ARCH) -L$(MPI_ARCH_PATH)/lib -lmpi

2
wmake/rules/General/mplibOPENMPI
View File

@ -1,3 +1,3 @@
PFLAGS = -DOMPI_SKIP_MPICXX PFLAGS = -DMPICH_SKIP_MPICXX -DOMPI_SKIP_MPICXX
PINC = -isystem $(MPI_ARCH_PATH)/include PINC = -isystem $(MPI_ARCH_PATH)/include
PLIBS = -L$(MPI_ARCH_PATH)/lib$(WM_COMPILER_LIB_ARCH) -L$(MPI_ARCH_PATH)/lib -lmpi PLIBS = -L$(MPI_ARCH_PATH)/lib$(WM_COMPILER_LIB_ARCH) -L$(MPI_ARCH_PATH)/lib -lmpi

4
wmake/rules/General/mplibSYSTEMOPENMPI
View File

@ -1,5 +1,5 @@
# use the system installed openmpi - mpicc must be installed # Use the system installed openmpi - mpicc must be installed
PFLAGS = -DOMPI_SKIP_MPICXX PFLAGS = -DMPICH_SKIP_MPICXX -DOMPI_SKIP_MPICXX
PINC = $(shell mpicc --showme:compile) PINC = $(shell mpicc --showme:compile)
PLIBS = $(shell mpicc --showme:link) PLIBS = $(shell mpicc --showme:link)

2
wmake/rules/linux64Clang/mplibINTELMPI
View File

@ -1,3 +1,3 @@
PFLAGS = -DMPICH_SKIP_MPICXX PFLAGS = -DMPICH_SKIP_MPICXX -DOMPI_SKIP_MPICXX
PINC = -isystem $(MPI_ARCH_PATH)/intel64/include PINC = -isystem $(MPI_ARCH_PATH)/intel64/include
PLIBS = -L$(MPI_ARCH_PATH)/intel64/lib -lmpi PLIBS = -L$(MPI_ARCH_PATH)/intel64/lib -lmpi

2
wmake/rules/linux64Cray/mplibINTELMPI
View File

@ -1,3 +1,3 @@
PFLAGS = -DMPICH_SKIP_MPICXX PFLAGS = -DMPICH_SKIP_MPICXX -DOMPI_SKIP_MPICXX
PINC = -isystem $(MPI_ARCH_PATH)/intel64/include PINC = -isystem $(MPI_ARCH_PATH)/intel64/include
PLIBS = -L$(MPI_ARCH_PATH)/intel64/lib -lmpi PLIBS = -L$(MPI_ARCH_PATH)/intel64/lib -lmpi

2
wmake/rules/linux64Gcc/mplibINTELMPI
View File

@ -1,3 +1,3 @@
PFLAGS = -DMPICH_SKIP_MPICXX PFLAGS = -DMPICH_SKIP_MPICXX -DOMPI_SKIP_MPICXX
PINC = -isystem $(MPI_ARCH_PATH)/intel64/include PINC = -isystem $(MPI_ARCH_PATH)/intel64/include
PLIBS = -L$(MPI_ARCH_PATH)/intel64/lib -lmpi PLIBS = -L$(MPI_ARCH_PATH)/intel64/lib -lmpi

2
wmake/rules/linux64Icc/mplibINTELMPI
View File

@ -1,3 +1,3 @@
PFLAGS = -DMPICH_SKIP_MPICXX PFLAGS = -DMPICH_SKIP_MPICXX -DOMPI_SKIP_MPICXX
PINC = -isystem $(MPI_ARCH_PATH)/intel64/include PINC = -isystem $(MPI_ARCH_PATH)/intel64/include
PLIBS = -L$(MPI_ARCH_PATH)/intel64/lib -lmpi PLIBS = -L$(MPI_ARCH_PATH)/intel64/lib -lmpi

2
wmake/rules/linuxIA64Icc/mplibINTELMPI
View File

@ -1,3 +1,3 @@
PFLAGS = -DMPICH_SKIP_MPICXX PFLAGS = -DMPICH_SKIP_MPICXX -DOMPI_SKIP_MPICXX
PINC = -isystem $(MPI_ARCH_PATH)/intel64/include PINC = -isystem $(MPI_ARCH_PATH)/intel64/include
PLIBS = -L$(MPI_ARCH_PATH)/intel64/lib -lmpi PLIBS = -L$(MPI_ARCH_PATH)/intel64/lib -lmpi

2
wmake/rules/solarisGcc/mplibMPICH
View File

@ -1,3 +1,3 @@
PFLAGS = -DMPICH_SKIP_MPICXX PFLAGS = -DMPICH_SKIP_MPICXX -DOMPI_SKIP_MPICXX
PINC = -isystem $(MPI_ARCH_PATH)/include PINC = -isystem $(MPI_ARCH_PATH)/include
PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpich -lrt -laio PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpich -lrt -laio