From ed3650989afc26a81a18bb0b0d8dbff09432978b Mon Sep 17 00:00:00 2001 From: Tidbit Software Date: Tue, 30 Jul 2024 13:22:30 -0700 Subject: [PATCH] CHG: Consolidation of C*OPTFLAGS to C*FLAGS; missing parmetis option --- jenkins/aws-amazon_linux-solid_earth | 1 + jenkins/jenkins.sh | 2 +- jenkins/pleiades-basic | 6 +++--- jenkins/pleiades-dakota | 3 +-- jenkins/pleiades-solid_earth | 3 +-- jenkins/ross-debian_linux-binaries-matlab | 1 + jenkins/ross-debian_linux-javascript | 2 +- src/c/Makefile.am | 16 ++++++++-------- src/wrappers/javascript/Makefile.am | 6 +++--- src/wrappers/matlab/Makefile.am | 4 ++-- src/wrappers/python/Makefile.am | 4 ++-- 11 files changed, 24 insertions(+), 24 deletions(-) diff --git a/jenkins/aws-amazon_linux-solid_earth b/jenkins/aws-amazon_linux-solid_earth index 6652690c7..4f5302806 100755 --- a/jenkins/aws-amazon_linux-solid_earth +++ b/jenkins/aws-amazon_linux-solid_earth @@ -18,6 +18,7 @@ ISSM_CONFIG='\ --with-mpi-libflags="-L${ISSM_DIR}/externalpackages/petsc/install/lib -lmpifort -lmpi" \ --with-blas-lapack-dir=${ISSM_DIR}/externalpackages/petsc/install \ --with-metis-dir=${ISSM_DIR}/externalpackages/petsc/install \ + --with-parmetis-dir=${ISSM_DIR}/externalpackages/petsc/install \ --with-scalapack-dir=${ISSM_DIR}/externalpackages/petsc/install \ --with-mumps-dir=${ISSM_DIR}/externalpackages/petsc/install \ --with-hdf5-dir=${ISSM_DIR}/externalpackages/petsc/install \ diff --git a/jenkins/jenkins.sh b/jenkins/jenkins.sh index 35291b323..76be9ca4d 100755 --- a/jenkins/jenkins.sh +++ b/jenkins/jenkins.sh @@ -334,7 +334,7 @@ EOF # Wait for MATLAB to exit # # TODO: - # - Replace by adding -wait option to above calls to matlab? + # - Replace by adding -wait option to above calls to MATLAB? # if [[ ${MINGW} -eq 1 ]]; then sleep 5; diff --git a/jenkins/pleiades-basic b/jenkins/pleiades-basic index 6c3457faa..d7a621ed0 100755 --- a/jenkins/pleiades-basic +++ b/jenkins/pleiades-basic @@ -3,10 +3,9 @@ #-------------# export CC=icc -export CXX=icpc -export CXXFLAGS="-O3 -D_INTEL_LINUX_ -std=c++11" -export CXXOPTFLAGS="-g -O3 -axCORE-AVX2,AVX -xSSE4.2 -ipo -no-inline-min-size -inline-max-size=345 -no-inline-max-total-size -no-inline-max-per-routine -no-inline-max-per-compile" export CFLAGS="-O3 -D_INTEL_LINUX_" +export CXX=icpc +export CXXFLAGS="-g -O3 -D_INTEL_LINUX_ -std=c++11 -axCORE-AVX2,AVX -xSSE4.2 -ipo -no-inline-min-size -inline-max-size=345 -no-inline-max-total-size -no-inline-max-per-routine -no-inline-max-per-compile" #--------------------# # ISSM Configuration # @@ -21,6 +20,7 @@ ISSM_CONFIG='\ --with-mpi-libflags=" -lmpi" \ --with-mkl-libflags="-L/nasa/intel/Compiler/2016.2.181/mkl/lib/intel64/ -mkl=cluster " \ --with-metis-dir="${ISSM_DIR}/externalpackages/petsc/install" \ + --with-parmetis-dir=${ISSM_DIR}/externalpackages/petsc/install \ --with-mumps-dir="${ISSM_DIR}/externalpackages/petsc/install" \ --with-scalapack-dir="${ISSM_DIR}/externalpackages/petsc/install" \ --with-fortran-lib="-L/nasa/intel/Compiler/2016.2.181/compilers_and_libraries_2016.2.181/linux/compiler/lib/intel64/ -lifcore -lifport" \ diff --git a/jenkins/pleiades-dakota b/jenkins/pleiades-dakota index 773c1a71f..aa3659dad 100755 --- a/jenkins/pleiades-dakota +++ b/jenkins/pleiades-dakota @@ -3,10 +3,9 @@ #-------------# export CC=icc +export CFLAGS="-O3 -D_INTEL_LINUX_" export CXX=icpc export CXXFLAGS="-O3 -D_INTEL_LINUX_ -std=c++11" -export CXXOPTFLAGS="-O3" -export CFLAGS="-O3 -D_INTEL_LINUX_" #--------------------# # ISSM Configuration # diff --git a/jenkins/pleiades-solid_earth b/jenkins/pleiades-solid_earth index 42927a8fb..7f109ea7c 100755 --- a/jenkins/pleiades-solid_earth +++ b/jenkins/pleiades-solid_earth @@ -3,10 +3,9 @@ #-------------# export CC=icc +export CFLAGS="-O3 -D_INTEL_LINUX_" export CXX=icpc export CXXFLAGS="-O3 -D_INTEL_LINUX_ -std=c++11" -export CXXOPTFLAGS="-O3" -export CFLAGS="-O3 -D_INTEL_LINUX_" #--------------------# # ISSM Configuration # diff --git a/jenkins/ross-debian_linux-binaries-matlab b/jenkins/ross-debian_linux-binaries-matlab index 1c393e452..435aae169 100755 --- a/jenkins/ross-debian_linux-binaries-matlab +++ b/jenkins/ross-debian_linux-binaries-matlab @@ -24,6 +24,7 @@ ISSM_CONFIG='\ --with-mpi-libflags="-L${ISSM_DIR}/externalpackages/petsc/install/lib -lmpi -lmpicxx -lmpifort" \ --with-blas-lapack-dir=${ISSM_DIR}/externalpackages/petsc/install \ --with-metis-dir=${ISSM_DIR}/externalpackages/petsc/install \ + --with-parmetis-dir=${ISSM_DIR}/externalpackages/petsc/install \ --with-scalapack-dir=${ISSM_DIR}/externalpackages/petsc/install \ --with-mumps-dir=${ISSM_DIR}/externalpackages/petsc/install \ --with-hdf5-dir=${ISSM_DIR}/externalpackages/hdf5/install \ diff --git a/jenkins/ross-debian_linux-javascript b/jenkins/ross-debian_linux-javascript index 936a1f606..5309292bc 100755 --- a/jenkins/ross-debian_linux-javascript +++ b/jenkins/ross-debian_linux-javascript @@ -1,7 +1,7 @@ #-------------# # Environment # #-------------# -export CXXOPTFLAGS="-g -O2 -fPIC -std=c++11" +export CXXFLAGS="-g -O2 -fPIC -std=c++11" #--------------------# # ISSM Configuration # diff --git a/src/c/Makefile.am b/src/c/Makefile.am index f88ff36b1..bbeb6c245 100644 --- a/src/c/Makefile.am +++ b/src/c/Makefile.am @@ -708,7 +708,7 @@ modules_sources += \ endif #}}} # Library flags and sources {{{ -ALL_CXXFLAGS = $(CXXFLAGS) $(CXXOPTFLAGS) +ALL_CXXFLAGS = $(CXXFLAGS) if MSYS2 ALL_CXXFLAGS += -D_DO_NOT_LOAD_GLOBALS_ # Cannot have undefined symbols under MSYS2 @@ -817,7 +817,7 @@ endif if !MSYS2 libISSMOverload_la_SOURCES = ./shared/String/ApiPrintf.cpp -libISSMOverload_la_CFLAGS = -D_C_ -fPIC $(CFLAGS) $(COPTFLAGS) +libISSMOverload_la_CFLAGS = -D_C_ -fPIC $(CFLAGS) $(CXXFLAGS) if VERSION libISSMOverload_la_LDFLAGS = @@ -860,29 +860,29 @@ endif LDADD += $(OSLIBS) issm_SOURCES = main/issm.cpp -issm_CXXFLAGS= $(CXXFLAGS) $(CXXOPTFLAGS) +issm_CXXFLAGS= $(CXXFLAGS) issm_slc_SOURCES = main/issm_slc.cpp -issm_slc_CXXFLAGS= $(CXXFLAGS) $(CXXOPTFLAGS) +issm_slc_CXXFLAGS= $(CXXFLAGS) if OCEAN bin_PROGRAMS += issm_ocean issm_ocean_SOURCES = main/issm_ocean.cpp -issm_ocean_CXXFLAGS= $(CXXFLAGS) $(CXXOPTFLAGS) +issm_ocean_CXXFLAGS= $(CXXFLAGS) endif if KRIGING bin_PROGRAMS += kriging kriging_SOURCES = main/kriging.cpp -kriging_CXXFLAGS= $(COPTFLAGS) $(CXXFLAGS) $(CXXOPTFLAGS) +kriging_CXXFLAGS= $(CXXFLAGS) endif if ISSM_DAKOTA bin_PROGRAMS += issm_dakota issm_dakota_SOURCES = main/issm_dakota.cpp -issm_dakota_CXXFLAGS= $(COPTFLAGS) $(CXXFLAGS) $(CXXOPTFLAGS) +issm_dakota_CXXFLAGS= $(CXXFLAGS) bin_PROGRAMS += issm_post issm_post_SOURCES = main/issm_post.cpp -issm_post_CXXFLAGS= $(CXXFLAGS) $(CXXOPTFLAGS) +issm_post_CXXFLAGS= $(CXXFLAGS) endif #}}} diff --git a/src/wrappers/javascript/Makefile.am b/src/wrappers/javascript/Makefile.am index 56396e1c2..419e2412e 100644 --- a/src/wrappers/javascript/Makefile.am +++ b/src/wrappers/javascript/Makefile.am @@ -29,7 +29,7 @@ io_sources = \ ./io/WriteJavascriptData.cpp \ ./io/FetchJavascriptData.cpp -ALLCXXFLAGS= -fPIC -D_WRAPPERS_ $(CXXFLAGS) $(CXXOPTFLAGS) +ALLCXXFLAGS= -fPIC -D_WRAPPERS_ $(CXXFLAGS) libISSMJavascript_la_SOURCES = $(io_sources) libISSMJavascript_la_CXXFLAGS= $(ALLCXXFLAGS) @@ -55,7 +55,7 @@ AM_CXXFLAGS += -D_HAVE_JAVASCRIPT_MODULES_ -fPIC deps = ./libISSMJavascript.la ../../c/libISSMModules.la ../../c/libISSMCore.la ./libISSMApi.la # Optimization flags -AM_CXXFLAGS += $(CXXOPTFLAGS) +AM_CXXFLAGS += $(CXXFLAGS) #}}} # Module sources and dependencies {{{ libISSMJavascript_la_LIBADD = ./../../c/libISSMCore.la ./../../c/libISSMModules.la $(MPILIB) $(PETSCLIB) $(MKLLIB) $(GSLLIB) $(MATHLIB) @@ -89,6 +89,6 @@ IssmModule_SOURCES = \ ../IssmConfig/IssmConfig.cpp \ ../Issm/issm.cpp -IssmModule_CXXFLAGS= -fPIC -D_DO_NOT_LOAD_GLOBALS_ $(AM_CXXFLAGS) $(CXXFLAGS) $(CXXOPTFLAGS) $(COPTFLAGS) -s EXPORTED_FUNCTIONS="['_BamgMesherModule','_TriangleModule','_NodeConnectivityModule','_ContourToMeshModule','_ElementConnectivityModule','_InterpFromGridToMeshModule','_InterpFromMeshToMesh2dModule','_IssmConfigModule','_IssmModule']" -s DISABLE_EXCEPTION_CATCHING=0 -s ALLOW_MEMORY_GROWTH=1 -s INVOKE_RUN=0 +IssmModule_CXXFLAGS= -fPIC -D_DO_NOT_LOAD_GLOBALS_ $(AM_CXXFLAGS) $(CXXFLAGS) -s EXPORTED_FUNCTIONS="['_BamgMesherModule','_TriangleModule','_NodeConnectivityModule','_ContourToMeshModule','_ElementConnectivityModule','_InterpFromGridToMeshModule','_InterpFromMeshToMesh2dModule','_IssmConfigModule','_IssmModule']" -s DISABLE_EXCEPTION_CATCHING=0 -s ALLOW_MEMORY_GROWTH=1 -s INVOKE_RUN=0 IssmModule_LDADD = ${deps} $(TRIANGLELIB) $(GSLLIB) #}}} diff --git a/src/wrappers/matlab/Makefile.am b/src/wrappers/matlab/Makefile.am index 003cfa695..36c746469 100644 --- a/src/wrappers/matlab/Makefile.am +++ b/src/wrappers/matlab/Makefile.am @@ -21,7 +21,7 @@ ALL_CXXFLAGS += -D_DO_NOT_LOAD_GLOBALS_ # Cannot have undefined symbols under MS ALL_CXXFLAGS += -D_USE_MATH_DEFINES # Need to open fence to math.h definitions when --std=c++ is used (which is the default) endif -ALL_CXXFLAGS += $(CXXFLAGS) $(CXXOPTFLAGS) +ALL_CXXFLAGS += $(CXXFLAGS) libISSMMatlab_la_SOURCES = $(io_sources) libISSMMatlab_la_CXXFLAGS = ${ALL_CXXFLAGS} @@ -144,7 +144,7 @@ endif deps += ${LIBADD_FOR_MEX} # Optimization flags -AM_CXXFLAGS += $(CXXOPTFLAGS) +AM_CXXFLAGS += $(CXXFLAGS) #}}} # Module sources and dependencies {{{ libISSMMatlab_la_LIBADD = ./../../c/libISSMCore.la ./../../c/libISSMModules.la $(PETSCLIB) $(MUMPSLIB) $(SCALAPACKLIB) $(BLASLAPACKLIB) $(PARMETISLIB) $(METISLIB) $(HDF5LIB) $(MPILIB) $(NEOPZLIB) $(MKLLIB) $(GSLLIB) $(PROJLIB) $(MATHLIB) $(MEXLIB) diff --git a/src/wrappers/python/Makefile.am b/src/wrappers/python/Makefile.am index 9e79afdab..7b3f81a70 100644 --- a/src/wrappers/python/Makefile.am +++ b/src/wrappers/python/Makefile.am @@ -19,7 +19,7 @@ ALL_CXXFLAGS += -D_DO_NOT_LOAD_GLOBALS_ # Cannot have undefined symbols under MS ALL_CXXFLAGS += -D_USE_MATH_DEFINES # Need to open fence to math.h definitions when --std=c++ is used (which is the default) endif -ALL_CXXFLAGS += $(CXXFLAGS) $(CXXOPTFLAGS) +ALL_CXXFLAGS += $(CXXFLAGS) libISSMPython_la_SOURCES = $(io_sources) libISSMPython_la_CXXFLAGS= ${ALL_CXXFLAGS} @@ -127,7 +127,7 @@ deps += $(FLIBS) $(FORTRANLIB) endif #Optimization flags: -AM_CXXFLAGS += $(CXXOPTFLAGS) +AM_CXXFLAGS += $(CXXFLAGS) #}}} # Module sources and dependencies {{{ libISSMPython_la_LIBADD = ./../../c/libISSMCore.la ./../../c/libISSMModules.la $(PETSCLIB) $(HDF5LIB) $(MPILIB) $(NEOPZLIB) $(MKLLIB) $(GSLLIB) $(MATHLIB)