Skip to content

Commit 0f015b0

Browse files
theurichbena-nasa
theurich
authored and
bena-nasa
committed
Consistently use ESMF_COMM=mvapich to refer to MVAPICH of any version.
Remove the ESMF_COMM=mvapich2 branch inside build_rules.mk, but continue to support it from the user level for backward compatibility. However, issue a WARNING advicing users to set ESMF_COMM=mvapich for any MVAPICH version. Update relevant documentation.
1 parent 5f43098 commit 0f015b0

File tree

25 files changed

+78
-100
lines changed

25 files changed

+78
-100
lines changed

‎build/common.mk‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,10 @@ ifeq ($(ESMF_COMM),mpich3)
147147
export ESMF_COMM = mpich
148148
$(warning !!! For MPICH3 and up, please use ESMF_COMM=mpich !!!)
149149
endif
150+
ifeq ($(ESMF_COMM),mvapich2)
151+
export ESMF_COMM = mvapich
152+
$(warning !!! For all versions of MVAPICH, including MVAPICH2, please use ESMF_COMM=mvapich !!!)
153+
endif
150154
endif
151155

152156
ifndef ESMF_COMPILER

‎build/doc/user_arch.tex‎

Lines changed: 30 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -18,84 +18,83 @@
1818
{\bfseries\footnotesize ESMF\_OS} &{\bfseries\footnotesize ESMF\_COMPILER} & {\bfseries\footnotesize ESMF\_COMM} & {\bfseries\footnotesize ESMF\_ABI} \\
1919

