Merge 'trilinos/Trilinos:develop' (7ed2016) into 'tcad-charon/Trilino…

…s:develop' (f96bb4d).

* trilinos-develop: (57 commits)
  Fixes calls to normalize zero vectors in ICGS/IMGS (trilinos#7454)
  ATDM: ats2: Elevate complex build to 'Specialized' for now (ATDV-300)
  Amesos2: Fix Epetra crash for SuperLU
  ATDM: ats2: Add cuda-complex build to support GEMMA (ATDV-300)
  Tacho - remove valgrind error
  ATDM: Kokkos now likes upper-case arch names (trilinos#7247)
  ATDM: Make KOKKOS_ARCH looping work with commas (trilinos#7247)
  ATDM: Add some comments for clues on how to use (trilinos#7247)
  Update KOKKOS_ARCH settings to Kokkos_ARCH_arch=ON
  Summary:
  MiniTensor: Sierra/SM tolerance changes.
  MueLu: skip test for SC=complex
  ATDM: ats1: Promote all to 'Specialized' (ATDV-355)
  MueLu: remove out-dated comment
  Amesos2: Fix sign compare warning for SuperLU
  ATDM: ats1: Remove ATDM_CONFIG_Kokkos_ENABLE_SERIAL=OFF (trilinos#7435)
  ATDM: Add unset ATDM_CONFIG_Kokkos_ENABLE_SERIAL and cleanup some unused (trilinos#7435)
  MueLu: fix issue trilinos#7411
  Add ortho option to Epetra Gmres ex for testing.
  Print return value for jsrun and some reformatting (trilinos#7211)
  ...

cmake/ctest/drivers/atdm/ats1/drivers/Trilinos-atdm-ats1-hsw_intel-18.0.5_mpich-7.7.6_openmp_static_dbg.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
 if [ "${Trilinos_TRACK}" == "" ] ; then
-  export Trilinos_TRACK=Experimental
+  export Trilinos_TRACK=Specialized
 fi
 $WORKSPACE/Trilinos/cmake/ctest/drivers/atdm/ats1/local-driver.sh

cmake/ctest/drivers/atdm/ats1/drivers/Trilinos-atdm-ats1-hsw_intel-18.0.5_mpich-7.7.6_openmp_static_opt.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 if [ "${Trilinos_TRACK}" == "" ] ; then
-  export Trilinos_TRACK=Experimental
+  export Trilinos_TRACK=Specialized
 fi
 export Trilinos_SKIP_CTEST_ADD_TEST=FALSE
 $WORKSPACE/Trilinos/cmake/ctest/drivers/atdm/ats1/local-driver.sh

cmake/ctest/drivers/atdm/ats1/drivers/Trilinos-atdm-ats1-hsw_intel-19.0.4_mpich-7.7.6_openmp_static_dbg.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
 if [ "${Trilinos_TRACK}" == "" ] ; then
-  export Trilinos_TRACK=Experimental
+  export Trilinos_TRACK=Specialized
 fi
 $WORKSPACE/Trilinos/cmake/ctest/drivers/atdm/ats1/local-driver.sh

cmake/ctest/drivers/atdm/ats1/drivers/Trilinos-atdm-ats1-hsw_intel-19.0.4_mpich-7.7.6_openmp_static_opt.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 if [ "${Trilinos_TRACK}" == "" ] ; then
-  export Trilinos_TRACK=Experimental
+  export Trilinos_TRACK=Specialized
 fi
 export Trilinos_SKIP_CTEST_ADD_TEST=FALSE
 $WORKSPACE/Trilinos/cmake/ctest/drivers/atdm/ats1/local-driver.sh

cmake/ctest/drivers/atdm/ats1/drivers/Trilinos-atdm-ats1-knl_intel-18.0.5_mpich-7.7.6_openmp_static_dbg.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
 if [ "${Trilinos_TRACK}" == "" ] ; then
-  export Trilinos_TRACK=Experimental
+  export Trilinos_TRACK=Specialized
 fi
 $WORKSPACE/Trilinos/cmake/ctest/drivers/atdm/ats1/local-driver.sh

cmake/ctest/drivers/atdm/ats1/drivers/Trilinos-atdm-ats1-knl_intel-18.0.5_mpich-7.7.6_openmp_static_opt.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 if [ "${Trilinos_TRACK}" == "" ] ; then
-  export Trilinos_TRACK=Experimental
+  export Trilinos_TRACK=Specialized
 fi
 export Trilinos_SKIP_CTEST_ADD_TEST=FALSE
 $WORKSPACE/Trilinos/cmake/ctest/drivers/atdm/ats1/local-driver.sh

cmake/ctest/drivers/atdm/ats1/drivers/Trilinos-atdm-ats1-knl_intel-19.0.4_mpich-7.7.6_openmp_static_dbg.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
 if [ "${Trilinos_TRACK}" == "" ] ; then
-  export Trilinos_TRACK=Experimental
+  export Trilinos_TRACK=Specialized
 fi
 $WORKSPACE/Trilinos/cmake/ctest/drivers/atdm/ats1/local-driver.sh

cmake/ctest/drivers/atdm/ats1/drivers/Trilinos-atdm-ats1-knl_intel-19.0.4_mpich-7.7.6_openmp_static_opt.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 if [ "${Trilinos_TRACK}" == "" ] ; then
-  export Trilinos_TRACK=Experimental
+  export Trilinos_TRACK=Specialized
 fi
 export Trilinos_SKIP_CTEST_ADD_TEST=FALSE
 $WORKSPACE/Trilinos/cmake/ctest/drivers/atdm/ats1/local-driver.sh

cmake/ctest/drivers/atdm/ats2/drivers/Trilinos-atdm-ats2-cuda-10.1.243-gnu-7.3.1-spmpi-rolling_complex_static_opt.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+if [ "${Trilinos_TRACK}" == "" ] ; then
+  export Trilinos_TRACK=Specialized
+fi
+$WORKSPACE/Trilinos/cmake/ctest/drivers/atdm/ats2/local-driver.sh

cmake/std/atdm/ATDMDevEnvSettings.cmake

@@ -293,7 +293,18 @@ ATDM_SET_CACHE(Kokkos_ENABLE_CXX11_DISPATCH_LAMBDA ON CACHE BOOL)
 ATDM_SET_CACHE(Kokkos_ENABLE_CUDA_LAMBDA "${ATDM_USE_CUDA}" CACHE BOOL)
 ATDM_SET_CACHE(Kokkos_ENABLE_DEBUG_BOUNDS_CHECK "${Trilinos_ENABLE_DEBUG}" CACHE BOOL)
 ATDM_SET_CACHE(Kokkos_ENABLE_DEBUG "${Trilinos_ENABLE_DEBUG}" CACHE BOOL)
-ATDM_SET_CACHE(KOKKOS_ARCH "$ENV{ATDM_CONFIG_KOKKOS_ARCH}" CACHE STRING)
+
+# Update Kokkos arch, expected ATDM_CONFIG_KOKKOS_ARCH=arch1,arch2,arch3.  Set
+# the modern Kokkos arch, e.g., KOKKOS_ARCH=arch1 => Kokkos_ARCH_arch1=ON
+set(kokkos_arch_list "$ENV{ATDM_CONFIG_KOKKOS_ARCH}")
+string(REPLACE "," ";" kokkos_arch_list "$ENV{ATDM_CONFIG_KOKKOS_ARCH}")
+foreach(kokkos_arch_loop_var ${kokkos_arch_list} )
+  string(TOUPPER "${kokkos_arch_loop_var}" kokkos_arch_loop_var)
+  ATDM_SET_ENABLE(Kokkos_ARCH_${kokkos_arch_loop_var} ON)
+endforeach(kokkos_arch_loop_var)
+unset(kokkos_arch_list)
+unset(kokkos_arch_loop_var)
+
 ATDM_SET_CACHE(EpetraExt_ENABLE_HDF5 OFF CACHE BOOL)
 ATDM_SET_CACHE(Panzer_FADTYPE "Sacado::Fad::DFad<RealType>" CACHE STRING)
 ATDM_SET_CACHE(Phalanx_KOKKOS_DEVICE_TYPE "${ATDM_NODE_TYPE}" CACHE STRING)

cmake/std/atdm/CMakeLists.txt

@@ -3,4 +3,5 @@ TRIBITS_ADD_TEST_DIRECTORIES(test)
 TRIBITS_ADD_TEST_DIRECTORIES(cee-rhel6)
 TRIBITS_ADD_TEST_DIRECTORIES(van1-tx2)
 TRIBITS_ADD_TEST_DIRECTORIES(ats1)
+TRIBITS_ADD_TEST_DIRECTORIES(ats2)
 TRIBITS_PACKAGE_POSTPROCESS()

cmake/std/atdm/README.md

@@ -1075,11 +1075,11 @@ $ bsub -x -Is -n 20 \
 
 ### ATS-2
 
-Once logged on a supported ATS-2 system like 'vortex' (SRN), one can either
-build and configure on a login node or a compute node.  But one must always
-run the tests from the launch node (allocated using 'bsub').  Make sure to
-setup SSH keys as described in `/opt/VORTEX_INTRO` before trying to do
-anything.
+Once logged on a supported ATS-2 system (called system 'ats2') like 'vortex'
+(SRN), one can either build and configure on a login node or a compute node.
+But one must always run the tests from the launch node (allocated using
+'bsub').  Make sure to setup SSH keys as described in `/opt/VORTEX_INTRO`
+before trying to do anything.
 
 For example, to configure, build and run the tests for the default
 `cuda-debug` build for `Tpetra` (after cloning Trilinos on the 'develop'

cmake/std/atdm/ats1/environment.sh

@@ -145,10 +145,6 @@ export F90=${MPIF90}
 # Anasazi settings
 export ATDM_CONFIG_Anasazi_ENABLE_RBGen=OFF
 
-# Kokkos settings
-# ENABLE_SERIAL used by ATDMDevEnvSettings
-export ATDM_CONFIG_Kokkos_ENABLE_SERIAL=OFF
-
 # Lapack (intel) settings
 export ATDM_CONFIG_LAPACK_LIBS="-L${CBLAS_ROOT}/mkl/lib/intel64;-L${CBLAS_ROOT}/compiler/lib/intel64;-mkl;-lmkl_intel_lp64;-lmkl_intel_thread;-lmkl_core;-liomp5"
 

cmake/std/atdm/ats2/CMakeLists.txt

@@ -0,0 +1,11 @@
+TRIBITS_ADD_ADVANCED_TEST( ats2_custom_builds_unit_tests
+  OVERALL_WORKING_DIRECTORY TEST_NAME
+  OVERALL_NUM_MPI_PROCS 1
+  TEST_0 CMND env
+    ARGS SHUNIT_COLOR=none ${CMAKE_CURRENT_SOURCE_DIR}/custom_builds_unit_tests.sh
+    PASS_REGULAR_EXPRESSION_ALL
+      "ERROR: A supported compiler was not selected for 'ats2' env - anything-cudas-after"
+      "Ran 1 test"
+      "[^]OK[$]"
+    ALWAYS_FAIL_ON_NONZERO_RETURN
+  )

cmake/std/atdm/ats2/all_supported_builds.sh

@@ -1,11 +1,12 @@
 
 export ATDM_CONFIG_CTEST_S_BUILD_NAME_PREFIX=Trilinos-atdm-
 
-#  ats2-xl-2019.08.20-spmpi-2019.06.24_openmp_static_opt
-#  ats2-xl-2019.08.20-spmpi-2019.06.24_openmp_static_dbg
+#  ats2-xl-2019.08.20-spmpi-rolling_openmp_static_opt
+#  ats2-xl-2019.08.20-spmpi-rolling_openmp_static_dbg
 export ATDM_CONFIG_ALL_SUPPORTED_BUILDS=(
-  ats2-gnu-7.3.1-spmpi-2019.06.24_serial_static_opt
-  ats2-gnu-7.3.1-spmpi-2019.06.24_serial_static_dbg
-  ats2-cuda-10.1.243-gnu-7.3.1-spmpi-2019.06.24_static_opt
-  ats2-cuda-10.1.243-gnu-7.3.1-spmpi-2019.06.24_static_dbg
+  ats2-gnu-7.3.1-spmpi-rolling_serial_static_opt
+  ats2-gnu-7.3.1-spmpi-rolling_serial_static_dbg
+  ats2-cuda-10.1.243-gnu-7.3.1-spmpi-rolling_static_opt
+  ats2-cuda-10.1.243-gnu-7.3.1-spmpi-rolling_static_dbg
+  ats2-cuda-10.1.243-gnu-7.3.1-spmpi-rolling_complex_static_opt
   )

cmake/std/atdm/ats2/custom_builds.sh

@@ -7,46 +7,58 @@
 
 # Custom compiler selection logic
 
-if   [[ $ATDM_CONFIG_BUILD_NAME == *"cuda-10.1.243-xl-2019.08.20-spmpi-2019.06.24"* ]] \
-  || [[ $ATDM_CONFIG_BUILD_NAME == *"cuda-10.1.243_xl-2019.08.20_spmpi-2019.06.24"* ]] \
-  || [[ $ATDM_CONFIG_BUILD_NAME == *"cuda-10.1.243-xl-2019.08.20"* ]] \
-  || [[ $ATDM_CONFIG_BUILD_NAME == *"cuda-10.1.243_xl-2019.08.20"* ]] \
-  || [[ $ATDM_CONFIG_BUILD_NAME == *"cuda-10.1.243-xl-2019"* ]] \
-  || [[ $ATDM_CONFIG_BUILD_NAME == *"cuda-10.1.243_xl-2019"* ]] \
-  || [[ $ATDM_CONFIG_BUILD_NAME == *"cuda-xl"* ]] \
+if atdm_match_any_buildname_keyword \
+  cuda-10.1.243-xl-2019.08.20-spmpi-rolling \
+  cuda-10.1.243_xl-2019.08.20_spmpi-rolling \
+  cuda-10.1.243-xl-2019.08.20 \
+  cuda-10.1.243_xl-2019.08.20 \
+  cuda-10.1.243-xl-2019 \
+  cuda-10.1.243_xl-2019 \
+  cuda-xl\
   ; then
-  export ATDM_CONFIG_COMPILER=CUDA-10.1.243_XL-2019.08.20_SPMPI-2019.06.24
+  echo
+  echo "ERROR: Currently not supporting cuda-10.1.243-xl-2019.08.20-spmpi-rolling"
+  echo
+  return
+  #export ATDM_CONFIG_COMPILER=CUDA-10.1.243_XL-2019.08.20_SPMPI-ROLLING
 
-elif [[ $ATDM_CONFIG_BUILD_NAME == *"xl-2019.08.20-spmpi-2019.06.24"* ]] \
-  || [[ $ATDM_CONFIG_BUILD_NAME == *"xl-2019.08.20_spmpi-2019.06.24"* ]] \
-  || [[ $ATDM_CONFIG_BUILD_NAME == *"xl-2019.08.20"* ]] \
-  || [[ $ATDM_CONFIG_BUILD_NAME == *"xl-2019"* ]] \
-  || [[ $ATDM_CONFIG_BUILD_NAME == *"xl"* ]] \
+elif atdm_match_any_buildname_keyword \
+  xl-2019.08.20-spmpi-rolling \
+  xl-2019.08.20_spmpi-rolling \
+  xl-2019.08.20 \
+  xl-2019 \
+  xl \
   ; then
-  export ATDM_CONFIG_COMPILER=XL-2019.08.20_SPMPI-2019.06.24
+  echo
+  echo "ERROR: Currently not supporting xl-2019.08.20-spmpi-rolling"
+  echo
+  return
+  #export ATDM_CONFIG_COMPILER=XL-2019.08.20_SPMPI-ROLLING
 
-elif [[ $ATDM_CONFIG_BUILD_NAME == *"cuda-10.1.243-gnu-7.3.1-spmpi-2019.06.24"* ]] \
-  || [[ $ATDM_CONFIG_BUILD_NAME == *"cuda-10.1.243_gnu-7.3.1_spmpi-2019.06.24"* ]] \
-  || [[ $ATDM_CONFIG_BUILD_NAME == *"cuda-10.1.243-gnu-7.3.1"* ]] \
-  || [[ $ATDM_CONFIG_BUILD_NAME == *"cuda-10.1.243_gnu-7.3.1"* ]] \
-  || [[ $ATDM_CONFIG_BUILD_NAME == *"cuda-10.1.243-gnu-7"* ]] \
-  || [[ $ATDM_CONFIG_BUILD_NAME == *"cuda-10.1.243_gnu-7"* ]] \
-  || [[ $ATDM_CONFIG_BUILD_NAME == *"cuda-10.1.243"* ]] \
-  || [[ $ATDM_CONFIG_BUILD_NAME == *"cuda-10"* ]] \
-  || [[ $ATDM_CONFIG_BUILD_NAME == *"cuda-gnu"* ]] \
-  || [[ $ATDM_CONFIG_BUILD_NAME == *"cuda"* ]] \
+elif atdm_match_any_buildname_keyword \
+  cuda-10.1.243-gnu-7.3.1-spmpi-rolling \
+  cuda-10.1.243_gnu-7.3.1_spmpi-rolling \
+  cuda-10.1.243-gnu-7.3.1 \
+  cuda-10.1.243_gnu-7.3.1 \
+  cuda-10.1.243-gnu-7 \
+  cuda-10.1.243_gnu-7 \
+  cuda-10.1.243 \
+  cuda-10 \
+  cuda-gnu \
+  cuda \
   ; then
-  export ATDM_CONFIG_COMPILER=CUDA-10.1.243_GNU-7.3.1_SPMPI-2019.06.24
+  export ATDM_CONFIG_COMPILER=CUDA-10.1.243_GNU-7.3.1_SPMPI-ROLLING
   # NOTE: Default 'cuda' must be last cuda listed!
 
-elif [[ $ATDM_CONFIG_BUILD_NAME == *"gnu-7.3.1-spmpi-2019.06.24"* ]] \
-  || [[ $ATDM_CONFIG_BUILD_NAME == *"gnu-7.3.1_spmpi-2019.06.24"* ]] \
-  || [[ $ATDM_CONFIG_BUILD_NAME == *"gnu-7.3.1"* ]] \
-  || [[ $ATDM_CONFIG_BUILD_NAME == *"gnu-7"* ]] \
-  || [[ $ATDM_CONFIG_BUILD_NAME == *"gnu"* ]] \
-  || [[ $ATDM_CONFIG_BUILD_NAME == *"default" ]] \
+elif atdm_match_any_buildname_keyword \
+  gnu-7.3.1-spmpi-rolling \
+  gnu-7.3.1_spmpi-rolling \
+  gnu-7.3.1 \
+  gnu-7 \
+  gnu \
+  default \
   ; then
-  export ATDM_CONFIG_COMPILER=GNU-7.3.1_SPMPI-2019.06.24
+  export ATDM_CONFIG_COMPILER=GNU-7.3.1_SPMPI-ROLLING
   # NOTE: Defaut 'gnu' must be last 'gnu' listed!
 
 else
@@ -56,10 +68,10 @@ else
   echo "***"
   echo "*** Supported compilers include:"
   echo "***"
-  echo "****  gnu-7.3.1_spmpi-2019.06.24                  (default, default gnu)"
-  echo "****  cuda-10.1.243_gnu-7.3.1_spmpi-2019.06.24    (default cuda)"
-  echo "****  xl-2019.08.20_spmpi-2019.06.24              (disabled)"
-  echo "****  cuda-10.1.243-gnu-7.3.1-spmpi-2019.06.24    (disabled)"
+  echo "****  gnu-7.3.1_spmpi-rolling                  (default, default gnu)"
+  echo "****  cuda-10.1.243_gnu-7.3.1_spmpi-rolling    (default cuda)"
+  echo "****  xl-2019.08.20_spmpi-rolling              (disabled)"
+  echo "****  cuda-10.1.243-gnu-7.3.1-spmpi-rolling    (disabled)"
   echo "***"
   return
 

cmake/std/atdm/ats2/custom_builds_unit_tests.sh

@@ -0,0 +1,86 @@
+#!/bin/bash
+
+CURRENT_SCRIPTS_DIR=`echo $BASH_SOURCE | sed "s/\(.*\)\/.*\.sh/\1/g"`
+ATDM_CONFIG_SCRIPT_DIR=`readlink -f ${CURRENT_SCRIPTS_DIR}/..`
+ATDM_CONFIG_SYSTEM_DIR=${ATDM_CONFIG_SCRIPT_DIR}/ats2
+
+#
+# Test compiler parsing
+#
+
+testAll() {
+
+  ATDM_CONFIG_BUILD_NAME=default
+  . ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh
+  ${_ASSERT_EQUALS_} GNU-7.3.1_SPMPI-ROLLING ${ATDM_CONFIG_COMPILER}
+
+  ATDM_CONFIG_BUILD_NAME=before_cuda-10.1.243-gnu-7.3.1-spmpi-rolling_after
+  . ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh
+  ${_ASSERT_EQUALS_} CUDA-10.1.243_GNU-7.3.1_SPMPI-ROLLING ${ATDM_CONFIG_COMPILER}
+
+  ATDM_CONFIG_BUILD_NAME=before_cuda-10.1.243_gnu-7.3.1_spmpi-rolling_after
+  . ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh
+  ${_ASSERT_EQUALS_} CUDA-10.1.243_GNU-7.3.1_SPMPI-ROLLING ${ATDM_CONFIG_COMPILER}
+
+  ATDM_CONFIG_BUILD_NAME=before_cuda-10.1.243-gnu-7.3.1_after
+  . ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh
+  ${_ASSERT_EQUALS_} CUDA-10.1.243_GNU-7.3.1_SPMPI-ROLLING ${ATDM_CONFIG_COMPILER}
+
+  ATDM_CONFIG_BUILD_NAME=before_cuda-10.1.243_gnu-7.3.1_after
+  . ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh
+  ${_ASSERT_EQUALS_} CUDA-10.1.243_GNU-7.3.1_SPMPI-ROLLING ${ATDM_CONFIG_COMPILER}
+
+  ATDM_CONFIG_BUILD_NAME=before_cuda-10.1.243-gnu-7_after
+  . ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh
+  ${_ASSERT_EQUALS_} CUDA-10.1.243_GNU-7.3.1_SPMPI-ROLLING ${ATDM_CONFIG_COMPILER}
+
+  ATDM_CONFIG_BUILD_NAME=before_cuda-10.1.243_gnu-7_after
+  . ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh
+  ${_ASSERT_EQUALS_} CUDA-10.1.243_GNU-7.3.1_SPMPI-ROLLING ${ATDM_CONFIG_COMPILER}
+
+  ATDM_CONFIG_BUILD_NAME=before_cuda-10.1.243_after
+  . ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh
+  ${_ASSERT_EQUALS_} CUDA-10.1.243_GNU-7.3.1_SPMPI-ROLLING ${ATDM_CONFIG_COMPILER}
+
+  ATDM_CONFIG_BUILD_NAME=before_cuda-10_after
+  . ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh
+  ${_ASSERT_EQUALS_} CUDA-10.1.243_GNU-7.3.1_SPMPI-ROLLING ${ATDM_CONFIG_COMPILER}
+
+  ATDM_CONFIG_BUILD_NAME=before_cuda_after
+  . ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh
+  ${_ASSERT_EQUALS_} CUDA-10.1.243_GNU-7.3.1_SPMPI-ROLLING ${ATDM_CONFIG_COMPILER}
+
+  ATDM_CONFIG_BUILD_NAME=before_gnu-7.3.1-spmpi-rolling_after
+  . ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh
+  ${_ASSERT_EQUALS_} GNU-7.3.1_SPMPI-ROLLING ${ATDM_CONFIG_COMPILER}
+
+  ATDM_CONFIG_BUILD_NAME=before_gnu-7.3.1_spmpi-rolling_after
+  . ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh
+  ${_ASSERT_EQUALS_} GNU-7.3.1_SPMPI-ROLLING ${ATDM_CONFIG_COMPILER}
+
+  ATDM_CONFIG_BUILD_NAME=before_gnu-7.3.1_after
+  . ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh
+  ${_ASSERT_EQUALS_} GNU-7.3.1_SPMPI-ROLLING ${ATDM_CONFIG_COMPILER}
+
+  ATDM_CONFIG_BUILD_NAME=before_gnu-7_after
+  . ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh
+  ${_ASSERT_EQUALS_} GNU-7.3.1_SPMPI-ROLLING ${ATDM_CONFIG_COMPILER}
+
+  ATDM_CONFIG_BUILD_NAME=before_gnu_after
+  . ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh
+  ${_ASSERT_EQUALS_} GNU-7.3.1_SPMPI-ROLLING ${ATDM_CONFIG_COMPILER}
+
+  # This should not match anything and should be an error!
+  ATDM_CONFIG_BUILD_NAME=anything-cudas-after
+  . ${ATDM_CONFIG_SCRIPT_DIR}/utils/set_build_options.sh
+  ${_ASSERT_EQUALS_} DEFAULT ${ATDM_CONFIG_COMPILER}
+
+}
+
+
+#
+# Run the unit tests
+#
+
+SHUNIT2_DIR=`readlink -f ${ATDM_CONFIG_SCRIPT_DIR}/../../../commonTools/test/shunit2`
+. ${SHUNIT2_DIR}/shunit2