Changeset 27187

Timestamp:

08/03/22 16:09:34 (3 years ago)

Author:

jdquinn

Message:

CHG: Workaround for machines that do not have Python 2

Location:

issm/trunk-jpl/externalpackages/dakota

Files:

• install-6.2-linux.sh (modified) (2 diffs)
• install-6.2-mac.sh (modified) (3 diffs)

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

@@ -12 +12 @@
 #
 export BLAS_LIBS="-L${BLAS_ROOT}/lib -lfblas -L/usr/lib/x86_64-linux-gnu -lgfortran" # Need to export BLAS_LIBS *and* pass it as an option to CMake to ensure that external packages also find it
-export CXXFLAGS='-std=c++98' # Setting CXXFLAGS to deal with C++11 incompatibility with MATLAB's Boost (absolutely necessary for this version)
-#export CXXFLAGS='-std=c++11'
 export DAK_BUILD=${ISSM_DIR}/externalpackages/dakota/build # DO NOT CHANGE THIS
 export DAK_INSTALL=${PREFIX} # DO NOT CHANGE THIS
@@ -54 +52 @@
         -DCMAKE_C_FLAGS="-Wno-error=implicit-function-declaration" \
         -DCMAKE_CXX_COMPILER=${MPI_HOME}/bin/mpicxx \
+        -DCMAKE_CXX_STANDARD="11" \
         -DCMAKE_Fortran_COMPILER=${MPI_HOME}/bin/mpif77 \
         -DBoost_NO_BOOST_CMAKE=TRUE \

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

@@ -7 +7 @@
 VER="6.2"
 
-PREFIX="${ISSM_DIR}/externalpackages/dakota/install" # Set to location where external package should be installed
+PREFIX="${ISSM_EXT_SHARED_DIR}/dakota/install" # Set to location where external package should be installed
 
 ## Environment
 #
-
-# Check for Python 2, required by Dakota
-#
-PYTHON_EXECUTABLE=$(which python2) || echo "Error: This version of Dakota requires Python 2"
 
 # Find libgfortran so that we do not have to hardcode it.
@@ -61 +57 @@
 cp configs/${VER}/mac/cmake/InstallDarwinDylibs.cmake ${DAK_SRC}/cmake
 
+# Disable requirement of Python 2 for TriBITS
+sed -i'' -e 's|SET(PythonInterp_FIND_VERSION|#SET(PythonInterp_FIND_VERSION|' ${DAK_SRC}/packages/teuchos/cmake/tribits/package_arch/TribitsFindPythonInterp.cmake
+
 # Configure
 cd ${DAK_BUILD}
@@ -69 +68 @@
         -DCMAKE_CXX_COMPILER=${MPI_HOME}/bin/mpicxx \
         -DCMAKE_CXX_FLAGS="-fdelayed-template-parsing" \
+        -DCMAKE_CXX_STANDARD="11" \
         -DCMAKE_Fortran_COMPILER=${MPI_HOME}/bin/mpif77 \
-        -DCMAKE_Fortran_FLAGS="-fallow-argument-mismatch" \
-        -DPYTHON_EXECUTABLE=${PYTHON_EXECUTABLE} \
         -DBoost_NO_BOOST_CMAKE=TRUE \
         -DHAVE_ACRO=OFF \