2020
AIX &\tt {\bf default} &\footnotesize \tt mpiuni,{\bf mpi},user &\tt 32, {\bf 64} \\
21-
Cygwin &\tt g95 &\footnotesize \tt {\bf mpiuni},mpich,mpich1,mpich2,mpich3,lam,openmpi,user &\tt 32, 64 \\
22-
Cygwin &\tt {\bf gfortran} &\footnotesize \tt {\bf mpiuni},mpich,mpich1,mpich2,mpich3,lam,msmpi,openmpi,user &\tt 32, 64 \\
23-
Darwin &\tt absoft &\footnotesize \tt {\bf mpiuni},mpich,mpich1,mpich2,mpich3,mvapich2,lam,openmpi,user &\tt 32, 64 \\
24-
Darwin &\tt g95 &\footnotesize \tt {\bf mpiuni},mpich,mpich1,mpich2,mpich3,mvapich2,lam,openmpi,user &\tt 32, 64 \\
25-
Darwin &\tt gfortran &\footnotesize \tt {\bf mpiuni},mpich,mpich1,mpich2,mpich3,mvapich2,lam,openmpi,user &\tt 32, 64 \\
26-
Darwin &\tt {\bf gfortranclang} &\footnotesize \tt {\bf mpiuni},mpich,mpich1,mpich2,mpich3,mvapich2,lam,openmpi,user &\tt 32, 64 \\
27-
Darwin &\tt intel &\footnotesize \tt {\bf mpiuni},mpich,mpich1,mpich2,mpich3,mvapich2,intelmpi,lam, &\tt 32, 64 \\
21+
Cygwin &\tt g95 &\footnotesize \tt {\bf mpiuni},mpich,mpich1,mpich2,lam,openmpi,user &\tt 32, 64 \\
22+
Cygwin &\tt {\bf gfortran} &\footnotesize \tt {\bf mpiuni},mpich,mpich1,mpich2,lam,msmpi,openmpi,user &\tt 32, 64 \\
23+
Darwin &\tt absoft &\footnotesize \tt {\bf mpiuni},mpich,mpich1,mpich2,mvapich,lam,openmpi,user &\tt 32, 64 \\
24+
Darwin &\tt g95 &\footnotesize \tt {\bf mpiuni},mpich,mpich1,mpich2,mvapich,lam,openmpi,user &\tt 32, 64 \\
25+
Darwin &\tt gfortran &\footnotesize \tt {\bf mpiuni},mpich,mpich1,mpich2,mvapich,lam,openmpi,user &\tt 32, 64 \\
26+
Darwin &\tt {\bf gfortranclang} &\footnotesize \tt {\bf mpiuni},mpich,mpich1,mpich2,mvapich,lam,openmpi,user &\tt 32, 64 \\
27+
Darwin &\tt intel &\footnotesize \tt {\bf mpiuni},mpich,mpich1,mpich2,mvapich,intelmpi,lam, &\tt 32, 64 \\
2828
& &\footnotesize \tt openmpi,user & \\
29-
Darwin &\tt intelclang &\footnotesize \tt {\bf mpiuni},mpich,mpich1,mpich2,mpich3,intelmpi,lam,openmpi,user &\tt 32, 64 \\
30-
Darwin &\tt intelgcc &\footnotesize \tt {\bf mpiuni},mpich,mpich1,mpich2,mpich3,intelmpi,lam,openmpi,user &\tt 32, 64 \\
31-
Darwin &\tt nag &\footnotesize \tt {\bf mpiuni},mpich,mpich1,mpich2,mpich3,mvapich2,lam,openmpi,user &\tt 32, 64 \\
32-
Darwin &\tt pgi &\footnotesize \tt {\bf mpiuni},mpich,mpich1,mpich2,mpich3,mvapich,mvapich2,lam, &\tt 32, 64 \\
33-
& &\footnotesize \tt openmpi,user & \\
34-
Darwin &\tt xlf &\footnotesize \tt mpiuni,{\bf mpi},mpich,mpich1,mpich2,mpich3,lam,openmpi,user &\tt 32 \\
35-
Darwin &\tt xlfgcc &\footnotesize \tt mpiuni,{\bf mpi},mpich,mpich1,mpich2,mpich3,lam,openmpi,user &\tt 32 \\
29+
Darwin &\tt intelclang &\footnotesize \tt {\bf mpiuni},mpich,mpich1,mpich2,intelmpi,lam,openmpi,user &\tt 32, 64 \\
30+
Darwin &\tt intelgcc &\footnotesize \tt {\bf mpiuni},mpich,mpich1,mpich2,intelmpi,lam,openmpi,user &\tt 32, 64 \\
31+
Darwin &\tt nag &\footnotesize \tt {\bf mpiuni},mpich,mpich1,mpich2,mvapich,lam,openmpi,user &\tt 32, 64 \\
32+
Darwin &\tt pgi &\footnotesize \tt {\bf mpiuni},mpich,mpich1,mpich2,mvapich,lam,openmpi,user &\tt 32, 64 \\
33+
Darwin &\tt xlf &\footnotesize \tt mpiuni,{\bf mpi},mpich,mpich1,mpich2,lam,openmpi,user &\tt 32 \\
34+
Darwin &\tt xlfgcc &\footnotesize \tt mpiuni,{\bf mpi},mpich,mpich1,mpich2,lam,openmpi,user &\tt 32 \\
3635
IRIX64 &\tt {\bf default} &\footnotesize \tt mpiuni,{\bf mpi},user &\tt 32, {\bf 64} \\
37-
Linux &\tt absoft &\footnotesize \tt {\bf mpiuni},mpich,mpich1,mpich2,mpich3,mvapich2,lam,openmpi,user &\tt 32, 64 \\
38-
Linux &\tt absoftintel &\footnotesize \tt {\bf mpiuni},mpich,mpich1,mpich2,mpich3,lam,openmpi,user &\tt 32, 64 \\
39-
Linux &\tt aocc &\footnotesize \tt {\bf mpiuni},mpi,mpt,mpich,mpich1,mpich2,mpich3,mvapich2, &\tt 32, 64, \\
36+
Linux &\tt absoft &\footnotesize \tt {\bf mpiuni},mpich,mpich1,mpich2,mvapich,lam,openmpi,user &\tt 32, 64 \\
37+
Linux &\tt absoftintel &\footnotesize \tt {\bf mpiuni},mpich,mpich1,mpich2,lam,openmpi,user &\tt 32, 64 \\
38+
Linux &\tt aocc &\footnotesize \tt {\bf mpiuni},mpi,mpt,mpich,mpich1,mpich2,mvapich, &\tt 32, 64, \\
4039
& &\footnotesize \tt intelmpi,lam,openmpi,user &\tt ia64\_64, \\
4140
& & &\tt x86\_64\_32, \\
4241
& & &\tt x86\_64\_small, \\
4342
& & &\tt x86\_64\_medium \\
44-
Linux &\tt arm &\footnotesize \tt {\bf mpiuni},mpi,mpt,mpich,mpich1,mpich2,mpich3,mvapich2, &\tt 32, 64, \\
43+
Linux &\tt arm &\footnotesize \tt {\bf mpiuni},mpi,mpt,mpich,mpich1,mpich2,mvapich, &\tt 32, 64, \\
4544
& &\footnotesize \tt intelmpi,lam,openmpi,user &\tt ia64\_64, \\
4645
& & &\tt x86\_64\_32, \\
4746
& & &\tt x86\_64\_small, \\
4847
& & &\tt x86\_64\_medium \\
4948
Linux &\tt fujitsu &\footnotesize \tt {\bf mpiuni},mpi,user &\tt 64 \\
50-
Linux &\tt g95 &\footnotesize \tt {\bf mpiuni},mpich,mpich1,mpich2,mpich3,mvapich2,lam,openmpi,user &\tt 32, 64, \\
49+
Linux &\tt g95 &\footnotesize \tt {\bf mpiuni},mpich,mpich1,mpich2,mvapich,lam,openmpi,user &\tt 32, 64, \\
5150
& & &\tt ia64\_64, \\
5251
& & &\tt x86\_64\_32, \\
5352
& & &\tt x86\_64\_small, \\
5453
& & &\tt x86\_64\_medium \\
55-
Linux &\tt {\bf gfortran} &\footnotesize \tt {\bf mpiuni},mpi,mpt,mpich,mpich1,mpich2,mpich3,mvapich2, &\tt 32, 64, \\
54+
Linux &\tt {\bf gfortran} &\footnotesize \tt {\bf mpiuni},mpi,mpt,mpich,mpich1,mpich2,mvapich, &\tt 32, 64, \\
5655
& &\footnotesize \tt intelmpi,lam,openmpi,user &\tt ia64\_64, \\
5756
& & &\tt x86\_64\_32, \\
5857
& & &\tt x86\_64\_small, \\
5958
& & &\tt x86\_64\_medium \\
60-
Linux &\tt gfortranclang &\footnotesize \tt {\bf mpiuni},mpi,mpt,mpich,mpich1,mpich2,mpich3,mvapich2, &\tt 32, 64, \\
59+
Linux &\tt gfortranclang &\footnotesize \tt {\bf mpiuni},mpi,mpt,mpich,mpich1,mpich2,mvapich, &\tt 32, 64, \\
6160
& &\footnotesize \tt lam,openmpi,user &\tt ia64\_64, \\
6261
& & &\tt x86\_64\_32, \\
6362
& & &\tt x86\_64\_small, \\
6463
& & &\tt x86\_64\_medium \\
65-
Linux &\tt intel &\footnotesize \tt {\bf mpiuni},mpi,mpt,mpich,mpich1,mpich2,mpich3,mvapich2, &\tt 32, 64, \\
64+
Linux &\tt intel &\footnotesize \tt {\bf mpiuni},mpi,mpt,mpich,mpich1,mpich2,mvapich, &\tt 32, 64, \\
6665
& &\footnotesize \tt intelmpi,scalimpi,lam,openmpi,user &\tt ia64\_64, \\
6766
& & &\tt x86\_64\_32, \\
6867
& & &\tt x86\_64\_small, \\
6968
& & &\tt x86\_64\_medium, \\
7069
& & &\tt mic \\
71-
Linux &\tt intelgcc &\footnotesize \tt {\bf mpiuni},mpi,mpt,mpich,mpich1,mpich2,mpich3,mvapich2, &\tt 32, 64, \\
70+
Linux &\tt intelgcc &\footnotesize \tt {\bf mpiuni},mpi,mpt,mpich,mpich1,mpich2,mvapich, &\tt 32, 64, \\
7271
& &\footnotesize \tt intelmpi,lam,openmpi,user &\tt ia64\_64, \\
7372
& & &\tt x86\_64\_32, \\
7473
& & &\tt x86\_64\_small, \\
7574
& & &\tt x86\_64\_medium \\
76-
Linux &\tt lahey &\footnotesize \tt {\bf mpiuni},mpich,mpich1,mpich2,mpich3,mvapich2,lam, &\tt 32, 64 \\
75+
Linux &\tt lahey &\footnotesize \tt {\bf mpiuni},mpich,mpich1,mpich2,mvapich,lam, &\tt 32, 64 \\
7776
& &\footnotesize \tt openmpi,user & \\
78-
Linux &\tt llvm &\footnotesize \tt {\bf mpiuni},mpi,mpt,mpich,mpich1,mpich2,mpich3,mvapich2, &\tt 32, 64, \\
77+
Linux &\tt llvm &\footnotesize \tt {\bf mpiuni},mpi,mpt,mpich,mpich1,mpich2,mvapich, &\tt 32, 64, \\
7978
& &\footnotesize \tt intelmpi,lam,openmpi,user &\tt ia64\_64, \\
8079
& & &\tt x86\_64\_32, \\
8180
& & &\tt x86\_64\_small, \\
8281
& & &\tt x86\_64\_medium \\
83-
Linux &\tt nag &\footnotesize \tt {\bf mpiuni},mpich,mpich1,mpich2,mpich3,mvapich2,lam, &\tt 32, 64 \\
82+
Linux &\tt nag &\footnotesize \tt {\bf mpiuni},mpich,mpich1,mpich2,mvapich,lam, &\tt 32, 64 \\
8483
& &\footnotesize \tt openmpi,user & \\
85-
Linux &\tt nagintel &\footnotesize \tt {\bf mpiuni},mpich,mpich1,mpich2,mpich3,lam,openmpi,user &\tt 32, 64 \\
86-
Linux &\tt nvhpc &\footnotesize \tt {\bf mpiuni},mpi,mpt,mpich,mpich1,mpich2,mpich3,mvapich,mvapich2 &\tt 32, 64, \\
84+
Linux &\tt nagintel &\footnotesize \tt {\bf mpiuni},mpich,mpich1,mpich2,lam,openmpi,user &\tt 32, 64 \\
85+
Linux &\tt nvhpc &\footnotesize \tt {\bf mpiuni},mpi,mpt,mpich,mpich1,mpich2,mvapich, &\tt 32, 64, \\
8786
& &\footnotesize \tt intelmpi,openmpi,user &\tt x86\_64\_32, \\
8887
& & &\tt x86\_64\_small, \\
8988
& & &\tt x86\_64\_medium \\
90-
Linux &\tt pathscale &\footnotesize \tt {\bf mpiuni},mpich,mpich1,mpich2,mpich3,lam,openmpi,user &\tt 32, 64, \\
89+
Linux &\tt pathscale &\footnotesize \tt {\bf mpiuni},mpich,mpich1,mpich2,lam,openmpi,user &\tt 32, 64, \\
9190
& & &\tt x86\_64\_32, \\
9291
& & &\tt x86\_64\_small, \\
9392
& & &\tt x86\_64\_medium \\
94-
Linux &\tt pgi &\footnotesize \tt {\bf mpiuni},mpi,mpt,mpich,mpich1,mpich2,mpich3,mvapich,mvapich2 &\tt 32, 64, \\
93+
Linux &\tt pgi &\footnotesize \tt {\bf mpiuni},mpi,mpt,mpich,mpich1,mpich2,mvapich, &\tt 32, 64, \\
9594
& &\footnotesize \tt intelmpi,scalimpi,lam,openmpi,user &\tt x86\_64\_32, \\
9695
& & &\tt x86\_64\_small, \\
9796
& & &\tt x86\_64\_medium \\
98-
Linux &\tt pgigcc &\footnotesize \tt {\bf mpiuni},mpich,mpich1,mpich2,mpich3,lam,openmpi,user &\tt 32 \\
97+
Linux &\tt pgigcc &\footnotesize \tt {\bf mpiuni},mpich,mpich1,mpich2,lam,openmpi,user &\tt 32 \\
9998
Linux &\tt sxcross &\footnotesize \tt mpiuni,{\bf mpi},user &\tt 32 \\
10099
Linux &\tt xlf &\footnotesize \tt mpiuni,{\bf mpi},user &\tt 32 \\
101100
MinGW &\tt {\bf gfortran} &\footnotesize \tt {\bf mpiuni},msmpi,user &\tt 32, 64 \\

