Updated recipes for Pleiades

Author: TidbitSoftware

jenkins/pleiades-basic

@@ -2,8 +2,8 @@
 # Environment #
 #-------------#
 
-export CFLAGS="-O3"
-export CXXFLAGS="-O3 -std=c++11"
+export CFLAGS="-g -Ofast"
+export CXXFLAGS="-g -Ofast -xCORE-AVX512,CORE-AVX2 -xAVX -std=c++11"
 
 #--------------------#
 # ISSM Configuration #
@@ -14,11 +14,10 @@ ISSM_CONFIG='\
 	--enable-development \
 	--enable-standalone-libraries \
 	--with-wrappers=no \
-	--with-graphics-lib="/usr/lib64/libX11.so" \
 	--with-fortran-lib="-L${COMP_INTEL_ROOT}/compiler/lib/intel64_lin -lifcore -lifport -lgfortran" \
 	--with-mkl-libflags="-L${COMP_INTEL_ROOT}/mkl/lib/intel64 -lmkl_intel_lp64 -lmkl_sequential -lmkl_core -lpthread -lm" \
-	--with-mpi-include="/nasa/hpe/mpt/2.30_rhel810/include" \
-	--with-mpi-libflags="-L/nasa/hpe/mpt/2.30_rhel810/lib -lmpi" \
+	--with-mpi-include="${MPI_ROOT}/include" \
+	--with-mpi-libflags="-L${MPI_ROOT}/lib -lmpi" \
 	--with-blas-lapack-lib="-L${COMP_INTEL_ROOT}/mkl/lib/intel64 -lmkl_blas95_lp64 -lmkl_lapack95_lp64" \
 	--with-metis-dir="${PETSC_DIR}" \
 	--with-parmetis-dir="${PETSC_DIR}" \
@@ -35,6 +34,7 @@ ISSM_CONFIG='\
 #-------------------#
 
 EXTERNALPACKAGES="
+	autotools	install-linux.sh
 	triangle	install-linux.sh
 	m1qn3		install-linux.sh
 	semic		install.sh
@@ -55,7 +55,7 @@ EXAMPLES_TEST=0
 # NOTE: One is usually safer as some packages are very sensitive to parallel
 # 		compilation.
 #
-NUMCPUS_INSTALL=8
+NUMCPUS_INSTALL=4
 
 # Number of CPUs used in the nightly runs
 NUMCPUS_RUN=1

jenkins/pleiades-dakota

@@ -2,8 +2,8 @@
 # Environment #
 #-------------#
 
-export CFLAGS="-O3"
-export CXXFLAGS="-O3 -std=c++11"
+export CFLAGS="-g -Ofast"
+export CXXFLAGS="-g -Ofast -xCORE-AVX512,CORE-AVX2 -xAVX -std=c++11"
 
 #--------------------#
 # ISSM Configuration #
@@ -14,16 +14,15 @@ ISSM_CONFIG='\
 	--enable-development \
 	--enable-standalone-libraries \
 	--with-wrappers=no \
-	--with-graphics-lib="/usr/lib64/libX11.so" \
 	--with-fortran-lib="-L${COMP_INTEL_ROOT}/compiler/lib/intel64_lin -lifcore -lifport -lgfortran" \
 	--with-mkl-libflags="-L${COMP_INTEL_ROOT}/mkl/lib/intel64 -lmkl_intel_lp64 -lmkl_sequential -lmkl_core -lpthread -lm" \
-	--with-mpi-include="${COMP_INTEL_ROOT}/mpi/intel64/include" \
-	--with-mpi-libflags="-lmpi" \
+	--with-mpi-include="${MPI_ROOT}/include" \
+	--with-mpi-libflags="-L${MPI_ROOT}/lib -lmpi" \
 	--with-blas-lapack-lib="-L${COMP_INTEL_ROOT}/mkl/lib/intel64 -lmkl_blas95_lp64 -lmkl_lapack95_lp64" \
 	--with-metis-dir="${PETSC_DIR}" \
 	--with-parmetis-dir="${PETSC_DIR}" \
-	--with-mumps-dir="${PETSC_DIR}" \
 	--with-scalapack-lib="-L${COMP_INTEL_ROOT}/mkl/lib/intel64/libmkl_scalapack_lp64.so" \
+	--with-mumps-dir="${PETSC_DIR}" \
 	--with-petsc-dir="${PETSC_DIR}" \
 	--with-boost-dir="${ISSM_DIR}/externalpackages/boost/install" \
 	--with-dakota-dir="${ISSM_DIR}/externalpackages/dakota/install" \
@@ -38,10 +37,11 @@ ISSM_CONFIG='\
 #-------------------#
 
 EXTERNALPACKAGES="
