Skip to content

Commit 9aa50c9

Browse files
mpaiaompaiao
committed
Updated instructions for cannon so it is compatible with the most current version of the
intel compilers.
1 parent 7b8925e commit 9aa50c9

File tree

1 file changed

+30
-36
lines changed

1 file changed

+30
-36
lines changed

‎ED/build/make/include.mk.cannon‎

Lines changed: 30 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@ BASE=$(ED_ROOT)/build/
2323
# HDF5 libraries compiled with the same compiler you set for F_COMP and C_COMP. You may #
2424
# still be able to compile without HDF5 but the code is not going to run. #
2525
#------------------------------------------------------------------------------------------#
26-
#HDF5_PATH=/n/sw/fasrcsw/apps/MPI/intel/17.0.2-fasrc01/impi/2017.2.174-fasrc01/hdf5/1.10.1-fasrc01
27-
HDF5_PATH=/n/home00/mlongo/Util/Modules/hdf5/1.10.2_intel
26+
HDF5_PATH=$(HOME)/Util/Modules/hdf5/1.14.6_intel
2827
HDF5_INCS=-I$(HDF5_PATH)/include
2928
HDF5_LIBS= -lz -lm -L$(HDF5_PATH)/lib -lhdf5 -lhdf5_fortran -lhdf5_hl
3029
#------------------------------------------------------------------------------------------#
@@ -58,13 +57,10 @@ USE_COLLECTIVE_MPIO=0
5857