‎build_config/Darwin.absoft.default/build_rules.mk‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ ESMF_CXXLINKLIBS += $(shell $(ESMF_DIR)/scripts/libs.mpich3f90)
5151
ESMF_MPIRUNDEFAULT = mpirun $(ESMF_MPILAUNCHOPTIONS)
5252
ESMF_MPIMPMDRUNDEFAULT = mpiexec $(ESMF_MPILAUNCHOPTIONS)
5353
else
54-
ifeq ($(ESMF_COMM),mvapich2)
55-
# Mvapich2 ---------------------------------------------------
54+
ifeq ($(ESMF_COMM),mvapich)
55+
# Mvapich any version --------------------------------------
5656
ESMF_F90DEFAULT = mpif90
5757
ESMF_CXXDEFAULT = mpicxx
5858
ESMF_CDEFAULT = mpicc

‎build_config/Darwin.g95.default/build_rules.mk‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ ESMF_CXXLINKLIBS += $(shell $(ESMF_DIR)/scripts/libs.mpich3f90)
5252
ESMF_MPIRUNDEFAULT = mpirun $(ESMF_MPILAUNCHOPTIONS)
5353
ESMF_MPIMPMDRUNDEFAULT = mpiexec $(ESMF_MPILAUNCHOPTIONS)
5454
else
55-
ifeq ($(ESMF_COMM),mvapich2)
56-
# Mvapich2 ---------------------------------------------------
55+
ifeq ($(ESMF_COMM),mvapich)
56+
# Mvapich any version --------------------------------------
5757
ESMF_F90DEFAULT = mpif90
5858
ESMF_CXXDEFAULT = mpicxx
5959
ESMF_CDEFAULT = mpicc

