Rationalising the mplib files and reinstating support for compiling without MPI

2018-08-16 12:26:16 +01:00
parent 50f5c22c87
commit bce53f1758
15 changed files with 9 additions and 25 deletions
--- a/src/Pstream/mpi/Make/options
+++ b/src/Pstream/mpi/Make/options
@ -1,5 +1,4 @@
-sinclude $(GENERAL_RULES)/mplib$(WM_MPLIB)
-sinclude $(RULES)/mplib$(WM_MPLIB)
+-include $(GENERAL_RULES)/mplibType

 EXE_INC  = $(PFLAGS) $(PINC)
 LIB_LIBS = $(PLIBS)
--- a/src/parallel/decompose/Allwmake
+++ b/src/parallel/decompose/Allwmake
@ -40,7 +40,7 @@ if [ -n "$SCOTCH_ARCH_PATH" ]
 then
    wmake $targetType scotchDecomp

-    if [ -d "$FOAM_LIBBIN/$FOAM_MPI" ]
+    if [ -n "$WM_MPLIB" ] && [ -d "$FOAM_LIBBIN/$FOAM_MPI" ]
    then
        wmakeMpiLib ptscotchDecomp
    fi
--- a/src/parallel/decompose/ptscotchDecomp/Make/options
+++ b/src/parallel/decompose/ptscotchDecomp/Make/options
@ -1,5 +1,4 @@
-sinclude $(GENERAL_RULES)/mplib$(WM_MPLIB)
-sinclude $(RULES)/mplib$(WM_MPLIB)
+-include $(GENERAL_RULES)/mplibType

 EXE_INC = \
    $(PFLAGS) $(PINC) \
--- a/src/parallel/decompose/scotchDecomp/Make/options
+++ b/src/parallel/decompose/scotchDecomp/Make/options
@ -2,8 +2,7 @@
 * Note including of mplib compilation rules.
 * This is purely to avoid scotch.h including mpicxx.h, which causes problems.
 */
-sinclude $(GENERAL_RULES)/mplib$(WM_MPLIB)
-sinclude $(RULES)/mplib$(WM_MPLIB)
+-include $(GENERAL_RULES)/mplibType

 EXE_INC = \
    $(PFLAGS) $(PINC) \
--- a/src/renumber/zoltanRenumber/Make/options
+++ b/src/renumber/zoltanRenumber/Make/options
@ -1,5 +1,4 @@
-sinclude $(GENERAL_RULES)/mplib$(WM_MPLIB)
-sinclude $(RULES)/mplib$(WM_MPLIB)
+-include $(GENERAL_RULES)/mplibType

 EXE_INC = \
    /* -DFULLDEBUG -g -O0 */ \
--- a/wmake/rules/General/general
+++ b/wmake/rules/General/general
@ -9,7 +9,7 @@ LD         = ld
 GFLAGS     = -D$(WM_ARCH) -DWM_ARCH_OPTION=$(WM_ARCH_OPTION) \
             -DWM_$(WM_PRECISION_OPTION) -DWM_LABEL_SIZE=$(WM_LABEL_SIZE)
 GINC       =
-GLIBS      = -lm
+GLIBS      = -lm -lpthread
 GLIB_LIBS  =


--- a/wmake/rules/General/mplibHPMPI64
+++ b/wmake/rules/General/mplibHPMPI64
--- a/wmake/rules/General/mplibINTELMPI64
+++ b/wmake/rules/General/mplibINTELMPI64
--- a/wmake/rules/solarisGcc/mplibMPI
+++ b/wmake/rules/solarisGcc/mplibMPI
--- a/wmake/rules/General/mplibType
+++ b/wmake/rules/General/mplibType
@ -0,0 +1,3 @@
+-include $(GENERAL_RULES)/mplib$(WM_MPLIB)
+-include $(GENERAL_RULES)/mplib$(WM_MPLIB)$(WM_ARCH_OPTION)
+-include $(RULES)/mplib$(WM_MPLIB)
--- a/wmake/rules/linuxARM7Gcc/mplibHPMPI
+++ b/wmake/rules/linuxARM7Gcc/mplibHPMPI
@ -1,3 +0,0 @@
-PFLAGS     =
-PINC       = -isystem $(MPI_ARCH_PATH)/include -D_MPICC_H
-PLIBS      = -L$(MPI_ARCH_PATH)/lib/linux_ia32 -lmpi
--- a/wmake/rules/linuxClang/mplibHPMPI
+++ b/wmake/rules/linuxClang/mplibHPMPI
@ -1,3 +0,0 @@
-PFLAGS     =
-PINC       = -isystem $(MPI_ARCH_PATH)/include -D_MPICC_H
-PLIBS      = -L$(MPI_ARCH_PATH)/lib/linux_ia32 -lmpi
--- a/wmake/rules/linuxGcc/mplibHPMPI
+++ b/wmake/rules/linuxGcc/mplibHPMPI
@ -1,3 +0,0 @@
-PFLAGS     =
-PINC       = -isystem $(MPI_ARCH_PATH)/include -D_MPICC_H
-PLIBS      = -L$(MPI_ARCH_PATH)/lib/linux_ia32 -lmpi
--- a/wmake/rules/linuxIcc/mplibHPMPI
+++ b/wmake/rules/linuxIcc/mplibHPMPI
@ -1,3 +0,0 @@
-PFLAGS     =
-PINC       = -isystem $(MPI_ARCH_PATH)/include -D_MPICC_H
-PLIBS      = -L$(MPI_ARCH_PATH)/lib/linux_ia32 -lmpi
--- a/wmake/rules/solarisGcc/mplibMPICH
+++ b/wmake/rules/solarisGcc/mplibMPICH
@ -1,3 +0,0 @@
-PFLAGS     = -DMPICH_SKIP_MPICXX
-PINC       = -isystem $(MPI_ARCH_PATH)/include
-PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpich -lrt -laio