From 4818a00ae93a70821e08e14318472ece2fbfe2c4 Mon Sep 17 00:00:00 2001 From: "Roscoe A. Bartlett" Date: Fri, 28 Oct 2016 17:29:43 -0600 Subject: [PATCH] Adjust for OSX: GCC 5.3.0, Boost 1.58.0, no Scotch (#158, #482) The SEMS Env does not provide any GCC except for 5.3.0. Also, it does not provide Boolst 1.55.0, only 1.58.0 and 1.59.0. Also, it does not provide any build of Scotch at all. Therefore, I have change the default dev env to be GCC 5.3.0, Boost 1.58.0 and disabled the load of Scotch. --- cmake/load_ci_sems_dev_env.sh | 2 +- cmake/load_sems_dev_env.sh | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cmake/load_ci_sems_dev_env.sh b/cmake/load_ci_sems_dev_env.sh index a34d852f4f7b..e20c6cc3b4af 100644 --- a/cmake/load_ci_sems_dev_env.sh +++ b/cmake/load_ci_sems_dev_env.sh @@ -15,4 +15,4 @@ called=$_ _SCRIPT_DIR=`echo $BASH_SOURCE | sed "s/\(.*\)\/.*\.sh/\1/g"` #echo "_SCRIPT_DIR = '$_SCRIPT_DIR'" -source $_SCRIPT_DIR/load_sems_dev_env.sh sems-gcc/4.7.2 sems-openmpi/1.6.5 sems-cmake/3.5.2 +source $_SCRIPT_DIR/load_sems_dev_env.sh sems-gcc/5.3.0 sems-openmpi/1.6.5 sems-cmake/3.5.2 diff --git a/cmake/load_sems_dev_env.sh b/cmake/load_sems_dev_env.sh index 051c55b2a49a..bf9cf0ed3d72 100644 --- a/cmake/load_sems_dev_env.sh +++ b/cmake/load_sems_dev_env.sh @@ -75,13 +75,13 @@ # # Module defaults -sems_compiler_and_version_default=sems-gcc/4.8.4 +sems_compiler_and_version_default=sems-gcc/5.3.0 sems_mpi_and_version_default=sems-openmpi/1.8.7 sems_cmake_and_version_default=sems-cmake/3.5.2 # Other defaults sems_python_and_version_default=sems-python/2.7.9 -sems_boost_and_version_default=sems-boost/1.55.0/base +sems_boost_and_version_default=sems-boost/1.58.0/base # NOTE: If you change these versions, you also have to update the same list in # the unload_sems_dev_env.sh module as well! @@ -153,7 +153,7 @@ module load sems-zlib/1.2.8/base module load sems-hdf5/1.8.12/parallel module load sems-netcdf/4.3.2/parallel module load sems-parmetis/4.0.3/parallel -module load sems-scotch/6.0.3/parallel +#module load sems-scotch/6.0.3/parallel module load sems-superlu/4.3/base if [ "${TRILINOS_SEMS_DEV_ENV_VERBOSE}" == "1" ] ; then