Updated supermic to use mpiifort with the new Intel suite they added

Issue 1413: Resolves #1413. Resolves #1414 (PR).
StormSurgeLive · Nov 7, 2024 · 1d307b5 · 1d307b5
1 parent 6fc65e2
commit 1d307b5
Show file tree

Hide file tree

Showing 4 changed files with 85 additions and 81 deletions.
diff --git a/patches/ADCIRC/v53release/01-cmplrflags-mk.patch b/patches/ADCIRC/v53release/01-cmplrflags-mk.patch
@@ -1,5 +1,5 @@
 diff --git a/work/cmplrflags.mk b/work/cmplrflags.mk
-index 2c0eb06..4633a30 100644
+index 2c0eb06..55b19d1 100644
 --- a/work/cmplrflags.mk
 +++ b/work/cmplrflags.mk
 @@ -89,13 +89,10 @@ ifeq ($(compiler),gnu)
@@ -113,7 +113,7 @@ index 2c0eb06..4633a30 100644
    CFLAGS        := $(INCDIRS) -O2 -xSSE4.2 -m64 -mcmodel=medium -DLINUX
    FLIBS         :=
    ifeq ($(DEBUG),full)
-@@ -248,45 +247,123 @@ ifeq ($(compiler),intel)
+@@ -248,45 +247,124 @@ ifeq ($(compiler),intel)
       FFLAGS1       :=  $(INCDIRS) -g -O0 -traceback -FI -assume byterecl -132 -DNETCDF_TRACE -DFULL_STACK -DFLUSH_MESSAGES
    endif
    #
@@ -194,6 +194,7 @@ index 2c0eb06..4633a30 100644
       endif
    endif
 +  ifeq ($(MACHINENAME),supermic)
++     PFC     :=  mpiifort
 +     FFLAGS1 := $(INCDIRS) -O2 -FI -assume byterecl -132 -xAVX
 +     CFLAGS  := $(INCDIRS) -O2 -DLINUX -xAVX
 +     FLIBS   := $(INCDIRS) -xAVX
@@ -262,7 +263,7 @@ index 2c0eb06..4633a30 100644
    endif
    #
    #@jasonfleming Added to fix bus error on hatteras@renci
-@@ -302,67 +379,66 @@ ifeq ($(compiler),intel)
+@@ -302,67 +380,66 @@ ifeq ($(compiler),intel)
       DPRE          := $(DPRE) -DADCSWAN
    endif
    IMODS         :=  -I
@@ -357,7 +358,7 @@ index 2c0eb06..4633a30 100644
       ifeq ($(MACHINENAME),killdevil)
          HDF5HOME       :=/nas02/apps/hdf5-1.8.5/lib
          NETCDFHOME     :=/nas02/apps/netcdf-4.1.1
-@@ -384,7 +460,7 @@ ifeq ($(compiler),intel-ND)
+@@ -384,7 +461,7 @@ ifeq ($(compiler),intel-ND)
    PPFC            :=  ifort
    FC            :=  ifort
    PFC           :=  mpif90
@@ -366,7 +367,7 @@ index 2c0eb06..4633a30 100644
    ifeq ($(DEBUG),full)
       FFLAGS1       :=  $(INCDIRS) -g -O0 -traceback -debug -check all -i-dynamic -FI -assume byterecl -132 -DALL_TRACE -DFULL_STACK -DFLUSH_MESSAGES
    endif
-@@ -399,15 +475,15 @@ ifeq ($(compiler),intel-ND)
+@@ -399,15 +476,15 @@ ifeq ($(compiler),intel-ND)
    IMODS         :=  -I
    CC            := icc
    CCBE          := $(CC)
@@ -385,7 +386,7 @@ index 2c0eb06..4633a30 100644
    CLIBS         :=
    MSGLIBS       :=
    $(warning (INFO) Corresponding machine found in cmplrflags.mk.)
-@@ -428,7 +504,7 @@ ifeq ($(compiler),intel-sgi)
+@@ -428,7 +505,7 @@ ifeq ($(compiler),intel-sgi)
    PFC           :=  mpif90
    CC            :=  icc -O2 -no-ipo
    CCBE          :=  icc -O2 -no-ipo
@@ -394,7 +395,7 @@ index 2c0eb06..4633a30 100644
  #  FFLAGS1      :=  $(INCDIRS) -Mextend -g -O0 -traceback
    FFLAGS2       :=  $(FFLAGS1)
    FFLAGS3       :=  $(FFLAGS1) -assume buffered_stdout