+	autotools	install-linux.sh
 	boost		install-1.7-linux.sh
 	dakota		install-6.2-pleiades.sh
 	chaco		install-linux.sh
-	triangle	install-linux.sh
+	triangle	install-linux.shwhic
 	m1qn3		install-linux.sh
 	semic		install.sh
 "
@@ -61,7 +61,7 @@ EXAMPLES_TEST=0
 # NOTE: One is usually safer as some packages are very sensitive to parallel
 # 		compilation.
 #
-NUMCPUS_INSTALL=8
+NUMCPUS_INSTALL=4
 
 # Number of CPUs used in the nightly runs
 NUMCPUS_RUN=1

jenkins/pleiades-solid_earth

@@ -2,8 +2,8 @@
 # Environment #
 #-------------#
 
-export CFLAGS="-O3"
-export CXXFLAGS="-O3 -std=c++11"
+export CFLAGS="-g -Ofast"
+export CXXFLAGS="-g -Ofast -xCORE-AVX512,CORE-AVX2 -xAVX -std=c++11"
 
 #--------------------#
 # ISSM Configuration #
@@ -16,8 +16,8 @@ ISSM_CONFIG='\
 	--with-wrappers=no \
 	--with-fortran-lib="-L${COMP_INTEL_ROOT}/compiler/lib/intel64_lin -lifcore -lifport -lgfortran" \
 	--with-mkl-libflags="-L${COMP_INTEL_ROOT}/mkl/lib/intel64 -lmkl_intel_lp64 -lmkl_sequential -lmkl_core -lpthread -lm" \
-	--with-mpi-include="/nasa/hpe/mpt/2.30_rhel810/include" \
-	--with-mpi-libflags="-L/nasa/hpe/mpt/2.30_rhel810/lib -lmpi" \
+	--with-mpi-include="${MPI_ROOT}/include" \
+	--with-mpi-libflags="-L${MPI_ROOT}/lib -lmpi" \
 	--with-blas-lapack-lib="-L${COMP_INTEL_ROOT}/mkl/lib/intel64 -lmkl_blas95_lp64 -lmkl_lapack95_lp64" \
 	--with-metis-dir="${PETSC_DIR}" \
 	--with-parmetis-dir="${PETSC_DIR}" \
@@ -39,12 +39,12 @@ ISSM_CONFIG='\
 #-------------------#
 
 EXTERNALPACKAGES="
-	zlib		install-1.sh
-	hdf5		install-1.sh
+	autotools	install-linux.sh
 	boost		install-1.7-linux.sh
 	dakota		install-6.2-pleiades.sh
 	chaco		install-linux.sh
-	curl		install-7-linux.sh
+	zlib		install-1.sh
+	hdf5		install-1.sh
 	netcdf		install-4.sh
 	sqlite		install.sh
 	proj		install-6.sh
@@ -72,7 +72,7 @@ EXAMPLES_TEST=0
 # NOTE: One is usually safer as some packages are very sensitive to parallel
 # 		compilation.
 #
-NUMCPUS_INSTALL=8
+NUMCPUS_INSTALL=4
 
 # Number of CPUs used in the nightly runs
 NUMCPUS_RUN=1