Skip to content

Commit 714bab9

Browse files
apcraigapcraig
authored
Update Cheyenne and Derecho ports (#863)
* Update cheyenne and derecho ports cheyenne_intel updated to intel/19/1/1, mpt/2.25 cheyenne_gnu updated to gnu/8.3.0, mpt/2.25 cheyenne_pgi updated to pgi/19.9, mpt/2.22 derecho_intel minor updates derecho_intelclassic added derecho_inteloneapi added (not working) derecho_gnu added derecho_cray added derecho_nvhpc added cheyenne_pgi changed answers derecho_inteloneapi is not working, compiler issues fixes automated qc testing on cheyenne * Update permissions on env.chicoma_intel
1 parent cbbac74 commit 714bab9

19 files changed

+743
-55
lines changed

‎configuration/scripts/machines/Macros.cheyenne_gnu‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ LIB_NETCDF := $(NETCDF_PATH)/lib
5757
#LIB_PNETCDF := $(PNETCDF_PATH)/lib
5858
LIB_MPI := $(IMPILIBDIR)
5959

60-
#SLIBS := -L$(LIB_NETCDF) -lnetcdf -lnetcdff -L$(LIB_PNETCDF) -lpnetcdf -lgptl
60+
#SLIBS := -L$(LIB_NETCDF) -lnetcdf -lnetcdff -L$(LIB_PNETCDF) -lpnetcdf
6161
SLIBS := -L$(LIB_NETCDF) -lnetcdf -lnetcdff
6262

6363
ifeq ($(ICE_THREADED), true)
@@ -72,8 +72,8 @@ ifeq ($(ICE_IOTYPE), pio1)
7272
endif
7373

7474
ifeq ($(ICE_IOTYPE), pio2)
75-
CPPDEFS := $(CPPDEFS) -DGPTL
75+
CPPDEFS := $(CPPDEFS)
7676
LIB_PIO := $(PIO_LIBDIR)
77-
SLIBS := $(SLIBS) -L$(LIB_PIO) -lpiof -lpioc -lgptl
77+
SLIBS := $(SLIBS) -L$(LIB_PIO) -lpiof -lpioc
7878
endif
7979

‎configuration/scripts/machines/Macros.cheyenne_intel‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ LIB_NETCDF := $(NETCDF_PATH)/lib
4646
#LIB_PNETCDF := $(PNETCDF_PATH)/lib
4747
LIB_MPI := $(IMPILIBDIR)
4848

49-
#SLIBS := -L$(LIB_NETCDF) -lnetcdf -lnetcdff -L$(LIB_PNETCDF) -lpnetcdf -lgptl
49+
#SLIBS := -L$(LIB_NETCDF) -lnetcdf -lnetcdff -L$(LIB_PNETCDF) -lpnetcdf
5050
SLIBS := -L$(LIB_NETCDF) -lnetcdf -lnetcdff
5151

5252
ifeq ($(ICE_THREADED), true)
@@ -61,8 +61,8 @@ ifeq ($(ICE_IOTYPE), pio1)
6161
endif
6262

6363
ifeq ($(ICE_IOTYPE), pio2)
64-
CPPDEFS := $(CPPDEFS) -DGPTL
64+
CPPDEFS := $(CPPDEFS)
6565
LIB_PIO := $(PIO_LIBDIR)
66-
SLIBS := $(SLIBS) -L$(LIB_PIO) -lpiof -lpioc -lgptl
66+
SLIBS := $(SLIBS) -L$(LIB_PIO) -lpiof -lpioc
6767
endif
6868

‎configuration/scripts/machines/Macros.cheyenne_pgi‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ LIB_NETCDF := $(NETCDF_PATH)/lib
4545
#LIB_PNETCDF := $(PNETCDF_PATH)/lib
4646
LIB_MPI := $(IMPILIBDIR)
4747

48-
#SLIBS := -L$(LIB_NETCDF) -lnetcdf -lnetcdff -L$(LIB_PNETCDF) -lpnetcdf -lgptl
48+
#SLIBS := -L$(LIB_NETCDF) -lnetcdf -lnetcdff -L$(LIB_PNETCDF) -lpnetcdf
4949
SLIBS := -L$(LIB_NETCDF) -lnetcdf -lnetcdff
5050

5151
ifeq ($(ICE_THREADED), true)
@@ -60,8 +60,8 @@ ifeq ($(ICE_IOTYPE), pio1)
6060
endif
6161

6262
ifeq ($(ICE_IOTYPE), pio2)
63-
CPPDEFS := $(CPPDEFS) -DGPTL
63+
CPPDEFS := $(CPPDEFS)
6464
LIB_PIO := $(PIO_LIBDIR)
65-
SLIBS := $(SLIBS) -L$(LIB_PIO) -lpiof -lpioc -lgptl
65+
SLIBS := $(SLIBS) -L$(LIB_PIO) -lpiof -lpioc
6666
endif
6767

‎configuration/scripts/machines/Macros.derecho_cray‎

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
#==============================================================================
2+
# Macros file for NCAR derecho, cray compiler
3+
#==============================================================================
4+
5+
CPP := ftn -e P
6+
CPPDEFS := -DFORTRANUNDERSCORE -DNO_R16 ${ICE_CPPDEFS}
7+
CFLAGS := -c -O2
8+
9+
FIXEDFLAGS := -132
10+
FREEFLAGS :=
11+
FFLAGS := -hbyteswapio
12+
FFLAGS_NOOPT:= -O0
13+
LDFLAGS := -hbyteswapio
14+
15+
ifeq ($(ICE_BLDDEBUG), true)
16+
FFLAGS += -O0 -hfp0 -g -Rbcdps -Ktrap=fp
17+
else
18+
FFLAGS += -O2 -hfp0 # -eo
19+
endif
20+
21+
SCC := cc
22+
SFC := ftn
23+
MPICC := cc
24+
MPIFC := ftn
25+
26+
ifeq ($(ICE_COMMDIR), mpi)
27+
FC := $(MPIFC)
28+
CC := $(MPICC)
29+
else
30+
FC := $(SFC)
31+
CC := $(SCC)
32+
endif
33+
LD:= $(FC)
34+
35+
# defined by module
36+
#NETCDF_PATH := $(NETCDF)
37+
38+
#PIO_CONFIG_OPTS:= --enable-filesystem-hints=gpfs
39+
40+
#INCLDIR := $(INCLDIR)
41+
#INCLDIR += -I$(NETCDF_PATH)/include
42+
43+
LIB_NETCDF := $(NETCDF)/lib
44+
##LIB_PNETCDF := $(PNETCDF_PATH)/lib
45+
46+
SLIBS := -L$(LIB_NETCDF) -lnetcdf -lnetcdff
47+
48+
ifeq ($(ICE_THREADED), true)
49+
LDFLAGS += -fopenmp
50+
CFLAGS += -fopenmp
51+
FFLAGS += -fopenmp
52+
else
53+
LDFLAGS += -hnoomp
54+
# CFLAGS += -hnoomp
55+
FFLAGS += -hnoomp
56+
endif
57+
58+
ifeq ($(ICE_IOTYPE), pio1)
59+
LIB_PIO := $(PIO)/lib
60+
SLIBS := $(SLIBS) -L$(LIB_PIO) -lpio
61+
endif
62+
63+
ifeq ($(ICE_IOTYPE), pio2)
64+
LIB_PIO := $(PIO)/lib
65+
SLIBS := $(SLIBS) -L$(LIB_PIO) -lpiof -lpioc
66+
endif

‎configuration/scripts/machines/Macros.derecho_gnu‎

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
#==============================================================================
2+
# Makefile macros for NCAR derecho, gnu compiler
3+
#==============================================================================
4+
5+
CPP := ftn -E
6+
CPPDEFS := -DFORTRANUNDERSCORE ${ICE_CPPDEFS}
7+
CFLAGS := -c
8+
9+
FIXEDFLAGS := -ffixed-line-length-132
10+
FREEFLAGS := -ffree-form
11+
FFLAGS := -fconvert=big-endian -fbacktrace -ffree-line-length-none -fallow-argument-mismatch
12+
FFLAGS_NOOPT:= -O0
13+
14+
ifeq ($(ICE_BLDDEBUG), true)
15+
FFLAGS += -O0 -g -fcheck=bounds -finit-real=nan -fimplicit-none -ffpe-trap=invalid,zero,overflow --std f2008
16+
# FFLAGS += -O0 -g -fcheck=all -finit-real=snan -fimplicit-none -ffpe-trap=invalid,zero,overflow
17+
CFLAGS += -O0
18+
endif
19+
20+
ifeq ($(ICE_COVERAGE), true)
21+
FFLAGS += -O0 -g -fprofile-arcs -ftest-coverage
22+
CFLAGS += -O0 -g -coverage
23+
LDFLAGS += -g -ftest-coverage -fprofile-arcs
24+
endif
25+
26+
ifneq ($(ICE_BLDDEBUG), true)
27+
ifneq ($(ICE_COVERAGE), true)
28+
FFLAGS += -O2
29+
CFLAGS += -O2
30+
endif
31+
endif
32+
33+
SCC := gcc
34+
SFC := gfortran
35+
MPICC := mpicc
36+
MPIFC := mpif90
37+
38+
ifeq ($(ICE_COMMDIR), mpi)
39+
FC := $(MPIFC)
40+
CC := $(MPICC)
41+
else
42+
FC := $(SFC)
43+
CC := $(SCC)
44+
endif
45+
LD:= $(FC)
46+
47+
NETCDF_PATH := $(NETCDF)
48+
49+
#PIO_CONFIG_OPTS:= --enable-filesystem-hints=gpfs
50+
51+
#INCLDIR := $(INCLDIR)
52+
53+
LIB_NETCDF := $(NETCDF_PATH)/lib
54+
#LIB_PNETCDF := $(PNETCDF_PATH)/lib
55+
#LIB_MPI := $(IMPILIBDIR)
56+
57+
#SLIBS := -L$(LIB_NETCDF) -lnetcdf -lnetcdff -L$(LIB_PNETCDF) -lpnetcdf
58+
SLIBS := -L$(LIB_NETCDF) -lnetcdf -lnetcdff
59+
60+
ifeq ($(ICE_THREADED), true)
61+
LDFLAGS += -fopenmp
62+
CFLAGS += -fopenmp
63+
FFLAGS += -fopenmp
64+
endif
65+
66+
ifeq ($(ICE_IOTYPE), pio1)
67+
LIB_PIO := $(PIO)/lib
68+
SLIBS := $(SLIBS) -L$(LIB_PIO) -lpio
69+
endif
70+
71+
ifeq ($(ICE_IOTYPE), pio2)
72+
LIB_PIO := $(PIO)/lib
73+
SLIBS := $(SLIBS) -L$(LIB_PIO) -lpiof -lpioc
74+
endif
75+

‎configuration/scripts/machines/Macros.derecho_intel‎

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#==============================================================================
2-
# Makefile macros for NCAR cheyenne, intel compiler
2+
# Makefile macros for NCAR derecho, intel compiler
33
#==============================================================================
44

55
CPP := fpp
@@ -37,14 +37,11 @@ NETCDF_PATH := $(NETCDF)
3737

3838
#PIO_CONFIG_OPTS:= --enable-filesystem-hints=gpfs
3939

40-
PNETCDF_PATH := $(PNETCDF)
41-
#PNETCDF_PATH := /glade/u/apps/ch/opt/pio/2.2/mpt/2.15f/intel/17.0.1/lib
40+
#PNETCDF_PATH := $(PNETCDF)
4241

43-
INCLDIR := $(INCLDIR)
42+
#INCLDIR := $(INCLDIR)
4443

4544
LIB_NETCDF := $(NETCDF)/lib
46-
#LIB_PNETCDF := $(PNETCDF_PATH)/lib
47-
#LIB_MPI := $(IMPILIBDIR)
4845

4946
#SLIBS := -L$(LIB_NETCDF) -lnetcdf -lnetcdff -L$(LIB_PNETCDF) -lpnetcdf -lgptl
5047
SLIBS := -L$(LIB_NETCDF) -lnetcdf -lnetcdff
@@ -55,15 +52,11 @@ ifeq ($(ICE_THREADED), true)
5552
FFLAGS += -qopenmp
5653
endif
5754

58-
#ifeq ($(ICE_IOTYPE), pio1)
59-
# LIB_PIO := $(PIO_LIBDIR)
60-
# SLIBS := $(SLIBS) -L$(LIB_PIO) -lpio
61-
#endif
55+
ifeq ($(ICE_IOTYPE), pio1)
56+
SLIBS := $(SLIBS) -lpio
57+
endif
6258

6359
ifeq ($(ICE_IOTYPE), pio2)
64-
# CPPDEFS := $(CPPDEFS) -DGPTL
65-
# LIB_PIO := $(PIO_LIBDIR)
66-
# SLIBS := $(SLIBS) -L$(LIB_PIO) -lpiof -lpioc -lgptl
6760
SLIBS := $(SLIBS) -lpiof -lpioc
6861
endif
6962

‎configuration/scripts/machines/Macros.derecho_intelclassic‎

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
#==============================================================================
2+
# Makefile macros for NCAR derecho, intel compiler
3+
#==============================================================================
4+
5+
CPP := fpp
6+
CPPDEFS := -DFORTRANUNDERSCORE ${ICE_CPPDEFS}
7+
CFLAGS := -c -O2 -fp-model precise -march=core-avx2
8+
9+
FIXEDFLAGS := -fixed -132
10+
FREEFLAGS := -free
11+
FFLAGS := -fp-model precise -convert big_endian -assume byterecl -ftz -traceback -march=core-avx2
12+
FFLAGS_NOOPT:= -O0
13+
14+
ifeq ($(ICE_BLDDEBUG), true)
15+
FFLAGS += -O0 -g -check uninit -check bounds -check pointers -fpe0 -check noarg_temp_created -link_mpi=dbg
16+
# FFLAGS += -O0 -g -check all -fpe0 -ftrapuv -fp-model except -check noarg_temp_created -link_mpi=dbg -stand f08
17+
# FFLAGS += -O0 -g -check all -fpe0 -ftrapuv -fp-model except -check noarg_temp_created -init=snan,arrays -link_mpi=dbg
18+
else
19+
FFLAGS += -O2
20+
endif
21+
22+
SCC := icc
23+
SFC := ifort
24+
MPICC := mpicc
25+
MPIFC := mpif90
26+
27+
ifeq ($(ICE_COMMDIR), mpi)
28+
FC := $(MPIFC)
29+
CC := $(MPICC)
30+
else
31+
FC := $(SFC)
32+
CC := $(SCC)
33+
endif
34+
LD:= $(FC)
35+
36+
NETCDF_PATH := $(NETCDF)
37+
38+
#PIO_CONFIG_OPTS:= --enable-filesystem-hints=gpfs
39+
40+
#PNETCDF_PATH := $(PNETCDF)
41+
42+
#INCLDIR := $(INCLDIR)
43+
44+
LIB_NETCDF := $(NETCDF)/lib
45+
46+
#SLIBS := -L$(LIB_NETCDF) -lnetcdf -lnetcdff -L$(LIB_PNETCDF) -lpnetcdf -lgptl
47+
SLIBS := -L$(LIB_NETCDF) -lnetcdf -lnetcdff
48+
49+
ifeq ($(ICE_THREADED), true)
50+
LDFLAGS += -qopenmp
51+
CFLAGS += -qopenmp
52+
FFLAGS += -qopenmp
53+
endif
54+
55+
ifeq ($(ICE_IOTYPE), pio1)
56+
SLIBS := $(SLIBS) -lpio
57+
endif
58+
59+
ifeq ($(ICE_IOTYPE), pio2)
60+
SLIBS := $(SLIBS) -lpiof -lpioc
61+
endif
62+

‎configuration/scripts/machines/Macros.derecho_inteloneapi‎

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
#==============================================================================
2+
# Makefile macros for NCAR derecho, intel compiler
3+
#==============================================================================
4+
5+
CPP := fpp
6+
CPPDEFS := -DFORTRANUNDERSCORE ${ICE_CPPDEFS}
7+
CFLAGS := -c -O2 -fp-model precise -march=core-avx2
8+
9+
FIXEDFLAGS := -fixed -132
10+
FREEFLAGS := -free
11+
FFLAGS := -fp-model precise -convert big_endian -assume byterecl -ftz -traceback -march=core-avx2
12+
FFLAGS_NOOPT:= -O0
13+
14+
ifeq ($(ICE_BLDDEBUG), true)
15+
FFLAGS += -O0 -g -check uninit -check bounds -check pointers -fpe0 -check noarg_temp_created -link_mpi=dbg
16+
# FFLAGS += -O0 -g -check all -fpe0 -ftrapuv -fp-model except -check noarg_temp_created -link_mpi=dbg -stand f08
17+
# FFLAGS += -O0 -g -check all -fpe0 -ftrapuv -fp-model except -check noarg_temp_created -init=snan,arrays -link_mpi=dbg
18+
else
19+
FFLAGS += -O2
20+
endif
21+
22+
SCC := icx
23+
SFC := ifx
24+
MPICC := mpicc
25+
MPIFC := mpif90
26+
27+
ifeq ($(ICE_COMMDIR), mpi)
28+
FC := $(MPIFC)
29+
CC := $(MPICC)
30+
else
31+
FC := $(SFC)
32+
CC := $(SCC)
33+
endif
34+
LD:= $(FC)
35+
36+
NETCDF_PATH := $(NETCDF)
37+
38+
#PIO_CONFIG_OPTS:= --enable-filesystem-hints=gpfs
39+
40+
#PNETCDF_PATH := $(PNETCDF)
41+
42+
#INCLDIR := $(INCLDIR)
43+
44+
LIB_NETCDF := $(NETCDF)/lib
45+
46+
#SLIBS := -L$(LIB_NETCDF) -lnetcdf -lnetcdff -L$(LIB_PNETCDF) -lpnetcdf -lgptl
47+
SLIBS := -L$(LIB_NETCDF) -lnetcdf -lnetcdff
48+
49+
ifeq ($(ICE_THREADED), true)
50+
LDFLAGS += -qopenmp
51+
CFLAGS += -qopenmp
52+
FFLAGS += -qopenmp
53+
endif
54+
55+
ifeq ($(ICE_IOTYPE), pio1)
56+
SLIBS := $(SLIBS) -lpio
57+
endif
58+
59+
ifeq ($(ICE_IOTYPE), pio2)
60+
SLIBS := $(SLIBS) -lpiof -lpioc
61+
endif
62+

0 commit comments

Comments
 (0)