Changeset 24665

Timestamp:

03/13/20 19:35:38 (5 years ago)

Author:

jdquinn

Message:

CHG: Shifting to Boost 1.72 for all Mac builds; modifying excluded tests for Dakota

Location:

issm/trunk-jpl

Files:

• externalpackages/boost/install-1.72-mac-static.sh (copied) (copied from issm/trunk-jpl/externalpackages/boost/install-1.72-mac.sh ) (1 diff)
• externalpackages/dakota/install-6.2-mac-static.sh (modified) (3 diffs)
• jenkins/pine_island-mac (modified) (1 diff)
• jenkins/pine_island-mac-binaries (modified) (1 diff)
• jenkins/pine_island-mac-binaries-with_dakota (modified) (2 diffs)
• jenkins/pine_island-mac-dakota (modified) (1 diff)

issm/trunk-jpl/externalpackages/boost/install-1.72-mac-static.sh

@@ -35 +35 @@
 
 # Compile and install
-./b2 toolset=darwin install
+./b2 toolset=darwin link=static install
 
 # Copy binary to install directory
 mkdir ${BOOST_ROOT}/install/bin
 cp bjam ${BOOST_ROOT}/install/bin
-
-# Set install_name for all shared libraries
-cd ${BOOST_ROOT}/install/lib
-for name in *.dylib; do
-        install_name_tool -id ${BOOST_ROOT}/install/lib/${name} ${name}
-done

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

@@ -12 +12 @@
 export BLAS_LIBS="-L${ISSM_DIR}/externalpackages/petsc/install/lib -lfblas -L/usr/local/gfortran/lib -lgfortran" # Need to export BLAS_LIBS *and* pass it as an option to CMake to ensure that external packages also find it
 export BOOST_ROOT=${ISSM_DIR}/externalpackages/boost/install
-export CXXFLAGS='-std=c++98' # Setting CXXFLAGS to deal with C++11 incompatibility with Matlab's Boost (absolutely necessary for this version)
 export DAK_BUILD=${DAK_ROOT}/build
 export DAK_INSTALL=${DAK_ROOT}/install
@@ -22 +21 @@
 mkdir build install src
 
-#Download from ISSM server
+# Download source
 ${ISSM_DIR}/scripts/DownloadExternalPackage.sh "https://issm.ess.uci.edu/files/externalpackages/dakota-${VER}-public.src.tar.gz" "dakota-${VER}-public-src.tar.gz"
 
@@ -55 +54 @@
         -DCMAKE_CXX_FLAGS="-fPIC -fdelayed-template-parsing" \
         -DCMAKE_Fortran_FLAGS="-fPIC" \
+        -DBoost_NO_BOOST_CMAKE=TRUE \
         -DHAVE_ACRO=OFF \
         -DHAVE_JEGA=OFF \

issm/trunk-jpl/jenkins/pine_island-mac

@@ -4 +4 @@
 
 # MATLAB path
-MATLAB_PATH="/Applications/MATLAB_R2015b.app"
+MATLAB_PATH="/Applications/MATLAB_R2018a.app"
 
 # ISSM CONFIGURATION

issm/trunk-jpl/jenkins/pine_island-mac-binaries

@@ -4 +4 @@
 
 # MATLAB path
-MATLAB_PATH="/Applications/MATLAB_R2015b.app"
+MATLAB_PATH="/Applications/MATLAB_R2018a.app"
 
 # NOTE:

issm/trunk-jpl/jenkins/pine_island-mac-binaries-with_dakota

@@ -4 +4 @@
 
 # MATLAB path
-MATLAB_PATH="/Applications/MATLAB_R2015b.app"
+MATLAB_PATH="/Applications/MATLAB_R2018a.app"
 
 # NOTE:
@@ -52 +52 @@
         cmake           install.sh
         petsc           install-3.12-mac-static.sh
-        boost           install-1.55-mac-static.sh
+        boost           install-1.72-mac-static.sh
         dakota          install-6.2-mac-static.sh
         triangle        install-mac-static.sh

issm/trunk-jpl/jenkins/pine_island-mac-dakota

@@ -78 +78 @@
 # - Error is large for test420.
 #
-MATLAB_NROPTIONS="'exclude',[243,418,420,435,701,702],'id',[IdFromString('Dakota')]"
-PYTHON_NROPTIONS="--exclude 243 418 420 435 701 702 --include_name 'Dakota'"
+MATLAB_NROPTIONS="'exclude',[234,235,243,418,420,435,444,445,701,702],'id',[IdFromString('Dakota')]"
+PYTHON_NROPTIONS="--exclude 234 235 243 418 420 435 444 445 701 702 --include_name 'Dakota'"