-@@ -504,7 +580,7 @@ ifeq ($(compiler),cray_xt4)
+@@ -504,7 +581,7 @@ ifeq ($(compiler),cray_xt4)
    PFC	        :=  ftn
    CC		:=  pgcc
    CCBE		:=  cc
@@ -403,7 +404,7 @@ index 2c0eb06..4633a30 100644
    ifeq ($(DEBUG),full)
       FFLAGS1	:=  $(INCDIRS) -Mextend -g -O0 -traceback -Mbounds -Mchkfpstk -Mchkptr -Mchkstk -DALL_TRACE -DFLUSH_MESSAGES -DFULL_STACK
    endif
-@@ -584,7 +660,7 @@ ifeq ($(compiler),xtintel)
+@@ -584,7 +661,7 @@ ifeq ($(compiler),xtintel)
    PFC           :=  ftn
    CC            :=  cc -O2 -no-ipo
    CCBE          :=  cc -O2 -no-ipo
@@ -412,7 +413,7 @@ index 2c0eb06..4633a30 100644
  #  FFLAGS1      :=  $(INCDIRS) -Mextend -g -O0 -traceback
    FFLAGS2       :=  $(FFLAGS1)
    FFLAGS3       :=  $(FFLAGS1) -assume buffered_stdout
-@@ -716,8 +792,8 @@ ifeq ($(compiler),diamond)
+@@ -716,8 +793,8 @@ ifeq ($(compiler),diamond)
    PPFC          :=  ifort
    FC            :=  ifort
    PFC           :=  ifort
@@ -423,7 +424,7 @@ index 2c0eb06..4633a30 100644
    ifeq ($(DEBUG),full)
       FFLAGS1	:=  $(INCDIRS) -g -O0 -debug -fpe0 -132 -traceback -check all -DALL_TRACE -DFLUSH_MESSAGES -DFULL_STACK
    endif
-@@ -732,8 +808,8 @@ ifeq ($(compiler),diamond)
+@@ -732,8 +809,8 @@ ifeq ($(compiler),diamond)
    IMODS         :=  -I
    CC            := icc
    CCBE          := $(CC)
@@ -434,7 +435,7 @@ index 2c0eb06..4633a30 100644
    ifeq ($(DEBUG),full)
       CFLAGS        := $(INCDIRS) -g -O0
    endif
-@@ -784,7 +860,7 @@ ifeq ($(compiler),garnet)
+@@ -784,7 +861,7 @@ ifeq ($(compiler),garnet)
       CFLAGS	:=  $(INCDIRS) -DLINUX -g -O0
    endif
    IMODS		:=  -module
@@ -443,7 +444,7 @@ index 2c0eb06..4633a30 100644
  # jgf20110728: on Garnet, NETCDFHOME=/opt/cray/netcdf/4.1.1.0/netcdf-pgi
  # jgf20110815: on Garnet, HDF5HOME=/opt/cray/hdf5/default/hdf5-pgi
  # jgf20130815: on Garnet, load module cray-netcdf, with the path to the
-@@ -809,7 +885,7 @@ ifeq ($(compiler),kraken)
+@@ -809,7 +886,7 @@ ifeq ($(compiler),kraken)
    PPFC          :=  ftn
    FC            :=  ftn
    PFC           :=  ftn
@@ -452,7 +453,7 @@ index 2c0eb06..4633a30 100644
    FFLAGS2       :=  $(FFLAGS1)
    FFLAGS3       :=  $(FFLAGS1)
    DA            :=  -DREAL8 -DLINUX -DCSCA -DPOWELL
-@@ -845,7 +921,7 @@ ifeq ($(compiler),circleci)
+@@ -845,7 +922,7 @@ ifeq ($(compiler),circleci)
    IMODS 	:=  -I
    CC		:= gcc
    CCBE		:= $(CC)
@@ -461,7 +462,7 @@ index 2c0eb06..4633a30 100644
    CLIBS	:=
    LIBS		:=
    MSGLIBS	:=
-@@ -859,8 +935,7 @@ ifeq ($(compiler),circleci)
+@@ -859,8 +936,7 @@ ifeq ($(compiler),circleci)
       MULTIPLE := TRUE
    endif
  endif
@@ -471,7 +472,7 @@ index 2c0eb06..4633a30 100644
  #$(MACHINE)
  ########################################################################
  # Compiler flags for Linux operating system on 32bit x86 CPU
