Changeset 26775

Timestamp:

01/12/22 12:50:23 (3 years ago)

Author:

schlegel

Message:

CHG: update dakota build for toss3 modules

Location:

issm/trunk-jpl/externalpackages/dakota

Files:

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

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

@@ -1 @@
-67a68,75
+54,55c54,55
+< #set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} <flag>"
+< #     CACHE STRING "CXX Flags for my platform" )
+---
+> set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DMPICH_IGNORE_CXX_SEEK"
+>      CACHE STRING "CXX Flags for my platform" )
+67a68,69
 > set( DAKOTA_HAVE_MPI ON
 >  CACHE BOOL "Always build with MPI enabled" FORCE)
-> set( MPI_INCLUDE_PATH
->  "/nasa/hpe/mpt/2.17r13/include"
->  CACHE FILEPATH "Use installed MPI headers" FORCE)
-> set( MPI_LIBRARY
->  "/nasa/hpe/mpt/2.17r13/lib/libmpi.so"
->  CACHE FILEPATH "Use installed MPI library" FORCE)
 73,77c73,77
 < #set(BOOST_ROOT
@@ -16 +16 @@
 ---
 > set(BOOST_ROOT
->     "/nasa/pkgsrc/sles12/2018Q3/" 
+>     "$ISSM_DIR/externalpackages/boost/install"
 >     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")
-> 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")
+> set(BLAS_LIBS "-L/nasa/intel/Compiler/2018.3.222/compilers_and_libraries_2018.3.222/linux/mkl/lib/intel64/ -lmkl_intel_lp64 -lmkl_sequential -lmkl_core")
+> set(LAPACK_LIBS "-L/nasa/intel/Compiler/2018.3.222/compilers_and_libraries_2018.3.222/linux/mkl/lib/intel64/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 BOOST_ROOT=$ISSM_DIR/externalpackages/boost/install
+
+export CXXFLAGS='-std=c++11' # Setting CXXFLAGS to deal with C++11 incompatibility with MATLAB's Boost (absolutely necessary for this version)
+
 cp $DAK_SRC/cmake/BuildDakotaTemplate.cmake $DAK_SRC/cmake/BuildDakotaCustom.cmake
 patch $DAK_SRC/cmake/BuildDakotaCustom.cmake configs/6.2/BuildDakotaCustom.cmake.pfe.patch
@@ -36 +40 @@
 
 cmake \
+        -DBOOST_ROOT:PATHNAME=$BOOST_ROOT \
+        -DBoost_LIBRARY_DIRS:FILEPATH=${BOOST_ROOT}/lib \
+        -DBoost_INCLUDE_DIR:FILEPATH=${BOOST_ROOT}/include \
+        -DBoost_NO_BOOST_CMAKE=TRUE \
+        -DBoost_NO_SYSTEM_PATHS=TRUE \
         -DBUILD_SHARED_LIBS=ON \
         -DBUILD_STATIC_LIBS=OFF \
         -DCMAKE_C_COMPILER=mpicc \
+        -DCMAKE_C_FLAGS="-Wno-error=implicit-function-declaration" \
         -DCMAKE_CXX_COMPILER=mpicxx \
-        -DCMAKE_Fortran_COMPILER=mpif77 \
-        -DBoost_NO_BOOST_CMAKE=TRUE \
+        -DCMAKE_CXX_FLAGS="-lstdc++" \
+        -DCMAKE_Fortran_COMPILER=/usr/bin/gfortran \
         -DHAVE_ACRO=OFF \
         -DHAVE_JEGA=OFF \