Merge pull request #5 from bartlettroscoe/cdofa-92-atdm-ats2-xl-2

Hopefuly final tweaks to 'ats2' 'xl' ctest -S builds (CDOFA-92)

cmake/ctest/drivers/atdm/TrilinosCTestDriverCore.atdm.cmake

@@ -83,6 +83,7 @@ MACRO(TRILINOS_SYSTEM_SPECIFIC_CTEST_DRIVER)
   PRINT_VAR(ATDM_CONFIGURE_OPTIONS_FILES)
 
   MESSAGE("Include the configure options files at the top level to influence what package get enabled or disabled ...")
+  SPLIT("${ATDM_CONFIGURE_OPTIONS_FILES}" "," ATDM_CONFIGURE_OPTIONS_FILES)
   FOREACH (CONFIG_OPTIONS_FILE ${ATDM_CONFIGURE_OPTIONS_FILES})
     SET(CONFIG_OPTIONS_FILE "${TRIBITS_PROJECT_ROOT}/${CONFIG_OPTIONS_FILE}")
     MESSAGE("Including ${CONFIG_OPTIONS_FILE} ...")
@@ -93,15 +94,17 @@ MACRO(TRILINOS_SYSTEM_SPECIFIC_CTEST_DRIVER)
   STRING(REGEX MATCH "panzer" ATDM_PANZER_IN_JOB_NAME
     "${CTEST_BUILD_NAME}" )
 
-  IF (ATDM_ENABLE_ALL_PACKAGES)
+  IF (NOT "${Trilinos_PACKAGES}" STREQUAL "")
+    MESSAGE("Trilinos_PACKAGES is aleady set so use it!")
+  ELSEIF (ATDM_ENABLE_ALL_PACKAGES)
     MESSAGE("Enabling all packages by default!")
-    SET(Trilinos_PACKAGES)
+    SET(Trilinos_PACKAGES "")
   ELSEIF (ATDM_PANZER_IN_JOB_NAME)
     MESSAGE("Found 'panzer' in JOB_NAME, enabling only Panzer tests")
     SET(Trilinos_PACKAGES Panzer)
   ELSE()
     MESSAGE("Enabling all packages not otherwise disabled!")
-    SET(Trilinos_PACKAGES)
+    SET(Trilinos_PACKAGES "")
     # Implicitly allow the enable of all packages that are not otherwise
     # disabled by the (indirect) include of ATDMDisables.cmake.
   ENDIF()

cmake/ctest/drivers/atdm/ats2/drivers/Trilinos-atdm-ats2-cuda-10.1.243-xl-2020.03.18_spmpi-rolling_static_dbg.sh

@@ -1,16 +1,6 @@
 #!/bin/bash
 if [ "${Trilinos_TRACK}" == "" ] ; then
-  export Trilinos_TRACK=Experimental
-fi
-
-if [[ "${Trilinos_INNER_ENABLE_TESTS}" == "" ]]; then
-  # For XL, do not build tests and examples
-  export Trilinos_INNER_ENABLE_TESTS=OFF
-fi
-
-if [[ "${Trilinos_SKIP_CTEST_ADD_TEST}" == "" ]] ; then
-  # For XL, do not run tests
-  export Trilinos_SKIP_CTEST_ADD_TEST=TRUE
+  export Trilinos_TRACK=ATDM
 fi
 
 $WORKSPACE/Trilinos/cmake/ctest/drivers/atdm/ats2/local-driver.sh

cmake/ctest/drivers/atdm/ats2/drivers/Trilinos-atdm-ats2-cuda-10.1.243-xl-2020.03.18_spmpi-rolling_static_opt.sh

@@ -1,16 +1,6 @@
 #!/bin/bash
 if [ "${Trilinos_TRACK}" == "" ] ; then
-  export Trilinos_TRACK=Experimental
-fi
-
-if [[ "${Trilinos_INNER_ENABLE_TESTS}" == "" ]]; then
-  # For XL, do not build tests and examples
-  export Trilinos_INNER_ENABLE_TESTS=OFF
-fi
-
-if [[ "${Trilinos_SKIP_CTEST_ADD_TEST}" == "" ]] ; then
-  # For XL, do not run tests
-  export Trilinos_SKIP_CTEST_ADD_TEST=TRUE
+  export Trilinos_TRACK=ATDM
 fi
 
 $WORKSPACE/Trilinos/cmake/ctest/drivers/atdm/ats2/local-driver.sh