-@@ -950,7 +1025,7 @@ ifeq ($(compiler),gnu)
+@@ -950,7 +1026,7 @@ ifeq ($(compiler),gnu)
       FFLAGS1	:=  $(INCDIRS) -g -O0 -ffixed-line-length-132 -ftrace=full -fbounds-check -DNETCDF_TRACE -DFLUSH_MESSAGES -DFULL_STACK
    endif
    ifeq ($(DEBUG),valgrind)
@@ -480,7 +481,7 @@ index 2c0eb06..4633a30 100644
    endif
    ifeq ($(SWAN),enable)
       FFLAGS1    :=  $(FFLAGS1) -freal-loops
-@@ -988,69 +1063,6 @@ ifeq ($(compiler),gnu)
+@@ -988,69 +1064,6 @@ ifeq ($(compiler),gnu)
    endif
  endif
  #
@@ -550,7 +551,7 @@ index 2c0eb06..4633a30 100644
  endif
 
  ########################################################################
-@@ -1095,7 +1107,7 @@ ifeq ($(arch),altix)
+@@ -1095,7 +1108,7 @@ ifeq ($(arch),altix)
    PPFC            := ifort
    FC              := ifort
    PFC             := ifort
@@ -559,7 +560,7 @@ index 2c0eb06..4633a30 100644
    FFLAGS2	  := $(FFLAGS1)
    FFLAGS3	  := $(FFLAGS1)
    DA	          :=  -DREAL8 -DCSCA
-@@ -1168,7 +1180,7 @@ ifeq ($(IBM),p5)
+@@ -1168,7 +1181,7 @@ ifeq ($(IBM),p5)
    FFLAGS0       := $(INCDIRS) -w -qfixed=132 -qarch=auto -qcache=auto
    FFLAGS1       := $(FFLAGS0) -O2
    FFLAGS2       := $(FFLAGS0) -qhot -qstrict
@@ -568,7 +569,7 @@ index 2c0eb06..4633a30 100644
    DA            := -WF,"-DREAL8,-DIBM,-DCSCA"
    DP            := -tF -WF,"-DREAL8,-DIBM,-DCSCA,-DCMPI"
    DPRE          := -tF -WF,"-DREAL8,-DIBM"
-@@ -1488,9 +1500,9 @@ ifneq (,$(findstring powerpc-darwin,$(MACHINE)-$(OS)))
+@@ -1488,9 +1501,9 @@ ifneq (,$(findstring powerpc-darwin,$(MACHINE)-$(OS)))
    PPFC	        := f90
    FC	        := f90
    PFC	        := mpif77
@@ -581,7 +582,7 @@ index 2c0eb06..4633a30 100644
    DA  	   	:=  -DREAL8 -DCSCA -DLINUX
    DP  	   	:=  -DREAL8 -DCSCA -DCMPI -DLINUX
    DPRE	   	:=  -DREAL8 -DLINUX
-@@ -1518,17 +1530,17 @@ ifneq (,$(findstring i386-darwin,$(MACHINE)-$(OS)))
+@@ -1518,17 +1531,17 @@ ifneq (,$(findstring i386-darwin,$(MACHINE)-$(OS)))
    PPFC	        := ifort
    FC	        := ifort
    PFC	        := mpif77

diff --git a/patches/ADCIRC/v55.01-5bc04d6/01-cmplrflags-mk.patch b/patches/ADCIRC/v55.01-5bc04d6/01-cmplrflags-mk.patch
@@ -1,5 +1,5 @@
 diff --git a/work/cmplrflags.mk b/work/cmplrflags.mk
-index 50d4603..a5c96b0 100644
+index 50d4603..a38a1ba 100644
 --- a/work/cmplrflags.mk
 +++ b/work/cmplrflags.mk
 @@ -4,12 +4,12 @@ INCDIRS := -I . -I $(SRCDIR)/prep
@@ -75,7 +75,7 @@ index 50d4603..a5c96b0 100644
    ifeq ($(DEBUG),trace)
       FFLAGS1       :=  $(INCDIRS) -g -O0 -traceback -FI -assume byterecl -132 -DALL_TRACE -DFULL_STACK -DFLUSH_MESSAGES
    endif
-@@ -252,44 +248,122 @@ ifeq ($(compiler),intel)
+@@ -252,44 +248,123 @@ ifeq ($(compiler),intel)
    endif
    #
    ifeq ($(MACHINENAME),stampede2)