‎build_config/Darwin.gfortran.default/build_rules.mk‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ ESMF_CXXLINKLIBS += $(shell $(ESMF_DIR)/scripts/libs.mpich3f90)
5151
ESMF_MPIRUNDEFAULT = mpirun $(ESMF_MPILAUNCHOPTIONS)
5252
ESMF_MPIMPMDRUNDEFAULT = mpiexec $(ESMF_MPILAUNCHOPTIONS)
5353
else
54-
ifeq ($(ESMF_COMM),mvapich2)
55-
# Mvapich2 ---------------------------------------------------
54+
ifeq ($(ESMF_COMM),mvapich)
55+
# Mvapich any version --------------------------------------
5656
ESMF_F90DEFAULT = mpif90
5757
ESMF_CXXDEFAULT = mpicxx
5858
ESMF_CDEFAULT = mpicc

‎build_config/Darwin.gfortranclang.default/build_rules.mk‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ ESMF_F90LINKLIBS += $(shell $(ESMF_DIR)/scripts/libs.mpich3f90)
6060
ESMF_MPIRUNDEFAULT = mpirun $(ESMF_MPILAUNCHOPTIONS)
6161
ESMF_MPIMPMDRUNDEFAULT = mpiexec $(ESMF_MPILAUNCHOPTIONS)
6262
else
63-
ifeq ($(ESMF_COMM),mvapich2)
64-
# Mvapich2 -------------------------------------------------
63+
ifeq ($(ESMF_COMM),mvapich)
64+
# Mvapich any version --------------------------------------
6565
ESMF_F90DEFAULT = mpif90
6666
ESMF_CXXDEFAULT = mpicxx
6767
ESMF_CDEFAULT = mpicc