cmake/ctest/drivers/atdm/ats2/drivers/Trilinos-atdm-ats2-xl-2020.03.18_spmpi-rolling_serial_static_dbg.sh

@@ -1,16 +1,6 @@
 #!/bin/bash
 if [ "${Trilinos_TRACK}" == "" ] ; then
-  export Trilinos_TRACK=Experimental
-fi
-
-if [[ "${Trilinos_INNER_ENABLE_TESTS}" == "" ]]; then
-  # For XL, do not build tests and examples
-  export Trilinos_INNER_ENABLE_TESTS=OFF
-fi
-
-if [[ "${Trilinos_SKIP_CTEST_ADD_TEST}" == "" ]] ; then
-  # For XL, do not run tests
-  export Trilinos_SKIP_CTEST_ADD_TEST=TRUE
+  export Trilinos_TRACK=ATDM
 fi
 
 $WORKSPACE/Trilinos/cmake/ctest/drivers/atdm/ats2/local-driver.sh

cmake/ctest/drivers/atdm/ats2/drivers/Trilinos-atdm-ats2-xl-2020.03.18_spmpi-rolling_serial_static_opt.sh

@@ -1,16 +1,6 @@
 #!/bin/bash
 if [ "${Trilinos_TRACK}" == "" ] ; then
-  export Trilinos_TRACK=Experimental
-fi
-
-if [[ "${Trilinos_INNER_ENABLE_TESTS}" == "" ]]; then
-  # For XL, do not build tests and examples
-  export Trilinos_INNER_ENABLE_TESTS=OFF
-fi
-
-if [[ "${Trilinos_SKIP_CTEST_ADD_TEST}" == "" ]] ; then
-  # For XL, do not run tests
-  export Trilinos_SKIP_CTEST_ADD_TEST=TRUE
+  export Trilinos_TRACK=ATDM
 fi
 
 $WORKSPACE/Trilinos/cmake/ctest/drivers/atdm/ats2/local-driver.sh

cmake/ctest/drivers/atdm/ats2/local-driver.sh

@@ -5,6 +5,22 @@ set +x
 # Need to load env so we define some vars
 source $WORKSPACE/Trilinos/cmake/std/atdm/load-env.sh $JOB_NAME
 
+# Make adjustments for the XL builds
+if atdm_match_buildname_keyword xl ; then
+  echo "This is an XL build!"
+  # For XL, do not build tests and examples by default.
+  if [[ "${Trilinos_INNER_ENABLE_TESTS}" == "" ]]; then
+    export Trilinos_INNER_ENABLE_TESTS=OFF
+  fi
+  # Don't do the cuda-aware build for the XL builds if you are not building
+  # internal tests and examples.
+  if [[ "${Trilinos_INNER_ENABLE_TESTS}" == "OFF" ]]; then
+    export Trilinos_CTEST_RUN_CUDA_AWARE_MPI=0
+  fi
+  # Only enable the SPARC packages by default
+  export ATDM_CONFIG_CONFIGURE_OPTIONS_FILES=cmake/std/atdm/ATDMDevEnv.cmake,cmake/std/atdm/apps/sparc/SPARC_Trilinos_PACKAGES.cmake
+fi
+
 echo
 echo "Current node type: $(atdm_ats2_get_node_type)"
 echo

cmake/std/atdm/apps/sparc/SPARC_Trilinos_PACKAGES.cmake

@@ -0,0 +1,8 @@
+# Include this file in the driver that calls TRIBITS_CTEST_DRIVER() to set the
+# list of packages used by SPARC.
+INCLUDE("${CMAKE_CURRENT_LIST_DIR}/SPARCTrilinosPackagesList.cmake")
+SET(Trilinos_PACKAGES ${SPARC_Trilinos_Packages})
+# NOTE: Above, even though SPARC_Trilinos_Packages may list a bunch of
+# packages that we don't want to test, the file ATDMDisables.cmake has
+# <Package>_ENABLE_TESTS set to OFF for all fo the packages that we don't want
+# to test.