From 3bfc577a86d438c1bdac1e7c219f82a22b62c51d Mon Sep 17 00:00:00 2001 From: Anthony Islas Date: Mon, 3 Jul 2023 13:37:12 -0600 Subject: [PATCH 1/3] Adding ifx/icx Intel oneAPI build --- arch/configure.defaults | 46 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/arch/configure.defaults b/arch/configure.defaults index e7a9836226..fff9175bc0 100644 --- a/arch/configure.defaults +++ b/arch/configure.defaults @@ -342,6 +342,52 @@ RLFLAGS = CC_TOOLS = $(SCC) NETCDFPAR_BUILD = CONFIGURE_NETCDFPAR_BUILD +########################################################### +#ARCH Linux x86_64 ppc64le i486 i586 i686, Intel oneAPI compiler with icx #serial smpar dmpar dm+sm +# This mirrors the above Intel build but changes ifort=>ifx icc=>icx + +DESCRIPTION = INTEL ($SFC/$SCC) : oneAPI LLVM +DMPARALLEL = # 1 +OMPCPP = # -D_OPENMP +OMP = # -qopenmp -fpp -auto +OMPCC = # -qopenmp -fpp -auto +SFC = ifx +SCC = icx +CCOMP = icx +DM_FC = mpif90 -f90=$(SFC) +DM_CC = mpicc -cc=$(SCC) +FC = CONFIGURE_FC +CC = CONFIGURE_CC +LD = $(FC) +RWORDSIZE = CONFIGURE_RWORDSIZE +PROMOTION = -real-size `expr 8 \* $(RWORDSIZE)` -i4 +ARCH_LOCAL = -DNONSTANDARD_SYSTEM_FUNC CONFIGURE_D_CTSM +CFLAGS_LOCAL = -w -O3 -ip #-xHost -fp-model fast=2 -no-prec-div -no-prec-sqrt -ftz -no-multibyte-chars # -DRSL0_ONLY +LDFLAGS_LOCAL = -ip #-xHost -fp-model fast=2 -no-prec-div -no-prec-sqrt -ftz -align all -fno-alias -fno-common +CPLUSPLUSLIB = +ESMF_LDFLAG = $(CPLUSPLUSLIB) +FCOPTIM = -O3 +FCREDUCEDOPT = $(FCOPTIM) +FCNOOPT = -O0 -fno-inline -no-ip +FCDEBUG = # -g $(FCNOOPT) -traceback # -fpe0 -check noarg_temp_created,bounds,format,output_conversion,pointers,uninit -ftrapuv -unroll0 -u +FORMAT_FIXED = -FI +FORMAT_FREE = -FR +FCSUFFIX = +BYTESWAPIO = -convert big_endian +RECORDLENGTH = -assume byterecl +FCBASEOPTS_NO_G = -ip -fp-model precise -w -ftz -align all -fno-alias $(FORMAT_FREE) $(BYTESWAPIO) #-xHost -fp-model fast=2 -no-heap-arrays -no-prec-div -no-prec-sqrt -fno-common +FCBASEOPTS = $(FCBASEOPTS_NO_G) $(FCDEBUG) +MODULE_SRCH_FLAG = +TRADFLAG = CONFIGURE_TRADFLAG +CPP = /lib/cpp CONFIGURE_CPPFLAGS +AR = ar +ARFLAGS = ru +M4 = m4 +RANLIB = ranlib +RLFLAGS = +CC_TOOLS = $(SCC) +NETCDFPAR_BUILD = CONFIGURE_NETCDFPAR_BUILD + ########################################################### #ARCH Linux x86_64 ppc64le i486 i586 i686, Xeon Phi (MIC architecture) ifort compiler with icc # dm+sm # From 24880288f1de085c72435bc4cfc75d379d25de47 Mon Sep 17 00:00:00 2001 From: Anthony Islas Date: Mon, 3 Jul 2023 15:03:43 -0600 Subject: [PATCH 2/3] Remove -fpp flag from c compilation of OpenMP flags --- arch/configure.defaults | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/configure.defaults b/arch/configure.defaults index fff9175bc0..272d658f8b 100644 --- a/arch/configure.defaults +++ b/arch/configure.defaults @@ -350,7 +350,7 @@ DESCRIPTION = INTEL ($SFC/$SCC) : oneAPI LLVM DMPARALLEL = # 1 OMPCPP = # -D_OPENMP OMP = # -qopenmp -fpp -auto -OMPCC = # -qopenmp -fpp -auto +OMPCC = # -qopenmp -auto SFC = ifx SCC = icx CCOMP = icx From 295ab2f58d852a3afbb87d6a484e0d9a63e6d238 Mon Sep 17 00:00:00 2001 From: Anthony Islas Date: Wed, 5 Jul 2023 12:36:20 -0600 Subject: [PATCH 3/3] Moving configuration down to avoid conflicting with regression tests --- arch/configure.defaults | 91 +++++++++++++++++++++-------------------- 1 file changed, 46 insertions(+), 45 deletions(-) diff --git a/arch/configure.defaults b/arch/configure.defaults index 272d658f8b..633f4edd19 100644 --- a/arch/configure.defaults +++ b/arch/configure.defaults @@ -342,51 +342,6 @@ RLFLAGS = CC_TOOLS = $(SCC) NETCDFPAR_BUILD = CONFIGURE_NETCDFPAR_BUILD -########################################################### -#ARCH Linux x86_64 ppc64le i486 i586 i686, Intel oneAPI compiler with icx #serial smpar dmpar dm+sm -# This mirrors the above Intel build but changes ifort=>ifx icc=>icx - -DESCRIPTION = INTEL ($SFC/$SCC) : oneAPI LLVM -DMPARALLEL = # 1 -OMPCPP = # -D_OPENMP -OMP = # -qopenmp -fpp -auto -OMPCC = # -qopenmp -auto -SFC = ifx -SCC = icx -CCOMP = icx -DM_FC = mpif90 -f90=$(SFC) -DM_CC = mpicc -cc=$(SCC) -FC = CONFIGURE_FC -CC = CONFIGURE_CC -LD = $(FC) -RWORDSIZE = CONFIGURE_RWORDSIZE -PROMOTION = -real-size `expr 8 \* $(RWORDSIZE)` -i4 -ARCH_LOCAL = -DNONSTANDARD_SYSTEM_FUNC CONFIGURE_D_CTSM -CFLAGS_LOCAL = -w -O3 -ip #-xHost -fp-model fast=2 -no-prec-div -no-prec-sqrt -ftz -no-multibyte-chars # -DRSL0_ONLY -LDFLAGS_LOCAL = -ip #-xHost -fp-model fast=2 -no-prec-div -no-prec-sqrt -ftz -align all -fno-alias -fno-common -CPLUSPLUSLIB = -ESMF_LDFLAG = $(CPLUSPLUSLIB) -FCOPTIM = -O3 -FCREDUCEDOPT = $(FCOPTIM) -FCNOOPT = -O0 -fno-inline -no-ip -FCDEBUG = # -g $(FCNOOPT) -traceback # -fpe0 -check noarg_temp_created,bounds,format,output_conversion,pointers,uninit -ftrapuv -unroll0 -u -FORMAT_FIXED = -FI -FORMAT_FREE = -FR -FCSUFFIX = -BYTESWAPIO = -convert big_endian -RECORDLENGTH = -assume byterecl -FCBASEOPTS_NO_G = -ip -fp-model precise -w -ftz -align all -fno-alias $(FORMAT_FREE) $(BYTESWAPIO) #-xHost -fp-model fast=2 -no-heap-arrays -no-prec-div -no-prec-sqrt -fno-common -FCBASEOPTS = $(FCBASEOPTS_NO_G) $(FCDEBUG) -MODULE_SRCH_FLAG = -TRADFLAG = CONFIGURE_TRADFLAG -CPP = /lib/cpp CONFIGURE_CPPFLAGS -AR = ar -ARFLAGS = ru -M4 = m4 -RANLIB = ranlib -RLFLAGS = -CC_TOOLS = $(SCC) -NETCDFPAR_BUILD = CONFIGURE_NETCDFPAR_BUILD ########################################################### #ARCH Linux x86_64 ppc64le i486 i586 i686, Xeon Phi (MIC architecture) ifort compiler with icc # dm+sm @@ -2169,6 +2124,52 @@ NETCDFPAR_BUILD = CONFIGURE_NETCDFPAR_BUILD #insert new stanza here +########################################################### +#ARCH Linux x86_64 ppc64le i486 i586 i686, Intel oneAPI compiler with icx #serial smpar dmpar dm+sm +# This mirrors the above Intel build but changes ifort=>ifx icc=>icx + +DESCRIPTION = INTEL ($SFC/$SCC) : oneAPI LLVM +DMPARALLEL = # 1 +OMPCPP = # -D_OPENMP +OMP = # -qopenmp -fpp -auto +OMPCC = # -qopenmp -auto +SFC = ifx +SCC = icx +CCOMP = icx +DM_FC = mpif90 -f90=$(SFC) +DM_CC = mpicc -cc=$(SCC) +FC = CONFIGURE_FC +CC = CONFIGURE_CC +LD = $(FC) +RWORDSIZE = CONFIGURE_RWORDSIZE +PROMOTION = -real-size `expr 8 \* $(RWORDSIZE)` -i4 +ARCH_LOCAL = -DNONSTANDARD_SYSTEM_FUNC CONFIGURE_D_CTSM +CFLAGS_LOCAL = -w -O3 -ip #-xHost -fp-model fast=2 -no-prec-div -no-prec-sqrt -ftz -no-multibyte-chars # -DRSL0_ONLY +LDFLAGS_LOCAL = -ip #-xHost -fp-model fast=2 -no-prec-div -no-prec-sqrt -ftz -align all -fno-alias -fno-common +CPLUSPLUSLIB = +ESMF_LDFLAG = $(CPLUSPLUSLIB) +FCOPTIM = -O3 +FCREDUCEDOPT = $(FCOPTIM) +FCNOOPT = -O0 -fno-inline -no-ip +FCDEBUG = # -g $(FCNOOPT) -traceback # -fpe0 -check noarg_temp_created,bounds,format,output_conversion,pointers,uninit -ftrapuv -unroll0 -u +FORMAT_FIXED = -FI +FORMAT_FREE = -FR +FCSUFFIX = +BYTESWAPIO = -convert big_endian +RECORDLENGTH = -assume byterecl +FCBASEOPTS_NO_G = -ip -fp-model precise -w -ftz -align all -fno-alias $(FORMAT_FREE) $(BYTESWAPIO) #-xHost -fp-model fast=2 -no-heap-arrays -no-prec-div -no-prec-sqrt -fno-common +FCBASEOPTS = $(FCBASEOPTS_NO_G) $(FCDEBUG) +MODULE_SRCH_FLAG = +TRADFLAG = CONFIGURE_TRADFLAG +CPP = /lib/cpp CONFIGURE_CPPFLAGS +AR = ar +ARFLAGS = ru +M4 = m4 +RANLIB = ranlib +RLFLAGS = +CC_TOOLS = $(SCC) +NETCDFPAR_BUILD = CONFIGURE_NETCDFPAR_BUILD + ########################################################### #ARCH Linux aarch64, GCC compiler OpenMPI # serial smpar dmpar dm+sm #