Changeset 23790

Timestamp:

03/11/19 18:08:07 (6 years ago)

Author:

schlegel

Message:

CHG: make stallo dakota with petsc and GNU

Location:

issm/trunk-jpl/externalpackages

Files:

• boost/install-1.55-stallo.sh (modified) (1 diff)
• dakota/configs/6.2/BuildDakotaCustom.cmake.stallo.patch (modified) (1 diff)
• dakota/configs/6.2/CMakeLists.txt.stallo.patch (modified) (1 diff)
• dakota/install-6.2-stallo.sh (modified) (2 diffs)
• petsc/install-3.6-stallo.sh (added)

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

@@ -25 +25 @@
 
 #Setting CXXFLAGS to deal with C++11 incompatibility with Matlab's Boost
-export PATH="/usr/bin":$PATH
+#export PATH="/usr/bin":$PATH
 export CXXFLAGS='-std=c++98'
 export CC=mpicc

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

@@ -13 +13 @@
 >  CACHE BOOL "Always build with MPI enabled" FORCE)
 > set( MPI_INCLUDE_PATH
->  "/global/hds/software/cpu/eb3/impi/2017.1.132-iccifort-2017.1.132-GCC-6.3.0-2.27/include64/"
+>  "/global/hds/software/cpu/eb3/impi/5.0.3.048-iccifort-2015.3.187-GNU-4.9.3-2.25/include64/"
 >  CACHE FILEPATH "Use installed MPI headers" FORCE)
 > set( MPI_LIBRARY
->  "/global/hds/software/cpu/eb3/impi/2017.1.132-iccifort-2017.1.132-GCC-6.3.0-2.27/lib64/libmpich.so"
+>  "/global/hds/software/cpu/eb3/impi/5.0.3.048-iccifort-2015.3.187-GNU-4.9.3-2.25/lib64/libmpi.so"
 >  CACHE FILEPATH "Use installed MPI library" FORCE)
 > set( MPI_EXTRA_LIBRARY
->  "/global/hds/software/cpu/eb3/impi/2017.1.132-iccifort-2017.1.132-GCC-6.3.0-2.27/lib64/libmpich.so"
+>  "/global/hds/software/cpu/eb3/impi/5.0.3.048-iccifort-2015.3.187-GNU-4.9.3-2.25/lib64/libmpi.so"
 > CACHE FILEPATH "Use MPI extra libraries" FORCE)
 73,77c84,88

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

@@ -6 +6 @@
 > 
 237a240,241
-> set(BLAS_LIBS "-Wl,--no-as-needed -L/global/hds/software/cpu/eb3/imkl/2017.1.132-iimpi-2017a/mkl/lib/intel64 -lmkl_intel_lp64 -lmkl_sequential -lmkl_core -L/lib64/libc.so.6 -L/lib64/ -lpthread -lm -ldl")
-> set(LAPACK_LIBS "-Wl,--no-as-needed -L/global/hds/software/cpu/eb3/imkl/2017.1.132-iimpi-2017a/mkl/lib/intel64 -lmkl_intel_lp64 -lmkl_sequential -lmkl_core -L/lib64/libc.so.6 -L/lib64/ -lpthread -lm -ldl")
+> set(BLAS_LIBS "-Wl,--no-as-needed -L/global/hds/software/cpu/eb3/imkl/11.2.3.187-iimpi-7.3.5-GNU-4.9.3-2.25/mkl/lib/intel64/ -lmkl_intel_lp64 -lmkl_sequential -lmkl_core -L/lib64/libc.so.6 -L/lib64/ -lpthread -lm -ldl")
+> set(LAPACK_LIBS "-Wl,--no-as-needed -L/global/hds/software/cpu/eb3/imkl/11.2.3.187-iimpi-7.3.5-GNU-4.9.3-2.25/mkl/lib/intel64/ -lmkl_intel_lp64 -lmkl_sequential -lmkl_core -L/lib64/libc.so.6 -L/lib64/ -lpthread -lm -ldl")

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

@@ -20 +20 @@
 
 #Set up Dakota cmake variables and config
-export PATH="/usr/bin":$PATH
+#export PATH="/usr/bin":$PATH
 export DAK_SRC=$ISSM_DIR/externalpackages/dakota/src
 export DAK_BUILD=$ISSM_DIR/externalpackages/dakota/build
-export MPIHOME=/global/hds/software/cpu/eb3/impi/2017.1.132-iccifort-2017.1.132-GCC-6.3.0-2.27/
+export MPIHOME=/global/hds/software/cpu/eb3/impi/5.0.3.048-iccifort-2015.3.187-GNU-4.9.3-2.25/
 
 cp $DAK_SRC/cmake/BuildDakotaTemplate.cmake $DAK_SRC/cmake/BuildDakotaCustom.cmake
@@ -41 +41 @@
 cd $DAK_BUILD
 
-cmake -D CMAKE_C_COMPILER=/global/hds/software/cpu/eb3/impi/2017.1.132-iccifort-2017.1.132-GCC-6.3.0-2.27/intel64/bin/mpicc \
-           -D CMAKE_CXX_COMPILER=/global/hds/software/cpu/eb3/impi/2017.1.132-iccifort-2017.1.132-GCC-6.3.0-2.27/intel64/bin/mpicxx \
+cmake -D CMAKE_C_COMPILER=/global/hds/software/cpu/eb3/impi/5.0.3.048-iccifort-2015.3.187-GNU-4.9.3-2.25/bin64/mpicc \
+           -D CMAKE_CXX_COMPILER=/global/hds/software/cpu/eb3/impi/5.0.3.048-iccifort-2015.3.187-GNU-4.9.3-2.25/bin64/mpicxx \
            -D CMAKE_Fortran_COMPILER=gfortran \
                 -DHAVE_ACRO=off \