5958
#################################### COMPILER SETTINGS #####################################
6059
CMACH=ODYSSEY
61-
#F_COMP=mpif90 -fc=ifort
62-
#C_COMP=mpicc -cc=icc
63-
#LOADER=mpif90 -fc=ifort
6460
FC_TYPE=INTEL
65-
F_COMP=mpif90
66-
C_COMP=mpicc
67-
LOADER=mpif90
61+
F_COMP=ifx
62+
C_COMP=icx
63+
LOADER=ifx
6864
LIBS=
6965
MOD_EXT=mod
7066
#------------------------------------------------------------------------------------------#
@@ -103,50 +99,48 @@ endif
10399
#------------------------------------------------------------------------------------------#
104100
ifeq ($(KIND_COMP),A)
105101
USE_INTERF=0
106-
F_OPTS= -FR -O0 -recursive -qmkl -check all,noarg_temp_created -g -debug extended \
107-
-debug-parameters all -fpe0 -no-ftz -traceback -ftrapuv -fp-stack-check \
108-
-implicitnone -assume byterecl -warn unused -warn uncalled -warn usage \
109-
-warn declarations -gen-interfaces -qopenmp -diag-error=all -static
102+
F_OPTS= -FR -O0 -recursive -qmkl -check all,noarg_temp_created -g -debug full \
103+
-debug-parameters all -fpe0 -no-ftz -traceback -ftrapuv -implicitnone \
104+
-assume byterecl -warn unused -warn uncalled -warn usage -warn declarations \
105+
-gen-interfaces -qopenmp -diag-error=all -static
110106
C_OPTS= -O0 -DLITTLE -g -traceback -qopenmp -static
111-
LOADER_OPTS=-FR -O0 -recursive -qmkl -check all,noarg_temp_created -g -debug extended \
112-
-debug-parameters all -fpe0 -no-ftz -traceback -ftrapuv -fp-stack-check \
113-
-implicitnone -assume byterecl -warn unused -warn uncalled -warn usage \
114-
-warn declarations -gen-interfaces -qopenmp -diag-error=all
107+
LOADER_OPTS=-FR -O0 -recursive -qmkl -check all,noarg_temp_created -g -debug full \
108+
-debug-parameters all -fpe0 -no-ftz -traceback -ftrapuv -implicitnone \
109+
-assume byterecl -warn unused -warn uncalled -warn usage -warn declarations \
110+
-gen-interfaces -qopenmp -diag-error=all
115111
#---------------------------------------------------------------------------------------#
116112
endif
117113
ifeq ($(KIND_COMP),B)
118114
USE_INTERF=0
119-
F_OPTS= -FR -O0 -recursive -qmkl -check all,noarg_temp_created -g -debug extended \
120-
-debug-parameters all -fpe0 -no-ftz -traceback -ftrapuv -fp-stack-check \
121-
-implicitnone -assume byterecl -warn unused -warn uncalled -warn usage \
122-
-warn interfaces -warn declarations -warn errors -qopenmp -static
115+
F_OPTS= -FR -O0 -recursive -qmkl -check all,noarg_temp_created -g -debug full \
116+
-debug-parameters all -fpe0 -no-ftz -traceback -ftrapuv -implicitnone \
117+
-assume byterecl -warn unused -warn uncalled -warn usage -warn interfaces \
118+
-warn declarations -warn errors -qopenmp -static
123119
C_OPTS= -O0 -DLITTLE -g -traceback -qopenmp -static
124-
LOADER_OPTS=-FR -O0 -recursive -qmkl -check all,noarg_temp_created -g -debug extended \
125-
-debug-parameters all -fpe0 -no-ftz -traceback -ftrapuv -fp-stack-check \
126-
-implicitnone -assume byterecl -warn unused -warn uncalled -warn usage \
127-
-warn interfaces -warn declarations -warn errors -qopenmp
120+
LOADER_OPTS=-FR -O0 -recursive -qmkl -check all,noarg_temp_created -g -debug full \
121+
-debug-parameters all -fpe0 -no-ftz -traceback -ftrapuv -implicitnone \
122+
-assume byterecl -warn unused -warn uncalled -warn usage -warn interfaces \
123+
-warn declarations -warn errors -qopenmp
128124
#---------------------------------------------------------------------------------------#
129125
endif
130126
ifeq ($(KIND_COMP),C)
131127
USE_INTERF=1
132-
F_OPTS= -FR -O0 -recursive -qmkl -check all,noarg_temp_created -g -debug extended \
133-
-debug-parameters all -fpe0 -no-ftz -traceback -ftrapuv -fp-stack-check \
134-
-implicitnone -assume byterecl -qopenmp -diag-error=all -static
128+
F_OPTS= -FR -O0 -recursive -qmkl -check all,noarg_temp_created -g -debug full \
129+
-debug-parameters all -fpe0 -no-ftz -traceback -ftrapuv -implicitnone \
130+
-assume byterecl -qopenmp -diag-error=all -static
135131
C_OPTS= -O0 -DLITTLE -g -traceback -qopenmp -static
136-
LOADER_OPTS=-FR -O0 -recursive -qmkl -check all,noarg_temp_created -g -debug extended \
137-
-debug-parameters all -fpe0 -no-ftz -traceback -ftrapuv -fp-stack-check \
138-
-implicitnone -assume byterecl -qopenmp -diag-error=all
132+
LOADER_OPTS=-FR -O0 -recursive -qmkl -check all,noarg_temp_created -g -debug full \
133+
-debug-parameters all -fpe0 -no-ftz -traceback -ftrapuv -implicitnone \
134+
-assume byterecl -qopenmp -diag-error=all
139135
#---------------------------------------------------------------------------------------#
140136
endif
141137
ifeq ($(KIND_COMP),D)
142138
USE_INTERF=1
143139
F_OPTS= -FR -O0 -recursive -qmkl -check all,noarg_temp_created -fpe0 -no-ftz -traceback \
144-
-ftrapuv -fp-stack-check -implicitnone -assume byterecl -qopenmp \
145-
-diag-error=all -static
140+
-ftrapuv -implicitnone -assume byterecl -qopenmp -diag-error=all -static
146141
C_OPTS= -O0 -DLITTLE -g -traceback -qopenmp -static
147142
LOADER_OPTS=-FR -O0 -recursive -qmkl -check all,noarg_temp_created -fpe0 -no-ftz \
148-
-traceback -ftrapuv -fp-stack-check -implicitnone -assume byterecl -qopenmp \
149-
-diag-error=all
143+
-traceback -ftrapuv -implicitnone -assume byterecl -qopenmp -diag-error=all
150144
#---------------------------------------------------------------------------------------#
151145
endif
152146
ifeq ($(KIND_COMP),E)
@@ -171,8 +165,8 @@ endif
171165
MPI_PATH=
172166
PAR_INCS=
173167
PAR_LIBS=
174-
#PAR_DEFS=
175-
PAR_DEFS=-DRAMS_MPI
168+
PAR_DEFS=
169+
#PAR_DEFS=-DRAMS_MPI
176170
#------------------------------------------------------------------------------------------#
177171

178172

0 commit comments

Comments
 (0)