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
parent 622aebeecd
commit c2e4cccccd
12 changed files with 37 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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
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
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)
PLIBS = $(shell mpicc --showme:link)