From 5b86c3afb162daf594edcc4c6344bd18334703e4 Mon Sep 17 00:00:00 2001 From: "Roscoe A. Bartlett" Date: Fri, 10 Jul 2020 19:03:58 -0600 Subject: [PATCH 1/3] Allow Trilinos_PACKAGES to be set in input configure options file (CDOFA-92) --- .../drivers/atdm/TrilinosCTestDriverCore.atdm.cmake | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/cmake/ctest/drivers/atdm/TrilinosCTestDriverCore.atdm.cmake b/cmake/ctest/drivers/atdm/TrilinosCTestDriverCore.atdm.cmake index a6995cd600b0..b5f7b349a0f7 100644 --- a/cmake/ctest/drivers/atdm/TrilinosCTestDriverCore.atdm.cmake +++ b/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() From 9d25f38c042bde1031cccebed6f7f1e3b6d3dda2 Mon Sep 17 00:00:00 2001 From: "Roscoe A. Bartlett" Date: Fri, 10 Jul 2020 19:54:01 -0600 Subject: [PATCH 2/3] ATDM: Hopefuly final tweaks to 'ats2' 'xl' ctest -S builds (CDOFA-92) * Only enable the packages that SPARC uses for the XL builds (to avoid Panzer build errors) * Skip the 'cuda-aware-mpi' build for the XL builds since we don't actaully run any tests for those builds. * Consolidate logic for the XL builds into the ats2/local-driver.sh script and remove it from each of the individaul top-level XL driver scripts. --- ...243-xl-2020.03.18_spmpi-rolling_static_dbg.sh | 10 ---------- ...243-xl-2020.03.18_spmpi-rolling_static_opt.sh | 10 ---------- ...2020.03.18_spmpi-rolling_serial_static_dbg.sh | 10 ---------- ...2020.03.18_spmpi-rolling_serial_static_opt.sh | 10 ---------- cmake/ctest/drivers/atdm/ats2/local-driver.sh | 16 ++++++++++++++++ .../apps/sparc/SPARC_Trilinos_PACKAGES.cmake | 8 ++++++++ 6 files changed, 24 insertions(+), 40 deletions(-) create mode 100644 cmake/std/atdm/apps/sparc/SPARC_Trilinos_PACKAGES.cmake diff --git a/cmake/ctest/drivers/atdm/ats2/drivers/Trilinos-atdm-ats2-cuda-10.1.243-xl-2020.03.18_spmpi-rolling_static_dbg.sh b/cmake/ctest/drivers/atdm/ats2/drivers/Trilinos-atdm-ats2-cuda-10.1.243-xl-2020.03.18_spmpi-rolling_static_dbg.sh index b29a7be145bb..698453eba963 100755 --- a/cmake/ctest/drivers/atdm/ats2/drivers/Trilinos-atdm-ats2-cuda-10.1.243-xl-2020.03.18_spmpi-rolling_static_dbg.sh +++ b/cmake/ctest/drivers/atdm/ats2/drivers/Trilinos-atdm-ats2-cuda-10.1.243-xl-2020.03.18_spmpi-rolling_static_dbg.sh @@ -3,14 +3,4 @@ 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 -fi - $WORKSPACE/Trilinos/cmake/ctest/drivers/atdm/ats2/local-driver.sh diff --git a/cmake/ctest/drivers/atdm/ats2/drivers/Trilinos-atdm-ats2-cuda-10.1.243-xl-2020.03.18_spmpi-rolling_static_opt.sh b/cmake/ctest/drivers/atdm/ats2/drivers/Trilinos-atdm-ats2-cuda-10.1.243-xl-2020.03.18_spmpi-rolling_static_opt.sh index b29a7be145bb..698453eba963 100755 --- a/cmake/ctest/drivers/atdm/ats2/drivers/Trilinos-atdm-ats2-cuda-10.1.243-xl-2020.03.18_spmpi-rolling_static_opt.sh +++ b/cmake/ctest/drivers/atdm/ats2/drivers/Trilinos-atdm-ats2-cuda-10.1.243-xl-2020.03.18_spmpi-rolling_static_opt.sh @@ -3,14 +3,4 @@ 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 -fi - $WORKSPACE/Trilinos/cmake/ctest/drivers/atdm/ats2/local-driver.sh diff --git a/cmake/ctest/drivers/atdm/ats2/drivers/Trilinos-atdm-ats2-xl-2020.03.18_spmpi-rolling_serial_static_dbg.sh b/cmake/ctest/drivers/atdm/ats2/drivers/Trilinos-atdm-ats2-xl-2020.03.18_spmpi-rolling_serial_static_dbg.sh index b29a7be145bb..698453eba963 100755 --- a/cmake/ctest/drivers/atdm/ats2/drivers/Trilinos-atdm-ats2-xl-2020.03.18_spmpi-rolling_serial_static_dbg.sh +++ b/cmake/ctest/drivers/atdm/ats2/drivers/Trilinos-atdm-ats2-xl-2020.03.18_spmpi-rolling_serial_static_dbg.sh @@ -3,14 +3,4 @@ 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 -fi - $WORKSPACE/Trilinos/cmake/ctest/drivers/atdm/ats2/local-driver.sh diff --git a/cmake/ctest/drivers/atdm/ats2/drivers/Trilinos-atdm-ats2-xl-2020.03.18_spmpi-rolling_serial_static_opt.sh b/cmake/ctest/drivers/atdm/ats2/drivers/Trilinos-atdm-ats2-xl-2020.03.18_spmpi-rolling_serial_static_opt.sh index b29a7be145bb..698453eba963 100755 --- a/cmake/ctest/drivers/atdm/ats2/drivers/Trilinos-atdm-ats2-xl-2020.03.18_spmpi-rolling_serial_static_opt.sh +++ b/cmake/ctest/drivers/atdm/ats2/drivers/Trilinos-atdm-ats2-xl-2020.03.18_spmpi-rolling_serial_static_opt.sh @@ -3,14 +3,4 @@ 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 -fi - $WORKSPACE/Trilinos/cmake/ctest/drivers/atdm/ats2/local-driver.sh diff --git a/cmake/ctest/drivers/atdm/ats2/local-driver.sh b/cmake/ctest/drivers/atdm/ats2/local-driver.sh index 5b83276d884a..8a87fc9e5d12 100755 --- a/cmake/ctest/drivers/atdm/ats2/local-driver.sh +++ b/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 diff --git a/cmake/std/atdm/apps/sparc/SPARC_Trilinos_PACKAGES.cmake b/cmake/std/atdm/apps/sparc/SPARC_Trilinos_PACKAGES.cmake new file mode 100644 index 000000000000..1ce5e2d6635d --- /dev/null +++ b/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 +# _ENABLE_TESTS set to OFF for all fo the packages that we don't want +# to test. From 8acbcb84441857c263a989d088bd6340dd50cfbd Mon Sep 17 00:00:00 2001 From: "Roscoe A. Bartlett" Date: Fri, 10 Jul 2020 19:59:15 -0600 Subject: [PATCH 3/3] ATDM: ats2: Promote XL builds to 'ATDM' CDash group (CDOFA-92) With Panzer now disabled in these XL builds, they should 100% pass given the build results from today on CDash. --- ...ats2-cuda-10.1.243-xl-2020.03.18_spmpi-rolling_static_dbg.sh | 2 +- ...ats2-cuda-10.1.243-xl-2020.03.18_spmpi-rolling_static_opt.sh | 2 +- ...s-atdm-ats2-xl-2020.03.18_spmpi-rolling_serial_static_dbg.sh | 2 +- ...s-atdm-ats2-xl-2020.03.18_spmpi-rolling_serial_static_opt.sh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cmake/ctest/drivers/atdm/ats2/drivers/Trilinos-atdm-ats2-cuda-10.1.243-xl-2020.03.18_spmpi-rolling_static_dbg.sh b/cmake/ctest/drivers/atdm/ats2/drivers/Trilinos-atdm-ats2-cuda-10.1.243-xl-2020.03.18_spmpi-rolling_static_dbg.sh index 698453eba963..6b10a052a784 100755 --- a/cmake/ctest/drivers/atdm/ats2/drivers/Trilinos-atdm-ats2-cuda-10.1.243-xl-2020.03.18_spmpi-rolling_static_dbg.sh +++ b/cmake/ctest/drivers/atdm/ats2/drivers/Trilinos-atdm-ats2-cuda-10.1.243-xl-2020.03.18_spmpi-rolling_static_dbg.sh @@ -1,6 +1,6 @@ #!/bin/bash if [ "${Trilinos_TRACK}" == "" ] ; then - export Trilinos_TRACK=Experimental + export Trilinos_TRACK=ATDM fi $WORKSPACE/Trilinos/cmake/ctest/drivers/atdm/ats2/local-driver.sh diff --git a/cmake/ctest/drivers/atdm/ats2/drivers/Trilinos-atdm-ats2-cuda-10.1.243-xl-2020.03.18_spmpi-rolling_static_opt.sh b/cmake/ctest/drivers/atdm/ats2/drivers/Trilinos-atdm-ats2-cuda-10.1.243-xl-2020.03.18_spmpi-rolling_static_opt.sh index 698453eba963..6b10a052a784 100755 --- a/cmake/ctest/drivers/atdm/ats2/drivers/Trilinos-atdm-ats2-cuda-10.1.243-xl-2020.03.18_spmpi-rolling_static_opt.sh +++ b/cmake/ctest/drivers/atdm/ats2/drivers/Trilinos-atdm-ats2-cuda-10.1.243-xl-2020.03.18_spmpi-rolling_static_opt.sh @@ -1,6 +1,6 @@ #!/bin/bash if [ "${Trilinos_TRACK}" == "" ] ; then - export Trilinos_TRACK=Experimental + export Trilinos_TRACK=ATDM fi $WORKSPACE/Trilinos/cmake/ctest/drivers/atdm/ats2/local-driver.sh diff --git a/cmake/ctest/drivers/atdm/ats2/drivers/Trilinos-atdm-ats2-xl-2020.03.18_spmpi-rolling_serial_static_dbg.sh b/cmake/ctest/drivers/atdm/ats2/drivers/Trilinos-atdm-ats2-xl-2020.03.18_spmpi-rolling_serial_static_dbg.sh index 698453eba963..6b10a052a784 100755 --- a/cmake/ctest/drivers/atdm/ats2/drivers/Trilinos-atdm-ats2-xl-2020.03.18_spmpi-rolling_serial_static_dbg.sh +++ b/cmake/ctest/drivers/atdm/ats2/drivers/Trilinos-atdm-ats2-xl-2020.03.18_spmpi-rolling_serial_static_dbg.sh @@ -1,6 +1,6 @@ #!/bin/bash if [ "${Trilinos_TRACK}" == "" ] ; then - export Trilinos_TRACK=Experimental + export Trilinos_TRACK=ATDM fi $WORKSPACE/Trilinos/cmake/ctest/drivers/atdm/ats2/local-driver.sh diff --git a/cmake/ctest/drivers/atdm/ats2/drivers/Trilinos-atdm-ats2-xl-2020.03.18_spmpi-rolling_serial_static_opt.sh b/cmake/ctest/drivers/atdm/ats2/drivers/Trilinos-atdm-ats2-xl-2020.03.18_spmpi-rolling_serial_static_opt.sh index 698453eba963..6b10a052a784 100755 --- a/cmake/ctest/drivers/atdm/ats2/drivers/Trilinos-atdm-ats2-xl-2020.03.18_spmpi-rolling_serial_static_opt.sh +++ b/cmake/ctest/drivers/atdm/ats2/drivers/Trilinos-atdm-ats2-xl-2020.03.18_spmpi-rolling_serial_static_opt.sh @@ -1,6 +1,6 @@ #!/bin/bash if [ "${Trilinos_TRACK}" == "" ] ; then - export Trilinos_TRACK=Experimental + export Trilinos_TRACK=ATDM fi $WORKSPACE/Trilinos/cmake/ctest/drivers/atdm/ats2/local-driver.sh