Switch to older version of boost, let griddyn autobuild sundials/suit…

…esparse
LLNL · Apr 8, 2018 · 9c00537 · 9c00537
1 parent 5fa568e
commit 9c00537
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 41 deletions.
diff --git a/scripts/install-ci-dependencies.sh b/scripts/install-ci-dependencies.sh
@@ -24,27 +24,20 @@ fi
 
 boost_version=$CI_BOOST_VERSION
 if [[ -z "$CI_BOOST_VERSION" ]]; then
-    boost_version=1.66.0
+    boost_version=1.63.0
 fi
 boost_install_path=${CI_DEPENDENCY_DIR}/boost
 
-cmake_version=3.11.0
+cmake_version=3.5.2
 cmake_install_path=${CI_DEPENDENCY_DIR}/cmake
 
-sundials_version=3.1.0
-sundials_install_path=${CI_DEPENDENCY_DIR}/sundials
-
 # Wipe out cached dependencies if commit message has '[update_cache]'
 if [[ $commit_msg == *'[update_cache]'* ]]; then
     individual="false"
     if [[ $commit_msg == *'boost'* ]]; then
         rm -rf ${boost_install_path};
         individual="true"
     fi
-    if [[ $commit_msg == *'sundials'* ]]; then
-        rm -rf ${sundials_install_path};
-        individual="true"
-    fi
 
     # If no dependency named in commit message, update entire cache
     if [[ "$individual" != 'true' ]]; then
@@ -77,12 +70,6 @@ if [[ ! -d "${boost_install_path}" ]]; then
     echo "*** built boost successfully"
 fi
 
-# Install Sundials
-if [[ ! -d "${sundials_install_path}" ]]; then
-    #scripts/install-dependency.sh sundials ${sundials_version} ${sundials_install_path}
-    echo "*** built sundials successfully"
-fi
-
 if [[ "$os_name" == "Linux" ]]; then
     export LD_LIBRARY_PATH=${zmq_install_path}/lib:${boost_install_path}/lib:$LD_LIBRARY_PATH
 elif [[ "$os_name" == "Darwin" ]]; then

diff --git a/scripts/install-dependency.sh b/scripts/install-dependency.sh
@@ -19,29 +19,6 @@ check_minimum_version () {
     fi
 }
 
-install_sundials () {
-    local sundials_version=$1
-    local sundials_version_str=sundials-${sundials_version}
-    local install_path=$2
-    if [[ $KLU_INLUDE_DIR ]]; then
-        if [[ $KLU_LIBRARY_DIR ]]; then
-            local klu_options="-DKLU_ENABLE=ON -DKLU_INCLUDE_DIR=${KLU_INCLUDE_DIR} -DKLU_LIBRARY_DIR=${KLU_LIBRARY_DIR}"
-        fi
-    fi
-    if [[ $SUITESPARSECONFIG_LIBRARY ]]; then
-        local suitesparse_option="-DSUITESPARSECONFIG_LIBRARY=${SUITESPARSECONFIG_LIBRARY}"
-    fi
-    wget --no-check-certificate -O ${sundials_version_str}.tar.gz https://computation.llnl.gov/projects/sundials/download/${sundials_version_str}.tar.gz;
-    tar xzf ${sundials_version_str}.tar.gz;
-    (
-        cd ${sundials_version_str}/;
-        mkdir -p build && cd build;
-        cmake .. ${klu_options} ${suitesparse_option} -DOPENMP_ENABLE=ON -DBUILD_CVODES=OFF -DBUILD_IDAS=OFF -DBUILD_SHARED_LIBS=OFF -DEXAMPLES_INSTALL=OFF -DEXAMPLES_ENABLE_C=OFF -DEXAMPLES_ENABLE_F77=OFF -DEXAMPLES_ENABLED=OFF -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${install_path}"
-        make;
-        make install;
-    )
-}
-
 install_swig () {
     #Download and install SWIG
     local swig_version=$1
@@ -241,9 +218,6 @@ case "$1" in
     openmpi)
         install_openmpi ${install_version} ${install_path}
         ;;
-    sundials)
-        install_sundials ${install_version} ${install_path}
-        ;;
     swig)
         install_swig ${install_version} ${install_path}
         ;;