Changeset 23626

Timestamp:

01/11/19 18:47:00 (6 years ago)

Author:

schlegel

Message:

CHG: update lonestar install

Location:

issm/trunk-jpl/externalpackages

Files:

• boost/configs/1.55/ordered_index.hpp.patch (added)
• boost/install-1.55-lonestar.sh (modified) (1 diff)
• dakota/configs/6.2/CMakeLists.txt.lonestar.patch (modified) (1 diff)
• dakota/configs/6.2/DakotaInterface.patch (added)
• dakota/configs/6.2/MainEffectsExcelOutput.patch (added)
• dakota/configs/6.2/NKM_KrigingModel.patch (added)
• dakota/install-6.2-lonestar.sh (modified) (2 diffs)
• petsc/install-3.6-lonestar.sh (modified) (2 diffs)

issm/trunk-jpl/externalpackages/boost/install-1.55-lonestar.sh

@@ -37 +37 @@
 mkdir ../install/bin
 cp bjam ../install/bin
+
+patch install/include/boost/multi_index/ordered_index.hpp ./configs/1.55/ordered_index.hpp.patch

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

@@ -3 +3 @@
 ---
 > # TODO: Can't this be integrated into the following logic?
-> set(BLAS_LIBS "-L/opt/apps/intel/11.1/mkl/lib/em64t/ -lmkl_intel_lp64 -lmkl_sequential -lmkl_core -L/usr/lib64/ -lpthread -lm")
-> set(LAPACK_LIBS "-L/opt/apps/intel/11.1/mkl/lib/em64t/ -lmkl_intel_lp64 -lmkl_sequential -lmkl_core -L/usr/lib64/ -lpthread -lm")
+> set(BLAS_LIBS "-L$TACC_MKL_LIB -lmkl_intel_lp64 -lmkl_sequential -lmkl_core -lpthread -lm")
+> set(LAPACK_LIBS "-L$TACC_MKL_LIB -lmkl_intel_lp64 -lmkl_sequential -lmkl_core -lpthread -lm")

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

@@ -22 +22 @@
 export DAK_SRC=$ISSM_DIR/externalpackages/dakota/src
 export DAK_BUILD=$ISSM_DIR/externalpackages/dakota/build
-export MPIHOME=/opt/cray/mpt/default/gni/mpich-intel/14.0/
+export MPIHOME=/opt/cray/pe/mpt/7.7.3/gni/mpich-intel/16.0/
+
 cp $DAK_SRC/cmake/BuildDakotaTemplate.cmake $DAK_SRC/cmake/BuildDakotaCustom.cmake
 patch $DAK_SRC/cmake/BuildDakotaCustom.cmake configs/6.2/BuildDakotaCustom.cmake.patch
@@ -32 +33 @@
 patch src/src/NonDLocalReliability.cpp configs/6.2/NonDLocalReliability.cpp.patch
 patch src/packages/pecos/src/pecos_global_defs.hpp configs/6.2/pecos_global_defs.hpp.patch
+patch src/packages/surfpack/src/surfaces/nkm/NKM_KrigingModel.cpp configs/6.2/NKM_KrigingModel.patch
+patch src/packages/DDACE/src/Analyzer/MainEffectsExcelOutput.cpp configs/6.2/MainEffectsExcelOutput.patch
+patch src/src/DakotaInterface.cpp configs/6.2/DakotaInterface.patch
 
 #Configure dakota
 cd $DAK_BUILD
 
-cmake -D CMAKE_C_COMPILER=/opt/apps/intel16/cray_mpich/7.3.0/bin/mpicc \
-           -D CMAKE_CXX_COMPILER=/opt/apps/intel16/cray_mpich/7.3.0/bin/mpicxx \
-           -D CMAKE_Fortran_COMPILER=/opt/apps/intel16/cray_mpich/7.3.0/bin/mpif77 \
+cmake -D CMAKE_C_COMPILER=mpicc \
+           -D CMAKE_CXX_COMPILER=mpicxx \
+           -D CMAKE_Fortran_COMPILER=mpif77 \
+                -D MPIEXEC_EXECUTABLE=/opt/apps/tacc/bin/ibrun \
                 -DHAVE_ACRO=off \
                 -DHAVE_JEGA=off \

issm/trunk-jpl/externalpackages/petsc/install-3.6-lonestar.sh

@@ -20 +20 @@
         --PETSC_DIR="$ISSM_DIR/externalpackages/petsc/src" \
         --with-blas-lapack-dir="$TACC_MKL_LIB" \
-        --with-mpi-lib="/opt/cray/mpt/default/gni/mpich-intel/14.0/lib/libmpich.so" \
-        --with-mpi-include="/opt/cray/mpt/default/gni/mpich-intel/14.0/include" \
+        --with-mpi-lib="/opt/cray/pe/mpt/7.7.3/gni/mpich-intel/16.0/lib/libmpich.so" \
+        --with-mpi-include="/opt/cray/pe/mpt/7.7.3/gni/mpich-intel/16.0/include" \
         --known-mpi-shared-libraries=1 \
         --with-debugging=0 \
@@ -38 +38 @@
 #!/bin/bash              
 #SBATCH -J petscinstall # Job Name
-#SBATCH -n 12 # Requests 12 tasks/node, 12 cores total
+#SBATCH -n 24 # Requests 12 tasks/node, 12 cores total
 #SBATCH -N 1 # Requests 12 tasks/node, 12 cores total
 #SBATCH -p normal # Queue name normal
 #SBATCH -t 00:01:00 # Run time (hh:mm:ss) - 1.5 hours
-set -x # Echo commands, use set echo with csh
 
 ibrun -np 1 ./conftest-arch-linux2-c-opt