CONFIG: rationalize mpi config tuning (#1910)

- prefix FOAM_MPI and library directories with 'sys-' for system versions for uniform identication. WM_MPLIB | libdir (FOAM_MPI) | old naming | SYSTEMMPI | sys-mpi | mpi | SYSTEMOPENMPI | sys-openmpi | openmpi-system | - prefix preferences with 'prefs.' to make them more easily identifiable, and update bin/tools/create-mpi-config accordingly Old name: config.{csh,sh}/openmpi New name: config.{csh,sh}/prefs.openmpi - additional mpi preferences now available: * prefs.intelmpi * prefs.mpich ... CONFIG: added hook for EASYBUILDMPI (eb-mpi), somewhat like USERMPI - EasyBuild uses mpicc when compiling, so no explicit wmake rules are used ENH: support different major versions for system openmpi - for example, with WM_MPLIB=SYSTEMOPENMPI2 defines FOAM_MPI=sys-openmpi2 and thus creates lib/sys-openmpi2 ENH: centralize handling of mpi as 'mpi-rules' Before: sinclude $(GENERAL_RULES)/mplib$(WM_MPLIB) sinclude $(DEFAULT_RULES)/mplib$(WM_MPLIB) ifeq (,$(FOAM_MPI_LIBBIN)) FOAM_MPI_LIBBIN := $(FOAM_LIBBIN)/$(FOAM_MPI) endif After: include $(GENERAL_RULES)/mpi-rules - also allows variants such as SYSTEMOPENMPI2 to be handled separately
2025-11-28 03:28:01 +00:00 · 2020-11-11 09:34:07 +01:00
parent 26ec9b5a17
commit c91fc6f41c
45 changed files with 722 additions and 536 deletions
--- a/wmake/rules/General/ADIOS2
+++ b/wmake/rules/General/ADIOS2
@ -1,8 +1,7 @@
-#-------------------------------*- makefile -*---------------------------------
+#------------------------------------------------------------------------------
 # ADIOS2 includes/libraries

-sinclude $(GENERAL_RULES)/mplib$(WM_MPLIB)
-sinclude $(DEFAULT_RULES)/mplib$(WM_MPLIB)
+include $(GENERAL_RULES)/mpi-rules

 # May need to strip off rpath ...

--- a/wmake/rules/General/mpi-mpicc-openmpi
+++ b/wmake/rules/General/mpi-mpicc-openmpi
@ -0,0 +1,8 @@
+#------------------------------------------------------------------------------
+# Use openmpi mpicc to obtain settings - mpicc must be available
+
+PFLAGS  = -DMPICH_SKIP_MPICXX -DOMPI_SKIP_MPICXX
+PINC    = $(shell mpicc --showme:compile)
+PLIBS   = $(shell mpicc --showme:link)
+
+#------------------------------------------------------------------------------
--- a/wmake/rules/General/mpi-rules
+++ b/wmake/rules/General/mpi-rules
@ -0,0 +1,32 @@
+#------------------------------------------------------------------------------
+# MPI rules
+
+PFLAGS  =
+PINC    =
+PLIBS   =
+
+# The stem name. Eg, SYSTEMOPENMPI4 -> SYSTEMOPENMPI
+MPLIB_STEMNAME = $(shell echo "$(WM_MPLIB)" | sed -e 's/[-.0-9]*$$//')
+
+ifneq ("$(MPLIB_STEMNAME)","$(WM_MPLIB)")
+    sinclude $(GENERAL_RULES)/mplib$(MPLIB_STEMNAME)
+    sinclude $(DEFAULT_RULES)/mplib$(MPLIB_STEMNAME)
+    ifneq ("$(RULES)","$(DEFAULT_RULES)")
+        sinclude $(RULES)/mplib$(MPLIB_STEMNAME)
+    endif
+endif
+
+ifneq ("","$(WM_MPLIB)")
+    sinclude $(GENERAL_RULES)/mplib$(WM_MPLIB)
+    sinclude $(DEFAULT_RULES)/mplib$(WM_MPLIB)
+    ifneq ("$(RULES)","$(DEFAULT_RULES)")
+        sinclude $(RULES)/mplib$(WM_MPLIB)
+    endif
+endif
+
+# Default target MPI libdir is PROJECT lib/<mpi-name>
+ifeq (,$(FOAM_MPI_LIBBIN))
+    FOAM_MPI_LIBBIN := $(FOAM_LIBBIN)/$(FOAM_MPI)
+endif
+
+#------------------------------------------------------------------------------
--- a/wmake/rules/General/mplib
+++ b/wmake/rules/General/mplib
@ -1 +0,0 @@
-no-mpi
--- a/wmake/rules/General/mplib-ia32-HPMPI
+++ b/wmake/rules/General/mplib-ia32-HPMPI
@ -0,0 +1,8 @@
+#------------------------------------------------------------------------------
+# HPMPI rules (i386)
+
+PFLAGS     =
+PINC       = -isystem $(MPI_ARCH_PATH)/include -D_MPICC_H
+PLIBS      = -L$(MPI_ARCH_PATH)/lib/linux_ia32 -lmpi
+
+#------------------------------------------------------------------------------
--- a/wmake/rules/General/mplib-ia64-HPMPI
+++ b/wmake/rules/General/mplib-ia64-HPMPI
@ -0,0 +1,8 @@
+#------------------------------------------------------------------------------
+# HPMPI rules (ia64)
+
+PFLAGS     =
+PINC       = -isystem $(MPI_ARCH_PATH)/include -D_MPICC_H
+PLIBS      = -L$(MPI_ARCH_PATH)/lib/linux_ia64 -lmpi
+
+#------------------------------------------------------------------------------
--- a/wmake/rules/General/mplib-x86_64-HPMPI
+++ b/wmake/rules/General/mplib-x86_64-HPMPI
@ -0,0 +1,8 @@
+#------------------------------------------------------------------------------
+# HPMPI rules (x86_64)
+
+PFLAGS     =
+PINC       = -isystem $(MPI_ARCH_PATH)/include -D_MPICC_H
+PLIBS      = -L$(MPI_ARCH_PATH)/lib/linux_amd64 -lmpi
+
+#------------------------------------------------------------------------------
--- a/wmake/rules/General/mplib-x86_64-INTELMPI
+++ b/wmake/rules/General/mplib-x86_64-INTELMPI
@ -0,0 +1,8 @@
+#------------------------------------------------------------------------------
+# INTELMPI rules (x86_64)
+
+PFLAGS     = -DMPICH_SKIP_MPICXX -DOMPI_SKIP_MPICXX
+PINC       = -isystem $(MPI_ARCH_PATH)/intel64/include
+PLIBS      = -L$(MPI_ARCH_PATH)/intel64/lib -lmpi
+
+#------------------------------------------------------------------------------
--- a/wmake/rules/General/mplibCRAY-MPICH
+++ b/wmake/rules/General/mplibCRAY-MPICH
@ -1 +1,6 @@
+#------------------------------------------------------------------------------
+# Cray MPICH is MPICH
+
 include $(GENERAL_RULES)/mplibMPICH
+
+#------------------------------------------------------------------------------
--- a/wmake/rules/General/mplibMPICH
+++ b/wmake/rules/General/mplibMPICH
@ -1,3 +1,7 @@
+#------------------------------------------------------------------------------
+
 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 -lrt
+
+#------------------------------------------------------------------------------
--- a/wmake/rules/General/mplibMPICH-GM
+++ b/wmake/rules/General/mplibMPICH-GM
@ -1,3 +1,7 @@
+#------------------------------------------------------------------------------
+
 PFLAGS     =
 PINC       = -isystem $(MPI_ARCH_PATH)/include
 PLIBS      = -L$(MPI_ARCH_PATH)/lib$(WM_COMPILER_LIB_ARCH) -L$(MPI_ARCH_PATH)/lib -lmpich -L$(GM_LIB_PATH) -lgm
+
+#------------------------------------------------------------------------------
--- a/wmake/rules/General/mplibMVA2MPI
+++ b/wmake/rules/General/mplibMVA2MPI
@ -1,3 +1,7 @@
+#------------------------------------------------------------------------------
+
 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
+
+#------------------------------------------------------------------------------
--- a/wmake/rules/General/mplibOPENMPI
+++ b/wmake/rules/General/mplibOPENMPI
@ -1,3 +1,7 @@
+#------------------------------------------------------------------------------
+
 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
+
+#------------------------------------------------------------------------------
--- a/wmake/rules/General/mplibQSMPI
+++ b/wmake/rules/General/mplibQSMPI
@ -1,3 +1,7 @@
+#------------------------------------------------------------------------------
+
 PFLAGS     =
 PINC       = -isystem $(MPI_ARCH_PATH)/include
 PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpi
+
+#------------------------------------------------------------------------------
--- a/wmake/rules/General/mplibSGIMPI
+++ b/wmake/rules/General/mplibSGIMPI
@ -1,3 +1,7 @@
+#------------------------------------------------------------------------------
+
 PFLAGS     = -DSGIMPI -DMPI_NO_CPPBIND
 PINC       = -isystem $(MPI_ARCH_PATH)/include
 PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpi
+
+#------------------------------------------------------------------------------
--- a/wmake/rules/General/mplibSYSTEMMPI
+++ b/wmake/rules/General/mplibSYSTEMMPI
@ -1,5 +1,8 @@
-# Use the system installed mpi - depends on specific environment variables
+#------------------------------------------------------------------------------
+# System installed mpi - depends on specific environment variables

 PFLAGS     = $(MPI_ARCH_FLAGS)
 PINC       = $(MPI_ARCH_INC)
 PLIBS      = $(MPI_ARCH_LIBS)
+
+#------------------------------------------------------------------------------
--- a/wmake/rules/General/mplibSYSTEMOPENMPI
+++ b/wmake/rules/General/mplibSYSTEMOPENMPI
@ -1,5 +1,6 @@
-# Use the system installed openmpi - mpicc must be installed
+#------------------------------------------------------------------------------
+# Use openmpi mpicc to obtain settings - mpicc must be available

-PFLAGS     = -DMPICH_SKIP_MPICXX -DOMPI_SKIP_MPICXX
-PINC       = $(shell mpicc --showme:compile)
-PLIBS      = $(shell mpicc --showme:link)
+include $(GENERAL_RULES)/mpi-mpicc-openmpi
+
+#------------------------------------------------------------------------------
--- a/wmake/rules/General/no-mpi
+++ b/wmake/rules/General/no-mpi
@ -1,7 +1,8 @@
+#------------------------------------------------------------------------------
 # Empty flags for not compiling/linking MPI

-PFLAGS     =
-PINC       =
-PLIBS      =
+PFLAGS  =
+PINC    =
+PLIBS   =

 #------------------------------------------------------------------------------
--- a/wmake/rules/linux64Amd/mplibHPMPI
+++ b/wmake/rules/linux64Amd/mplibHPMPI
@ -1,3 +1 @@
-PFLAGS     =
-PINC       = -isystem $(MPI_ARCH_PATH)/include -D_MPICC_H
-PLIBS      = -L$(MPI_ARCH_PATH)/lib/linux_amd64 -lmpi
+include $(GENERAL_RULES)/mplib-x86_64-HPMPI
--- a/wmake/rules/linux64Amd/mplibINTELMPI
+++ b/wmake/rules/linux64Amd/mplibINTELMPI
@ -1,3 +1 @@
-PFLAGS     = -DMPICH_SKIP_MPICXX -DOMPI_SKIP_MPICXX
-PINC       = -isystem $(MPI_ARCH_PATH)/intel64/include
-PLIBS      = -L$(MPI_ARCH_PATH)/intel64/lib -lmpi
+include $(GENERAL_RULES)/mplib-x86_64-INTELMPI
--- a/wmake/rules/linux64Clang/mplibHPMPI
+++ b/wmake/rules/linux64Clang/mplibHPMPI
@ -1,3 +1 @@
-PFLAGS     =
-PINC       = -isystem $(MPI_ARCH_PATH)/include -D_MPICC_H
-PLIBS      = -L$(MPI_ARCH_PATH)/lib/linux_amd64 -lmpi
+include $(GENERAL_RULES)/mplib-x86_64-HPMPI
--- a/wmake/rules/linux64Clang/mplibINTELMPI
+++ b/wmake/rules/linux64Clang/mplibINTELMPI
@ -1,3 +1 @@
-PFLAGS     = -DMPICH_SKIP_MPICXX -DOMPI_SKIP_MPICXX
-PINC       = -isystem $(MPI_ARCH_PATH)/intel64/include
-PLIBS      = -L$(MPI_ARCH_PATH)/intel64/lib -lmpi
+include $(GENERAL_RULES)/mplib-x86_64-INTELMPI
--- a/wmake/rules/linux64Cray/mplibINTELMPI
+++ b/wmake/rules/linux64Cray/mplibINTELMPI
@ -1,3 +1 @@
-PFLAGS     = -DMPICH_SKIP_MPICXX -DOMPI_SKIP_MPICXX
-PINC       = -isystem $(MPI_ARCH_PATH)/intel64/include
-PLIBS      = -L$(MPI_ARCH_PATH)/intel64/lib -lmpi
+include $(GENERAL_RULES)/mplib-x86_64-INTELMPI
--- a/wmake/rules/linux64Gcc/mplibHPMPI
+++ b/wmake/rules/linux64Gcc/mplibHPMPI
@ -1,3 +1 @@
-PFLAGS     =
-PINC       = -isystem $(MPI_ARCH_PATH)/include -D_MPICC_H
-PLIBS      = -L$(MPI_ARCH_PATH)/lib/linux_amd64 -lmpi
+include $(GENERAL_RULES)/mplib-x86_64-HPMPI
--- a/wmake/rules/linux64Gcc/mplibINTELMPI
+++ b/wmake/rules/linux64Gcc/mplibINTELMPI
@ -1,3 +1 @@
-PFLAGS     = -DMPICH_SKIP_MPICXX -DOMPI_SKIP_MPICXX
-PINC       = -isystem $(MPI_ARCH_PATH)/intel64/include
-PLIBS      = -L$(MPI_ARCH_PATH)/intel64/lib -lmpi
+include $(GENERAL_RULES)/mplib-x86_64-INTELMPI
--- a/wmake/rules/linux64Icc/mplibHPMPI
+++ b/wmake/rules/linux64Icc/mplibHPMPI
@ -1,3 +1 @@
-PFLAGS     =
-PINC       = -isystem $(MPI_ARCH_PATH)/include -D_MPICC_H
-PLIBS      = -L$(MPI_ARCH_PATH)/lib/linux_amd64 -lmpi
+include $(GENERAL_RULES)/mplib-x86_64-HPMPI
--- a/wmake/rules/linux64Icc/mplibINTELMPI
+++ b/wmake/rules/linux64Icc/mplibINTELMPI
@ -1,3 +1 @@
-PFLAGS     = -DMPICH_SKIP_MPICXX -DOMPI_SKIP_MPICXX
-PINC       = -isystem $(MPI_ARCH_PATH)/intel64/include
-PLIBS      = -L$(MPI_ARCH_PATH)/intel64/lib -lmpi
+include $(GENERAL_RULES)/mplib-x86_64-INTELMPI
--- a/wmake/rules/linuxClang/mplibHPMPI
+++ b/wmake/rules/linuxClang/mplibHPMPI
@ -1,3 +1 @@
-PFLAGS     =
-PINC       = -isystem $(MPI_ARCH_PATH)/include -D_MPICC_H
-PLIBS      = -L$(MPI_ARCH_PATH)/lib/linux_ia32 -lmpi
+include $(GENERAL_RULES)/mplib-ia32-HPMPI
--- a/wmake/rules/linuxGcc/mplibHPMPI
+++ b/wmake/rules/linuxGcc/mplibHPMPI
@ -1,3 +1 @@
-PFLAGS     =
-PINC       = -isystem $(MPI_ARCH_PATH)/include -D_MPICC_H
-PLIBS      = -L$(MPI_ARCH_PATH)/lib/linux_ia32 -lmpi
+include $(GENERAL_RULES)/mplib-ia32-HPMPI
--- a/wmake/rules/linuxIA64Gcc/mplibHPMPI
+++ b/wmake/rules/linuxIA64Gcc/mplibHPMPI
@ -1,3 +1 @@
-PFLAGS     =
-PINC       = -isystem $(MPI_ARCH_PATH)/include -D_MPICC_H
-PLIBS      = -L$(MPI_ARCH_PATH)/lib/linux_ia64 -lmpi
+include $(GENERAL_RULES)/mplib-ia64-HPMPI
--- a/wmake/rules/linuxIA64Icc/mplibHPMPI
+++ b/wmake/rules/linuxIA64Icc/mplibHPMPI
@ -1,3 +1 @@
-PFLAGS     =
-PINC       = -isystem $(MPI_ARCH_PATH)/include -D_MPICC_H
-PLIBS      = -L$(MPI_ARCH_PATH)/lib/linux_ia64 -lmpi
+include $(GENERAL_RULES)/mplib-ia64-HPMPI
--- a/wmake/rules/linuxIA64Icc/mplibINTELMPI
+++ b/wmake/rules/linuxIA64Icc/mplibINTELMPI
@ -1,3 +0,0 @@
-PFLAGS     = -DMPICH_SKIP_MPICXX -DOMPI_SKIP_MPICXX
-PINC       = -isystem $(MPI_ARCH_PATH)/intel64/include
-PLIBS      = -L$(MPI_ARCH_PATH)/intel64/lib -lmpi
--- a/wmake/rules/linuxIcc/mplibHPMPI
+++ b/wmake/rules/linuxIcc/mplibHPMPI
@ -1,3 +1 @@
-PFLAGS     =
-PINC       = -isystem $(MPI_ARCH_PATH)/include -D_MPICC_H
-PLIBS      = -L$(MPI_ARCH_PATH)/lib/linux_ia32 -lmpi
+include $(GENERAL_RULES)/mplib-ia32-HPMPI