@@ -147,7 +147,8 @@ index 50d4603..a5c96b0 100644
       endif
    endif
 +  ifeq ($(MACHINENAME),supermic)
-+     FFLAGS1 := $(INCDIRS) -O2 -FI -assume byterecl -132 -xAVX
++     PFC     :=  mpiifort
++     FFLAGS1 := $(INCDIRS) -O2 -132
 +     CFLAGS  := $(INCDIRS) -O2 -DLINUX -xAVX
 +     FLIBS   := $(INCDIRS) -xAVX
 +     ifeq ($(DEBUG),trace)
@@ -215,7 +216,7 @@ index 50d4603..a5c96b0 100644
    endif
    #
    #@jasonfleming Added to fix bus error on hatteras@renci
-@@ -305,51 +379,54 @@ ifeq ($(compiler),intel)
+@@ -305,51 +380,54 @@ ifeq ($(compiler),intel)
       DPRE          := $(DPRE) -DADCSWAN
    endif
    IMODS         :=  -I
@@ -292,7 +293,7 @@ index 50d4603..a5c96b0 100644
          FLIBS      := $(FLIBS) -L$(NETCDFHOME)/lib -lnetcdff -lnetcdf
       endif
       # jgf20150817: Adding support for spirit.afrl.hpc.mil;
-@@ -362,10 +439,6 @@ ifeq ($(compiler),intel)
+@@ -362,10 +440,6 @@ ifeq ($(compiler),intel)
       # jgf20150420 mike requires that the analyst add netcdf to the softenv
       # with the following on the command line
       # soft add +netcdf-4.1.3-Intel-13.0.0
@@ -303,7 +304,7 @@ index 50d4603..a5c96b0 100644
       ifeq ($(MACHINENAME),killdevil)
          HDF5HOME       :=/nas02/apps/hdf5-1.8.5/lib
          NETCDFHOME     :=/nas02/apps/netcdf-4.1.1
-@@ -384,42 +457,33 @@ endif
+@@ -384,42 +458,33 @@ endif
  #
  # Corbitt 120322:  These flags work on the Notre Dame Athos & Zas
  ifeq ($(compiler),intel-ND)
@@ -356,7 +357,7 @@ index 50d4603..a5c96b0 100644
    CLIBS         :=
    MSGLIBS       :=
    $(warning (INFO) Corresponding machine found in cmplrflags.mk.)
-@@ -428,8 +492,10 @@ ifeq ($(compiler),intel-ND)
+@@ -428,8 +493,10 @@ ifeq ($(compiler),intel-ND)
    else
       MULTIPLE := TRUE
    endif
@@ -368,7 +369,7 @@ index 50d4603..a5c96b0 100644
  # SGI ICE X (e.g. topaz@ERDC) using Intel compilers, added by TCM
  # jgf: Added flags for Thunder@AFRL.
  ifeq ($(compiler),intel-sgi)
-@@ -438,7 +504,7 @@ ifeq ($(compiler),intel-sgi)
+@@ -438,7 +505,7 @@ ifeq ($(compiler),intel-sgi)
    PFC           :=  mpif90
    CC            :=  icc -O2 -no-ipo
    CCBE          :=  icc -O2 -no-ipo
@@ -377,7 +378,7 @@ index 50d4603..a5c96b0 100644
  #  FFLAGS1      :=  $(INCDIRS) -Mextend -g -O0 -traceback
    FFLAGS2       :=  $(FFLAGS1)
    FFLAGS3       :=  $(FFLAGS1) -assume buffered_stdout
-@@ -594,7 +660,7 @@ ifeq ($(compiler),xtintel)
+@@ -594,7 +661,7 @@ ifeq ($(compiler),xtintel)
    PFC           :=  ftn
    CC            :=  cc -O2 -no-ipo
    CCBE          :=  cc -O2 -no-ipo
@@ -386,7 +387,7 @@ index 50d4603..a5c96b0 100644
  #  FFLAGS1      :=  $(INCDIRS) -Mextend -g -O0 -traceback
    FFLAGS2       :=  $(FFLAGS1)
    FFLAGS3       :=  $(FFLAGS1) -assume buffered_stdout
-@@ -726,8 +792,8 @@ ifeq ($(compiler),diamond)
+@@ -726,8 +793,8 @@ ifeq ($(compiler),diamond)
    PPFC          :=  ifort
    FC            :=  ifort
    PFC           :=  ifort