‎build_config/Darwin.intel.default/build_rules.mk‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ ESMF_CXXLINKLIBS += $(shell $(ESMF_DIR)/scripts/libs.mpich3f90)
5151
ESMF_MPIRUNDEFAULT = mpirun $(ESMF_MPILAUNCHOPTIONS)
5252
ESMF_MPIMPMDRUNDEFAULT = mpiexec $(ESMF_MPILAUNCHOPTIONS)
5353
else
54-
ifeq ($(ESMF_COMM),mvapich2)
55-
# Mvapich2 ---------------------------------------------------
54+
ifeq ($(ESMF_COMM),mvapich)
55+
# Mvapich any version --------------------------------------
5656
ESMF_F90DEFAULT = mpif90
5757
ESMF_CXXDEFAULT = mpicxx
5858
ESMF_CDEFAULT = mpicc

‎build_config/Darwin.nag.default/build_rules.mk‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ ESMF_CXXLINKLIBS += $(shell $(ESMF_DIR)/scripts/libs.mpich3f90)
5151
ESMF_MPIRUNDEFAULT = mpirun $(ESMF_MPILAUNCHOPTIONS)
5252
ESMF_MPIMPMDRUNDEFAULT = mpiexec $(ESMF_MPILAUNCHOPTIONS)
5353
else
54-
ifeq ($(ESMF_COMM),mvapich2)
55-
# Mvapich2 ---------------------------------------------------
54+
ifeq ($(ESMF_COMM),mvapich)
55+
# Mvapich any version --------------------------------------
5656
ESMF_F90DEFAULT = mpif90
5757
ESMF_CXXDEFAULT = mpicxx
5858
ESMF_CDEFAULT = mpicc

