Changeset 25876

Timestamp:

12/16/20 16:26:32 (4 years ago)

Author:

schlegel

Message:

CHG: install scripts for pfe dakota with newest pfe configuration

Location:

issm/trunk-jpl

Files:

• externalpackages/dakota/configs/6.2/BuildDakotaCustom.cmake.pfe.patch (modified) (1 diff)
• externalpackages/dakota/configs/6.2/CMakeLists.txt.pfe.patch (modified) (1 diff)
• externalpackages/dakota/install-6.2-pleiades.sh (modified) (2 diffs)
• externalpackages/triangle/install-pleiades.sh (modified) (1 diff)
• m4/issm_options.m4 (modified) (1 diff)

issm/trunk-jpl/externalpackages/dakota/configs/6.2/BuildDakotaCustom.cmake.pfe.patch

@@ -16 +16 @@
 ---
 > set(BOOST_ROOT
->     "/nasa/boost/1.50.0"
+>     "/nasa/pkgsrc/sles12/2018Q3/" 
 >     CACHE PATH "Use non-standard Boost install" FORCE)
 > set( Boost_NO_SYSTEM_PATHS TRUE

issm/trunk-jpl/externalpackages/dakota/configs/6.2/CMakeLists.txt.pfe.patch

@@ -3 +3 @@
 ---
 > # TODO: Can't this be integrated into the following logic?
-> set(BLAS_LIBS "-L/nasa/intel/Compiler/2016.2.181/compilers_and_libraries_2016.2.181/linux/mkl/lib/intel64/ -lmkl_intel_lp64 -lmkl_sequential -lmkl_core -L/usr/lib64/ -lpthread -lm")
-> set(LAPACK_LIBS "-L/nasa/intel/Compiler/2016.2.181/compilers_and_libraries_2016.2.181/linux/mkl/lib/intel64/ -lmkl_intel_lp64 -lmkl_sequential -lmkl_core -L/usr/lib64/ -lpthread -lm")
+> set(BLAS_LIBS "-L/nasa/intel/Compiler/2016.2.181/compilers_and_libraries_2016.2.181/linux/mkl/lib/intel64/ -lmkl_intel_lp64 -lmkl_sequential -lmkl_core")
+> set(LAPACK_LIBS "-L/nasa/intel/Compiler/2016.2.181/compilers_and_libraries_2016.2.181/linux/mkl/lib/intel64/ -lmkl_intel_lp64 -lmkl_sequential -lmkl_core")

issm/trunk-jpl/externalpackages/dakota/install-6.2-pleiades.sh

@@ -22 +22 @@
 export DAK_SRC=$ISSM_DIR/externalpackages/dakota/src
 export DAK_BUILD=$ISSM_DIR/externalpackages/dakota/build
-export MPIHOME=$ISSM_DIR/externalpackages/mpich/install
 cp $DAK_SRC/cmake/BuildDakotaTemplate.cmake $DAK_SRC/cmake/BuildDakotaCustom.cmake
-patch $DAK_SRC/cmake/BuildDakotaCustom.cmake configs/6.2/BuildDakotaCustom.cmake.patch
+patch $DAK_SRC/cmake/BuildDakotaCustom.cmake configs/6.2/BuildDakotaCustom.cmake.pfe.patch
 patch $DAK_SRC/cmake/DakotaDev.cmake configs/6.2/DakotaDev.cmake.patch
 patch $DAK_SRC/CMakeLists.txt configs/6.2/CMakeLists.txt.pfe.patch
@@ -36 +35 @@
 cd $DAK_BUILD
 
-cmake -D CMAKE_C_COMPILER=mpicc \
-           -D CMAKE_CXX_COMPILER=mpicxx \
-           -D CMAKE_Fortran_COMPILER=/usr/bin/gfortran \
-                -DHAVE_ACRO=off \
-                -DHAVE_JEGA=off \
-                -C $DAK_SRC/cmake/BuildDakotaCustom.cmake \
-                -C $DAK_SRC/cmake/DakotaDev.cmake \
-                $DAK_SRC
+cmake \
+        -DBUILD_SHARED_LIBS=OFF \
+        -DBUILD_STATIC_LIBS=ON \
+        -DCMAKE_C_COMPILER=mpicc \
+        -DCMAKE_CXX_COMPILER=mpicxx \
+        -DCMAKE_Fortran_COMPILER=mpif77 \
+        -DBoost_NO_BOOST_CMAKE=TRUE \
+        -DHAVE_ACRO=OFF \
+        -DHAVE_JEGA=OFF \
+        -DHAVE_QUESO=ON \
+        -DDAKOTA_HAVE_GSL=ON \
+        -C${DAK_SRC}/cmake/BuildDakotaCustom.cmake \
+        -C${DAK_SRC}/cmake/DakotaDev.cmake \
+        ${DAK_SRC}
+
 cd ..
 

issm/trunk-jpl/externalpackages/triangle/install-pleiades.sh

@@ -2 +2 @@
 set -eu
 
-#Some cleanup 
-rm -rf install triangle
-mkdir install
 
-#Download from ISSM server
-$ISSM_DIR/scripts/DownloadExternalPackage.sh 'https://issm.ess.uci.edu/files/externalpackages/triangle.zip' 'triangle.zip'
+# Constants
+#
+INSTALL_DIR="install"
 
-#Untar 
-cd install
-cp ../triangle.zip ./
-unzip triangle.zip
+# Cleanup
+rm -rf ${INSTALL_DIR} src
+mkdir ${INSTALL_DIR} ${INSTALL_DIR}/include ${INSTALL_DIR}/lib src
 
-#copy new makefile
-cp ../configs/pleiades/configure.make ./
-cp ../makefile ./
+# Download source
+$ISSM_DIR/scripts/DownloadExternalPackage.sh "https://issm.ess.uci.edu/files/externalpackages/triangle.zip" "triangle.zip"
 
-#Compile triangle
-make
+# Unpack source
+unzip triangle.zip -d src
 
-#Patch triangle.h
-patch triangle.h ../triangle.h.patch
+# Copy customized source files to 'src' directory
+cp configs/makefile src
+cp configs/triangle.h src
+cp configs/linux/configure.make src
+
+# Compile
+cd src
+make shared
+
+# Install
+cd ..
+cp src/libtriangle.* ${INSTALL_DIR}/lib
+cp src/triangle.h ${INSTALL_DIR}/include
+
+# Cleanup
+rm -rf src

issm/trunk-jpl/m4/issm_options.m4

@@ -309 +309 @@
                         export CXXFLAGS="-O3 -march=corei7-avx -std=c++11"
                         export CFLAGS="-O3 -march=corei7-avx"
+                elif test "${VENDOR}" == "intel-pleiades-mpi"; then
+                        export CC=mpicc
+                        export CXX=mpicxx
+                        export CXXFLAGS="-O3 -march=corei7-avx -std=c++11"
+                        export CFLAGS="-O3 -march=corei7-avx"
                 elif test "${VENDOR}" == "intel-pleiades-icpc"; then
                         export CXXFLAGS="-g -O3 -ipo -axAVX -ipo -no-inline-min-size -inline-max-size=345 -no-inline-max-total-size -no-inline-max-per-routine -no-inline-max-per-compile -restrict -std=c++11"