@@ -397,7 +398,7 @@ index 50d4603..a5c96b0 100644
    ifeq ($(DEBUG),full)
       FFLAGS1	:=  $(INCDIRS) -g -O0 -debug -fpe0 -132 -traceback -check all -DALL_TRACE -DFLUSH_MESSAGES -DFULL_STACK
    endif
-@@ -742,8 +808,8 @@ ifeq ($(compiler),diamond)
+@@ -742,8 +809,8 @@ ifeq ($(compiler),diamond)
    IMODS         :=  -I
    CC            := icc
    CCBE          := $(CC)
@@ -408,7 +409,7 @@ index 50d4603..a5c96b0 100644
    ifeq ($(DEBUG),full)
       CFLAGS        := $(INCDIRS) -g -O0
    endif
-@@ -819,7 +885,7 @@ ifeq ($(compiler),kraken)
+@@ -819,7 +886,7 @@ ifeq ($(compiler),kraken)
    PPFC          :=  ftn
    FC            :=  ftn
    PFC           :=  ftn
@@ -417,7 +418,7 @@ index 50d4603..a5c96b0 100644
    FFLAGS2       :=  $(FFLAGS1)
    FFLAGS3       :=  $(FFLAGS1)
    DA            :=  -DREAL8 -DLINUX -DCSCA -DPOWELL
-@@ -869,8 +935,7 @@ ifeq ($(compiler),circleci)
+@@ -869,8 +936,7 @@ ifeq ($(compiler),circleci)
       MULTIPLE := TRUE
    endif
  endif
@@ -427,7 +428,7 @@ index 50d4603..a5c96b0 100644
  #$(MACHINE)
  ########################################################################
  # Compiler flags for Linux operating system on 32bit x86 CPU
-@@ -998,69 +1063,6 @@ ifeq ($(compiler),gnu)
+@@ -998,69 +1064,6 @@ ifeq ($(compiler),gnu)
    endif
  endif
  #
@@ -497,7 +498,7 @@ index 50d4603..a5c96b0 100644
  endif
 
  ########################################################################
-@@ -1105,7 +1107,7 @@ ifeq ($(arch),altix)
+@@ -1105,7 +1108,7 @@ ifeq ($(arch),altix)
    PPFC            := ifort
    FC              := ifort
    PFC             := ifort
@@ -506,7 +507,7 @@ index 50d4603..a5c96b0 100644
    FFLAGS2	  := $(FFLAGS1)
    FFLAGS3	  := $(FFLAGS1)
    DA	          :=  -DREAL8 -DCSCA
-@@ -1178,7 +1180,7 @@ ifeq ($(IBM),p5)
+@@ -1178,7 +1181,7 @@ ifeq ($(IBM),p5)
    FFLAGS0       := $(INCDIRS) -w -qfixed=132 -qarch=auto -qcache=auto
    FFLAGS1       := $(FFLAGS0) -O2
    FFLAGS2       := $(FFLAGS0) -qhot -qstrict
@@ -515,7 +516,7 @@ index 50d4603..a5c96b0 100644
    DA            := -WF,"-DREAL8,-DIBM,-DCSCA"
    DP            := -tF -WF,"-DREAL8,-DIBM,-DCSCA,-DCMPI"
    DPRE          := -tF -WF,"-DREAL8,-DIBM"
-@@ -1498,9 +1500,9 @@ ifneq (,$(findstring powerpc-darwin,$(MACHINE)-$(OS)))
+@@ -1498,9 +1501,9 @@ ifneq (,$(findstring powerpc-darwin,$(MACHINE)-$(OS)))
    PPFC	        := f90
    FC	        := f90
    PFC	        := mpif77
@@ -528,7 +529,7 @@ index 50d4603..a5c96b0 100644
    DA  	   	:=  -DREAL8 -DCSCA -DLINUX
    DP  	   	:=  -DREAL8 -DCSCA -DCMPI -DLINUX
    DPRE	   	:=  -DREAL8 -DLINUX
-@@ -1528,17 +1530,17 @@ ifneq (,$(findstring i386-darwin,$(MACHINE)-$(OS)))
+@@ -1528,17 +1531,17 @@ ifneq (,$(findstring i386-darwin,$(MACHINE)-$(OS)))
    PPFC	        := ifort
    FC	        := ifort
    PFC	        := mpif77