‎build_config/Darwin.pgi.default/build_rules.mk‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -63,15 +63,7 @@ ESMF_MPIRUNDEFAULT = mpirun $(ESMF_MPILAUNCHOPTIONS)
6363
ESMF_MPIMPMDRUNDEFAULT = mpiexec $(ESMF_MPILAUNCHOPTIONS)
6464
else
6565
ifeq ($(ESMF_COMM),mvapich)
66-
# Mvapich ---------------------------------------------------
67-
ESMF_F90DEFAULT = mpif90
68-
ESMF_CXXDEFAULT = mpicxx
69-
ESMF_CDEFAULT = mpicc
70-
ESMF_MPIRUNDEFAULT = mpirun $(ESMF_MPILAUNCHOPTIONS)
71-
ESMF_MPIMPMDRUNDEFAULT = mpiexec $(ESMF_MPILAUNCHOPTIONS)
72-
else
73-
ifeq ($(ESMF_COMM),mvapich2)
74-
# Mvapich2 ---------------------------------------------------
66+
# Mvapich any version --------------------------------------
7567
ESMF_F90DEFAULT = mpif90
7668
ESMF_CXXDEFAULT = mpicxx
7769
ESMF_CDEFAULT = mpicc
@@ -113,7 +105,6 @@ endif
113105
endif
114106
endif
115107
endif
116-
endif
117108

118109
############################################################
119110
# Print compiler version string

‎build_config/Linux.absoft.default/build_rules.mk‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ ESMF_CDEFAULT = mpicc
5050
ESMF_MPIRUNDEFAULT = mpirun $(ESMF_MPILAUNCHOPTIONS)
5151
ESMF_MPIMPMDRUNDEFAULT = mpiexec $(ESMF_MPILAUNCHOPTIONS)
5252
else
53-
ifeq ($(ESMF_COMM),mvapich2)
54-
# Mvapich2 ---------------------------------------------------
53+
ifeq ($(ESMF_COMM),mvapich)
54+
# Mvapich any version --------------------------------------
5555
ESMF_F90DEFAULT = mpif90
5656
ESMF_CXXDEFAULT = mpicxx
5757
ESMF_CDEFAULT = mpicc

0 commit comments

Comments
 (0)