Merge 'develop' into fixbuild-stats2 (trilinos#7376)

This merges in the state of Trilinos 'develop' from 'atdm-nightly' from testing day 2021-06-10.
jjellio · Jun 11, 2021 · 27a2018 · 27a2018
2 parents 654bbe2 + a9cd4f1
commit 27a2018
Show file tree

Hide file tree

Showing 1,862 changed files with 93,330 additions and 39,937 deletions.
diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
@@ -35,17 +35,22 @@ jobs:
         # We specifically DO NOT exempt PR's from autoclosing.
         #exempt-pr-labels: ''
         remove-stale-when-updated: true
-        operations-per-run: 55
+        operations-per-run: 70
         stale-issue-message: >
           This issue has had no activity for **365** days and is marked for
           closure. It will be closed after an additional **30** days of inactivity.
 
-          If you would like to keep this issue open please add a comment and remove
+          If you would like to keep this issue open please add a comment and/or remove
           the `MARKED_FOR_CLOSURE` label.
 
           If this issue should be kept open even with no activity beyond the time
           limits you can add the label `DO_NOT_AUTOCLOSE`.
 
+          If it is ok for this issue to be closed, feel free to go ahead and close it.
+          Please **do not** add any comments or change any labels or otherwise touch
+          this issue unless your intention is to reset the inactivity counter for an
+          additional year.
+
         close-issue-message: >
           This issue was closed due to inactivity for **395** days.
 
@@ -57,9 +62,14 @@ jobs:
           considered to be abandoned and will be automatically closed after **30**
           additional days of inactivity from when it was marked inactive.
 
-          If this should be kept open, please post a comment and remove the
+          If this should be kept open, please post a comment and/or remove the
           label `MARKED_FOR_CLOSURE` to reset the inactivity timer.
 
+          If it is ok for this pull request to be closed, feel free to go ahead and close it.
+          Please **do not** add any comments or change any labels or otherwise touch
+          this issue unless your intention is to reset the inactivity counter for an
+          additional year.
+
         close-pr-message: >
           This Pull Request has been automatically closed due to **395** days of inactivity.
 

diff --git a/cmake/ctest/drivers/ascicgpu031/CMakeLists.txt b/cmake/ctest/drivers/ascicgpu031/CMakeLists.txt
@@ -1,48 +1,23 @@
 TRILINOS_DRIVER_SETUP()
 
 TRILINOS_DRIVER_ADD_DASHBOARD(
-  RELEASE_CUDA_NOUVM_NODEPRECATED_DUALVIEW
-  ctest_linux_nightly_mpi_release_nouvm_ascicgpu031.cmake
-  CTEST_INSTALLER_TYPE release
-  RUN_SERIAL
-  TIMEOUT_MINUTES 420
-  )
-
-
-TRILINOS_DRIVER_ADD_DASHBOARD(
-  RELEASE_CUDA_UVM_NODEPRECATED_DUALVIEW
-  ctest_linux_nightly_mpi_release_uvm_nodeprecated_ascicgpu031.cmake
-  CTEST_INSTALLER_TYPE release
-  RUN_SERIAL
-  TIMEOUT_MINUTES 420
-  )
-
-TRILINOS_DRIVER_ADD_DASHBOARD(
-  RELEASE_CUDA_UVM_DEPRECATED_DUALVIEW
-  ctest_linux_nightly_mpi_release_uvm_deprecated_ascicgpu031.cmake
-  CTEST_INSTALLER_TYPE release
-  RUN_SERIAL
-  TIMEOUT_MINUTES 420
-  )
-
-TRILINOS_DRIVER_ADD_DASHBOARD(
-  DEBUG_CUDA_NOUVM_NODEPRECATED_CRS
+  DEBUG_CUDA_NOUVM_NODEPRECATED_DEV
   ctest_linux_nightly_mpi_debug_nouvm_ascicgpu031_crs.cmake
   CTEST_INSTALLER_TYPE debug
   RUN_SERIAL
   TIMEOUT_MINUTES 420
   )
 
 TRILINOS_DRIVER_ADD_DASHBOARD(
-  DEBUG_CUDA_UVM_NODEPRECATED_CRS
+  DEBUG_CUDA_UVM_NODEPRECATED_DEV
   ctest_linux_nightly_mpi_debug_uvm_nodeprecated_ascicgpu031_crs.cmake
   CTEST_INSTALLER_TYPE debug
   RUN_SERIAL
   TIMEOUT_MINUTES 420
   )
 
 TRILINOS_DRIVER_ADD_DASHBOARD(
-  DEBUG_CUDA_UVM_DEPRECATED_CRS
+  DEBUG_CUDA_UVM_DEPRECATED_DEV
   ctest_linux_nightly_mpi_debug_uvm_deprecated_ascicgpu031_crs.cmake
   CTEST_INSTALLER_TYPE debug
   RUN_SERIAL

diff --git a/cmake/ctest/drivers/ascicgpu031/TrilinosCTestDriverCore.ascicgpu031.gcc-cuda.crs.cmake b/cmake/ctest/drivers/ascicgpu031/TrilinosCTestDriverCore.ascicgpu031.gcc-cuda.crs.cmake
@@ -71,7 +71,7 @@ MACRO(TRILINOS_SYSTEM_SPECIFIC_CTEST_DRIVER)
   ENDIF()
 
   SET(Trilinos_REPOSITORY_LOCATION_NIGHTLY_DEFAULT "[email protected]:trilinos-project/Trilinos.git")
-  SET(Trilinos_BRANCH "tpetraCrsRefactor" )
+  SET(Trilinos_BRANCH "develop" )
 
   SET(CTEST_DASHBOARD_ROOT  "${TRILINOS_CMAKE_DIR}/../../${BUILD_DIR_NAME}" )
   SET(CTEST_NOTES_FILES     "${CTEST_SCRIPT_DIRECTORY}/${CTEST_SCRIPT_NAME}" )

diff --git a/...TestDriverCore.ascicgpu031.gcc-cuda.cmake → ...riverCore.ascicgpu031.gcc-cuda.sake.cmake b/...TestDriverCore.ascicgpu031.gcc-cuda.cmake → ...riverCore.ascicgpu031.gcc-cuda.sake.cmake
@@ -71,7 +71,7 @@ MACRO(TRILINOS_SYSTEM_SPECIFIC_CTEST_DRIVER)
   ENDIF()
 
   SET(Trilinos_REPOSITORY_LOCATION_NIGHTLY_DEFAULT "[email protected]:trilinos-project/Trilinos.git")
-  SET(Trilinos_BRANCH "TpetraDualViewRefactor" )
+  SET(Trilinos_BRANCH "Tpetra_UVM_Removal" )
 
   SET(CTEST_DASHBOARD_ROOT  "${TRILINOS_CMAKE_DIR}/../../${BUILD_DIR_NAME}" )
   SET(CTEST_NOTES_FILES     "${CTEST_SCRIPT_DIRECTORY}/${CTEST_SCRIPT_NAME}" )
@@ -103,7 +103,6 @@ MACRO(TRILINOS_SYSTEM_SPECIFIC_CTEST_DRIVER)
       "-DTrilinos_ENABLE_EXAMPLES:BOOL=ON"
       "-DTrilinos_ENABLE_DEPENDENCY_UNIT_TESTS:BOOL=OFF"
       "-DTeuchos_GLOBALLY_REDUCE_UNITTEST_RESULTS:BOOL=ON"
-
       "-DTrilinos_ENABLE_COMPLEX=ON"
       "-DTeuchos_ENABLE_COMPLEX=ON"
       "-DTpetra_INST_COMPLEX_DOUBLE=ON"

diff --git a/...ghtly_mpi_release_nouvm_ascicgpu031.cmake → ...ly_mpi_debug_nouvm_ascicgpu031_sake.cmake b/...ghtly_mpi_release_nouvm_ascicgpu031.cmake → ...ly_mpi_debug_nouvm_ascicgpu031_sake.cmake
@@ -54,7 +54,7 @@
 # @HEADER
 
 
-INCLUDE("${CTEST_SCRIPT_DIRECTORY}/TrilinosCTestDriverCore.ascicgpu031.gcc-cuda.cmake")
+INCLUDE("${CTEST_SCRIPT_DIRECTORY}/TrilinosCTestDriverCore.ascicgpu031.gcc-cuda.sake.cmake")
 
 #
 # Set the options specific to this build case
@@ -64,8 +64,8 @@ INCLUDE("${CTEST_SCRIPT_DIRECTORY}/TrilinosCTestDriverCore.ascicgpu031.gcc-cuda.
 # Tribits creates the variable listed under "Build Name" by prepending the OS type and compiler
 # details to BUILD_DIR_NAME.
 SET(COMM_TYPE MPI)
-SET(BUILD_TYPE RELEASE)
-SET(BUILD_NAME_DETAILS NOUVM_NODEPRECATED_DUALVIEW)
+SET(BUILD_TYPE DEBUG)
+SET(BUILD_NAME_DETAILS NOUVM_NODEPRECATED_SAKE)
 
 SET(CTEST_PARALLEL_LEVEL 8)
 SET(CTEST_TEST_TYPE Nightly)

diff --git a/..._release_uvm_deprecated_ascicgpu031.cmake → ...bug_uvm_deprecated_ascicgpu031_sake.cmake b/..._release_uvm_deprecated_ascicgpu031.cmake → ...bug_uvm_deprecated_ascicgpu031_sake.cmake
@@ -54,7 +54,7 @@
 # @HEADER
 
 
-INCLUDE("${CTEST_SCRIPT_DIRECTORY}/TrilinosCTestDriverCore.ascicgpu031.gcc-cuda.cmake")
+INCLUDE("${CTEST_SCRIPT_DIRECTORY}/TrilinosCTestDriverCore.ascicgpu031.gcc-cuda.sake.cmake")
 
 #
 # Set the options specific to this build case
@@ -64,8 +64,8 @@ INCLUDE("${CTEST_SCRIPT_DIRECTORY}/TrilinosCTestDriverCore.ascicgpu031.gcc-cuda.
 # Tribits creates the variable listed under "Build Name" by prepending the OS type and compiler
 # details to BUILD_DIR_NAME.
 SET(COMM_TYPE MPI)
-SET(BUILD_TYPE RELEASE)
-SET(BUILD_NAME_DETAILS UVM_DEPRECATED_DUALVIEW)
+SET(BUILD_TYPE DEBUG)
+SET(BUILD_NAME_DETAILS UVM_DEPRECATED_SAKE)
 
 SET(CTEST_PARALLEL_LEVEL 8)
 SET(CTEST_TEST_TYPE Nightly)

diff --git a/...elease_uvm_nodeprecated_ascicgpu031.cmake → ...g_uvm_nodeprecated_ascicgpu031_sake.cmake b/...elease_uvm_nodeprecated_ascicgpu031.cmake → ...g_uvm_nodeprecated_ascicgpu031_sake.cmake
@@ -54,7 +54,7 @@
 # @HEADER
 
 
-INCLUDE("${CTEST_SCRIPT_DIRECTORY}/TrilinosCTestDriverCore.ascicgpu031.gcc-cuda.cmake")
+INCLUDE("${CTEST_SCRIPT_DIRECTORY}/TrilinosCTestDriverCore.ascicgpu031.gcc-cuda.sake.cmake")
 
 #
 # Set the options specific to this build case
@@ -64,8 +64,8 @@ INCLUDE("${CTEST_SCRIPT_DIRECTORY}/TrilinosCTestDriverCore.ascicgpu031.gcc-cuda.
 # Tribits creates the variable listed under "Build Name" by prepending the OS type and compiler
 # details to BUILD_DIR_NAME.
 SET(COMM_TYPE MPI)
-SET(BUILD_TYPE RELEASE)
-SET(BUILD_NAME_DETAILS UVM_NODEPRECATED_DUALVIEW)
+SET(BUILD_TYPE DEBUG)
+SET(BUILD_NAME_DETAILS UVM_NODEPRECATED_SAKE)
 
 SET(CTEST_PARALLEL_LEVEL 8)
 SET(CTEST_TEST_TYPE Nightly)

diff --git a/cmake/ctest/drivers/ascicgpu031/drakify-email.pl b/cmake/ctest/drivers/ascicgpu031/drakify-email.pl
@@ -16,7 +16,7 @@
 
 # If you want to reuse this script somewhere else,
 # this should be the only line you need to change
-@packages=("Tpetra", "Amesos2","Ifpack2","Xpetra","MueLu","Zoltan2");
+@packages=("Tpetra", "Amesos2","Belos","Ifpack2","Xpetra","MueLu","Zoltan2","Thyra");
 
 $num_packages = scalar @packages;
 

diff --git a/cmake/ctest/drivers/atdm/ats2/local-driver.sh b/cmake/ctest/drivers/atdm/ats2/local-driver.sh
@@ -28,6 +28,8 @@ fi
 
 # Allow default setting for TPETRA_ASSUME_CUDA_AWARE_MPI=0 in trilinos_jsrun
 unset TPETRA_ASSUME_CUDA_AWARE_MPI
+atdm_config_ctest_regex_old="$ATDM_CONFIG_CTEST_REGEX"
+export ATDM_CONFIG_CTEST_REGEX="$ATDM_CONFIG_CTEST_REGEX -E Adelus*"
 
 echo
 echo "======================================================================="
@@ -40,6 +42,8 @@ set -x
 $WORKSPACE/Trilinos/cmake/ctest/drivers/atdm/ats2/local-driver-single-build.sh
 set +x
 
+export ATDM_CONFIG_CTEST_REGEX="$atdm_config_ctest_regex_old"
+
 if [[ "${Trilinos_CTEST_RUN_CUDA_AWARE_MPI}" == "1" ]]; then
   echo
   echo "======================================================================="

diff --git a/cmake/ctest/drivers/geminga/cron_driver.sh b/cmake/ctest/drivers/geminga/cron_driver.sh
@@ -100,6 +100,8 @@ env
 
 export CUDA_LAUNCH_BLOCKING=1
 export CUDA_MANAGED_FORCE_DEVICE_ALLOC=1
+# Only run on the Tesla K40, not the Quadro
+export CUDA_VISIBLE_DEVICES=0
 # Machine independent cron_driver:
 SCRIPT_DIR=`cd "\`dirname \"$0\"\`";pwd`
 $SCRIPT_DIR/../cron_driver.py

diff --git a/.../drivers/geminga/ctest_linux_nightly_mpi_release_muelu_kokkos_refactor_cuda_geminga.cmake b/.../drivers/geminga/ctest_linux_nightly_mpi_release_muelu_kokkos_refactor_cuda_geminga.cmake
@@ -76,7 +76,9 @@ SET(Trilinos_PACKAGES MueLu Xpetra Amesos2)
 SET(EXTRA_CONFIGURE_OPTIONS
   ### ETI ###
   "-DTrilinos_ENABLE_EXPLICIT_INSTANTIATION:BOOL=ON"
-  "-DTrilinos_ENABLE_COMPLEX:BOOL=OFF"
+  "-DTrilinos_ENABLE_COMPLEX:BOOL=ON"
+  "-DTeuchos_ENABLE_COMPLEX:BOOL=ON"
+  "-DTpetra_INST_COMPLEX_DOUBLE:BOOL=ON"
 
   ### MISC ###
   "-DTrilinos_ENABLE_DEPENDENCY_UNIT_TESTS:BOOL=OFF"

diff --git a/cmake/std/PullRequestLinuxCuda10.1.105TestingSettings.cmake b/cmake/std/PullRequestLinuxCuda10.1.105TestingSettings.cmake
@@ -132,5 +132,8 @@ set (Teko_testdriver_MPI_4_DISABLE ON CACHE BOOL "Temporary disable for CUDA PR
 set (Zoltan2_fix4785_MPI_4_DISABLE ON CACHE BOOL "Temporary disable for CUDA PR testing")
 set (Intrepid2_unit-test_Discretization_Basis_HierarchicalBases_Hierarchical_Basis_Tests_MPI_1_DISABLE ON CACHE BOOL "Temporary disable for CUDA PR testing")
 
+set (Trilinos_ENABLE_COMPLEX ON CACHE BOOL "Testing for #9025")
+set (Teuchos_ENABLE_COMPLEX ON CACHE BOOL "Testing for #9025")
+set (Tpetra_INST_COMPLEX_DOUBLE ON CACHE BOOL "Testing for #9025")
 
 include("${CMAKE_CURRENT_LIST_DIR}/PullRequestLinuxCommonTestingSettings.cmake")
diff --git a/...LinuxCuda10.1.105uvmTestingSettings.cmake → ...uxCuda10.1.105uvmOffTestingSettings.cmake b/...LinuxCuda10.1.105uvmTestingSettings.cmake → ...uxCuda10.1.105uvmOffTestingSettings.cmake
@@ -2,9 +2,9 @@
 # for Trilinos for the CUDA 10.1.105 UVM pull request testing builds, and to reproduce
 # the errors reported by those builds. Prior to using this this file, the
 # appropriate set of modules must be loaded and path must be augmented.
-# (See the sems/PullRequestCuda10.1.105uvmTestingEnv.sh files.)
+# (See the sems/PullRequestCuda10.1.105uvmOffTestingEnv.sh files.)
 
-# Usage: cmake -C PullRequestLinuxCUDA10.1.105uvmTestingSettings.cmake
+# Usage: cmake -C PullRequestLinuxCUDA10.1.105uvmOffTestingSettings.cmake
 
 set (CMAKE_CXX_STANDARD "14" CACHE STRING "Set C++ standard to C++14")
 
@@ -127,15 +127,16 @@ set (EpetraExt_inout_test_LL_MPI_4_DISABLE ON CACHE BOOL "Temporary disable for
 set (EpetraExt_inout_test_MPI_4_DISABLE ON CACHE BOOL "Temporary disable for CUDA PR testing")
 set (Teko_testdriver_MPI_4_DISABLE ON CACHE BOOL "Temporary disable for CUDA PR testing")
 set (Zoltan2_fix4785_MPI_4_DISABLE ON CACHE BOOL "Temporary disable for CUDA PR testing")
-set (Intrepid2_unit-test_Discretization_Basis_HierarchicalBases_Hierarchical_Basis_Tests_MPI_1_DISABLE ON CACHE BOOL "Temporary disable for CUDA PR testing")
 
+set (Trilinos_ENABLE_COMPLEX ON CACHE BOOL "Testing for #9025")
+set (Teuchos_ENABLE_COMPLEX ON CACHE BOOL "Testing for #9025")
+set (Tpetra_INST_COMPLEX_DOUBLE ON CACHE BOOL "Testing for #9025")
 
 # UVM = OFF
 set (Kokkos_ENABLE_CUDA_UVM OFF CACHE BOOL "Set by default for CUDA PR testing")
 set (Tpetra_ENABLE_CUDA_UVM OFF CACHE BOOL "Set by default for CUDA PR testing")
 
 # Turn off packages currently failing with UVM = OFF
-set (Trilinos_ENABLE_Intrepid2 OFF CACHE BOOL "Turn off packages for non-UVM build")
 set (Trilinos_ENABLE_Panzer OFF CACHE BOOL "Turn off packages for non-UVM build")
 set (Trilinos_ENABLE_Stokhos OFF CACHE BOOL "Turn off packages for non-UVM build")
 set (Trilinos_ENABLE_TrilinosCouplings OFF CACHE BOOL "Turn off packages for non-UVM build")
@@ -151,17 +152,15 @@ set (Kokkos_ENABLE_TESTS OFF CACHE BOOL "Turn off tests for non-UVM build")
 set (KokkosKernels_ENABLE_TESTS OFF CACHE BOOL "Turn off tests for non-UVM build")
 set (MueLu_ENABLE_TESTS OFF CACHE BOOL "Turn off tests for non-UVM build")
 set (NOX_ENABLE_TESTS OFF CACHE BOOL "Turn off tests for non-UVM build")
-set (Phalanx_ENABLE_TESTS OFF CACHE BOOL "Turn off tests for non-UVM build")
 set (ROL_ENABLE_TESTS OFF CACHE BOOL "Turn off tests for non-UVM build")
 set (Sacado_ENABLE_TESTS OFF CACHE BOOL "Turn off tests for non-UVM build")
 set (SEACAS_ENABLE_TESTS OFF CACHE BOOL "Turn off tests for non-UVM build")
 set (ShyLU_DD_ENABLE_TESTS OFF CACHE BOOL "Turn off tests for non-UVM build")
 set (STK_ENABLE_TESTS OFF CACHE BOOL "Turn off tests for non-UVM build")
 set (Teko_ENABLE_TESTS OFF CACHE BOOL "Turn off tests for non-UVM build")
-set (Tpetra_ENABLE_TESTS OFF CACHE BOOL "Turn off tests for non-UVM build")
-set (TpetraCore_ENABLE_TESTS OFF CACHE BOOL "Turn off tests for non-UVM build")
 set (Xpetra_ENABLE_TESTS OFF CACHE BOOL "Turn off tests for non-UVM build")
 set (Zoltan2_ENABLE_TESTS OFF CACHE BOOL "Turn off tests for non-UVM build")
+
 # ShyLU_DD UVM = OFF tests
 set (ShyLU_DDFROSch_test_thyra_xpetra_laplace_one_rank_TLP_IPOU_DIM3_TPETRA_MPI_1_DISABLE ON CACHE BOOL "Turn off tests for non-UVM build")
 set (ShyLU_DDFROSch_test_thyra_xpetra_laplace_one_rank_TLP_GDSW_DIM2_TPETRA_MPI_1_DISABLE ON CACHE BOOL "Turn off tests for non-UVM build")

diff --git a/cmake/std/PullRequestLinuxCuda10.1.243TestingSettings.cmake b/cmake/std/PullRequestLinuxCuda10.1.243TestingSettings.cmake
@@ -129,11 +129,11 @@ set (KokkosCore_UnitTest_Cuda_MPI_1_EXTRA_ARGS
   "--gtest_filter=-cuda.debug_pin_um_to_host:cuda.debug_serial_execution"
   CACHE STRING "Temporary disable for CUDA PR testing")
 
-# Disable a few failing tests for initial release of Cuda 10.1.105 PR build
-# set (EpetraExt_inout_test_LL_MPI_4_DISABLE ON CACHE BOOL "Temporary disable for CUDA PR testing")
-# set (EpetraExt_inout_test_MPI_4_DISABLE ON CACHE BOOL "Temporary disable for CUDA PR testing")
-# set (Teko_testdriver_MPI_4_DISABLE ON CACHE BOOL "Temporary disable for CUDA PR testing")
-# set (Zoltan2_fix4785_MPI_4_DISABLE ON CACHE BOOL "Temporary disable for CUDA PR testing")
+# Disable a few failing tests for initial release of Cuda 10.1.243 PR build
+# these fail due to a bug in spectrum-mpi : see issue #8798 for details
+set (Zoltan_ch_simple_zoltan_parallel_DISABLE ON CACHE BOOL "Temporary disable for CUDA PR testing")
+set (Zoltan_hg_simple_zoltan_parallel_DISABLE ON CACHE BOOL "Temporary disable for CUDA PR testing")
+set (Zoltan_mpiMinLoc_MPI_4_DISABLE ON CACHE BOOL "Temporary disable for CUDA PR testing")
 
 # Disable SEACAS tests that grep results out of stderr...
 set (SEACASIoss_create_path_fpp_DISABLE ON CACHE BOOL "Temporary disable due to jsrun polluting stderr")

diff --git a/cmake/std/PullRequestLinuxIntel17.0.1TestingSettings.cmake b/cmake/std/PullRequestLinuxIntel17.0.1TestingSettings.cmake
@@ -68,16 +68,31 @@ set (MueLu_UnitTestsTpetra_MPI_1_DISABLE ON CACHE BOOL "Temporarily disabled in
 # (Temporarily) Disable randomly failing ROL test (#3103)
 set (ROL_example_poisson-inversion_example_01_MPI_1_DISABLE ON CACHE BOOL "Temporarily disabled in PR testing")
 
+set (SuperLUDist_INCLUDE_DIRS "$ENV{SEMS_SUPERLU_DIST_INCLUDE_PATH}" CACHE PATH "Set by default for PR testing")
+set (SuperLUDist_LIBRARY_DIRS "$ENV{SEMS_SUPERLU_DIST_LIBRARY_PATH}" CACHE PATH "Set by default for PR testing")
+set (TPL_ENABLE_SuperLUDist ON CACHE BOOL "Set by default for PR testing")
+
+set (TPL_ENABLE_SuperLU OFF CACHE BOOL "Set by default for PR testing")
+
 include("${CMAKE_CURRENT_LIST_DIR}/PullRequestLinuxCommonTestingSettings.cmake")
 
+# These three tests are disabled due to a similar error during testing
+# see issue #9077
+set (Amesos2_SolverFactory_UnitTests_MPI_4_DISABLE ON CACHE BOOL
+  "Temporarily disabled in PR testing")
+set (Amesos2_SuperLU_DIST_Solver_Test_MPI_4_DISABLE ON CACHE BOOL
+  "Temporarily disabled in PR testing")
+set (Stratimikos_test_single_amesos2_tpetra_solver_driver_SuperLU_DIST_MPI_1_DISABLE ON CACHE BOOL
+  "Temporarily disabled in PR testing")
+
 set (Tpetra_INST_INT_INT ON CACHE BOOL "INST_INT_INT ON")
 set (Trilinos_ENABLE_STKBalance OFF CACHE BOOL "Hard disabled since Tpetra_INST_INT_INT=ON in this build" FORCE)
 #STK-TODO: try to remember to come back and remove this when stk-balance
 #is able to tolerate int as a global-index.
 
 set(CMAKE_CXX_FLAGS "-Wall -Warray-bounds -Wchar-subscripts -Wcomment -Wenum-compare -Wformat -Wuninitialized -Wmaybe-uninitialized -Wmain -Wnarrowing -Wnonnull -Wparentheses -Wpointer-sign -Wreorder -Wreturn-type -Wsign-compare -Wsequence-point -Wtrigraphs -Wunused-function -Wunused-but-set-variable -Wunused-variable -Wwrite-strings" CACHE STRING "Warning settings")
 
-set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lifcore" CACHE STRING "updated by Pull Request")
+set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lifcore -qopenmp" CACHE STRING "updated by Pull Request")
 
 #set (Anasazi_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror" CACHE STRING "Warnings as errors setting")
 #set (Belos_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror" CACHE STRING "Warnings as errors setting")

diff --git a/cmake/std/atdm/ATDMDevEnvSettings.cmake b/cmake/std/atdm/ATDMDevEnvSettings.cmake
@@ -222,16 +222,12 @@ IF (ATDM_FPIC)
   SET(CMAKE_POSITION_INDEPENDENT_CODE ON CACHE BOOL "Build targets with position independent code")
 ENDIF()
 
-ATDM_SET_CACHE(CMAKE_C_FLAGS
-  "$ENV{ATDM_CONFIG_C_FLAGS} $ENV{EXTRA_C_FLAGS}" CACHE STRING)
-ATDM_SET_CACHE(CMAKE_CXX_FLAGS
-  "$ENV{ATDM_CONFIG_CXX_FLAGS}${EXTRA_EXTRA_CXX_FLAGS} $ENV{EXTRA_CXX_FLAGS}" CACHE STRING)
-ATDM_SET_CACHE(CMAKE_Fortran_FLAGS
-  "$ENV{ATDM_CONFIG_Fortran_FLAGS} $ENV{EXTRA_Fortran_FLAGS}" CACHE STRING)
-# NOTE: That above "EXTRA_<LANG>_FLAGS" env vars are left in for backward
-# compatibility with the EMPIRE configuration and are not directly set in any
-# offical ATDM Trilinos configuration setup.  Only the
-# "ATDM_CONFIG_<LANG>_FLAGS" env vars are set.
+SET(CMAKE_C_FLAGS
+  "$ENV{ATDM_CONFIG_C_FLAGS} ${CMAKE_C_FLAGS}")
+SET(CMAKE_CXX_FLAGS
+  "$ENV{ATDM_CONFIG_CXX_FLAGS} ${EXTRA_EXTRA_CXX_FLAGS} ${CMAKE_CXX_FLAGS}")
+SET(CMAKE_Fortran_FLAGS
+  "$ENV{ATDM_CONFIG_Fortran_FLAGS} ${CMAKE_Fortran_FLAGS}")
 
 IF (NOT "$ENV{ATDM_CONFIG_OPENMP_FORTRAN_FLAGS}" STREQUAL "")
   ATDM_SET_CACHE(OpenMP_Fortran_FLAGS "$ENV{ATDM_CONFIG_OPENMP_FORTRAN_FLAGS}"
@@ -342,7 +338,7 @@ ENDIF()
 
 # Disable/hide deprecated code
 ATDM_SET_CACHE(Kokkos_ENABLE_DEPRECATED_CODE OFF CACHE BOOL)
-ATDM_SET_CACHE(Tpetra_ENABLE_DEPRECATED_CODE OFF CACHE BOOL)
+ATDM_SET_CACHE(Tpetra_ENABLE_DEPRECATED_CODE ON CACHE BOOL)
 ATDM_SET_CACHE(Belos_HIDE_DEPRECATED_CODE ON CACHE BOOL)
 ATDM_SET_CACHE(Epetra_HIDE_DEPRECATED_CODE ON CACHE BOOL)
 ATDM_SET_CACHE(Ifpack2_HIDE_DEPRECATED_CODE ON CACHE BOOL)
@@ -599,6 +595,9 @@ IF (COMMAND INSTALL AND NOT "${CMAKE_INSTALL_PREFIX}" STREQUAL "")
 
   SET( ATDM_BUILD_NAME $ENV{ATDM_CONFIG_BUILD_NAME} )
 
+  ADVANCED_SET(CTEST_BUILD_NAME "${ATDM_BUILD_NAME}-exp" CACHE STRING
+    "Build name for submit to CDash with 'dashboard' target (default set as env<ATDM_CONFIG_BUILD_NAME>-exp)" )
+
   SET( ATDM_INSTALLED_ENV_LOAD_SCRIPT_NAME load_matching_env.sh
     CACHE STRING
     "Name of script installed in <CMAKE_INSTALL_PREFIX> to source to load matching env." )