Merge 'trilinos/Trilinos:develop' (2bbe2a9) into 'EM-Plasma/Trilinos:…

…develop' (b58c085).

* potential-trilinos-develop: (121 commits)
  drivers/atdm: Fix proxy environment
  zoltan:  minor changes to make non-c99 compilers happy trilinos#8816 (trilinos#8817)
  MueLu: Rebase gold files
  MueLu Interface test: skip default values in ML runs
  MueLu ML2MueLuParameterTranslator: Correctly translate verbosity
  Phalanx: utilities for virtual functions on device (trilinos#8840)
  Fix an error introduced in PR 8829
  Correct a setenv left in bash scripts.
  MueLu: I really hate when the autotester decides to freak out about code I didn't touch but now it is my responsibility to fix if I ever want to merge this PR
  MueLu: Going for gold
  pamgen: Fixing uninitialized memory valigrind error in RTC
  Update Compadre Toolkit to v1.3.3
  Oops
  MueLu: Adding aggregates to export data
  MueLu: Adding aggregates to export data
  SEACAS: Disable tests that are failing on vortex
  Intrepid2 - missing typo
  MueLu: More Phase2a controls
  Panzer: Fix for ghost orientations in worksets.
  Implement getHostBasis() in newer Basis subclasses (trilinos#8811)
  ...

.github/workflows/stale.yml

@@ -20,7 +20,7 @@ jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/[email protected].14
+    - uses: actions/[email protected].17
       with:
         debug-only: false
         ascending: true
@@ -35,7 +35,7 @@ jobs:
         # We specifically DO NOT exempt PR's from autoclosing.
         #exempt-pr-labels: ''
         remove-stale-when-updated: true
-        operations-per-run: 50
+        operations-per-run: 52
         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.
@@ -63,6 +63,9 @@ jobs:
         close-pr-message: >
           This Pull Request has been automatically closed due to **395** days of inactivity.
 
+        # start-date : only consider issues/PR's created after this date.
+        start-date: '2001-01-01T00:00:00Z'
+
 
 
 

cmake/ctest/drivers/atdm/utils/setup_env.sh

@@ -33,10 +33,12 @@ if [ "${Trilinos_REPOSITORY_LOCATION}" == "" ] ; then
 fi
 
 unset http_proxy
-# NOTE: Above we have to unset http_proxy to allow the second submit to the
-# testing-dev.sandia.gov/cdash/ site which the jenkins job sets.  But we can't
-# unset https_proxy which is needed for the git operations with
-# https://github.com.
+unset HTTP_PROXY
+unset no_proxy
+unset NO_PROXY
+# NOTE: Above we have to unset http_proxy and no_proxy to allow the
+# cdash submits to go  through. Note that we can't  unset https_proxy
+# which is needed for the git operations with  https://github.com.
 
 #
 # C) Setup install-releated stuff

cmake/ctest/drivers/lightsaber/cron_driver.csh

@@ -38,11 +38,8 @@ source ~/.cshrc
 setenv CTEST_CONFIGURATION "default"
 module purge
 module load sems-env
-module load sems-cmake/3.10.3
-module load sems-gcc/4.9.3
-module load sems-openmpi/1.8.7
-module load sems-superlu/4.3/base
-module load sems-python/2.7.9
+module load sems-devpack-gcc/5.3.0
+module load sems-cmake/3.17.1
 
 # Remove colors (-fdiagnostics-color) from OMPI flags
 # It may result in non-XML characters on the Dashboard
@@ -66,11 +63,8 @@ setenv SCRIPT_DIR `dirname "$0"`
 echo "SCRIPT_DIR = " $SCRIPT_DIR
 $SCRIPT_DIR/../cron_driver.py
 
-module unload sems-python/2.7.9
-module unload sems-superlu/4.3/base
-module unload sems-openmpi/1.10.1
-module unload sems-gcc/5.3.0
-module unload sems-cmake/3.10.3
+module unload sems-cmake/3.17.1
+module unload sems-devpack-gcc/5.3.0
 # ===========================================================================
 
 echo

cmake/std/PullRequestLinuxCommonTestingSettings.cmake

@@ -63,6 +63,10 @@ set (PanzerAdaptersSTK_PoissonInterfaceExample_2d_diffsideids_MPI_1_DISABLE ON C
 # Disable long-failing Anazazi test until it can be fixed (#3585)
 set (Anasazi_Epetra_OrthoManagerGenTester_0_MPI_4_DISABLE ON CACHE BOOL "Set by default for PR testing")
 
+# Disable Random_XorShift64 and Random_XorShift1024 due to random failures. See #3282.
+set (KokkosAlgorithms_UnitTest_MPI_1_EXTRA_ARGS
+  "--gtest_filter=-*Random_XorShift64:-*Random_XorShift1024" CACHE STRING "Set by default for PR testing")
+
 # Options from SEMSDevEnv.cmake
 
 SET(CMAKE_C_COMPILER "$ENV{MPICC}" CACHE FILEPATH "Set by default for PR testing")

cmake/std/PullRequestLinuxCuda10.1.243TestingSettings.cmake

@@ -0,0 +1,150 @@
+# This file contains the options needed to both run the pull request testing
+# for Trilinos for the CUDA 10.1.105 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.105TestingEnv.sh files.)
+
+# Usage: cmake -C PullRequestLinuxCUDA10.1.243TestingSettings.cmake
+
+# Misc options typically added by CI testing mode in TriBITS
+
+# Use the below option only when submitting to the dashboard
+set (CTEST_USE_LAUNCHERS ON CACHE BOOL "Set by default for PR testing")
+set (MPI_EXEC "${CMAKE_CURRENT_LIST_DIR}/sems/trilinos_jsrun" CACHE STRING "We use this wrapper to get the cuda hooks turned off") 
+
+# Options necessary for CUDA build
+set (TPL_ENABLE_MPI ON CACHE BOOL "Set by default for CUDA PR testing")
+set (Kokkos_ENABLE_CUDA ON CACHE BOOL "Set by default for CUDA PR testing")
+set (Kokkos_ENABLE_CUDA_UVM ON CACHE BOOL "Set by default for CUDA PR testing")
+set (Kokkos_ARCH_POWER9 ON CACHE BOOL "Set by default for CUDA PR testing")
+set (Kokkos_ARCH_VOLTA70 ON CACHE BOOL "Set by default for CUDA PR testing")
+set (Kokkos_ENABLE_CUDA_RELOCATABLE_DEVICE_CODE OFF CACHE BOOL "Set by default for CUDA PR testing")
+set (Sacado_ENABLE_HIERARCHICAL_DFAD ON CACHE BOOL "Set by default for CUDA PR testing")
+set (Kokkos_ENABLE_CXX11_DISPATCH_LAMBDA ON CACHE BOOL "Set by default for CUDA PR testing")
+set (Kokkos_ENABLE_CUDA_LAMBDA ON CACHE BOOL "Set by default for CUDA PR testing")
+set (Phalanx_KOKKOS_DEVICE_TYPE CUDA CACHE STRING "Set by default for CUDA PR testing")
+set (MPI_EXEC_POST_NUMPROCS_FLAGS "--rs_per_socket;4" CACHE STRING "Set by default for CUDA PR testing")
+set (MPI_EXEC_NUMPROCS_FLAG "-p" CACHE STRING "Set by default for CUDA PR testing")
+
+# Options set to match the ATDM build
+set (Trilinos_ENABLE_DEBUG OFF CACHE BOOL "Set by default for CUDA PR testing")
+set (Trilinos_ENABLE_DEBUG_SYMBOLS OFF CACHE BOOL "Set by default for CUDA PR testing")
+set (BUILD_SHARED_LIBS OFF CACHE BOOL "Set by default for CUDA PR testing")
+set (Tpetra_INST_SERIAL ON CACHE BOOL "Set by default for CUDA PR testing")
+set (TPETRA_ASSUME_CUDA_AWARE_MPI ON CACHE BOOL "Set by default for CUDA PR testing")
+
+set (Trilinos_ENABLE_SECONDARY_TESTED_CODE OFF CACHE BOOL "Set by default for CUDA PR testing")
+set (EpetraExt_ENABLE_HDF5 OFF CACHE BOOL "Set by default for CUDA PR testing")
+set (Panzer_FADTYPE "Sacado::Fad::DFad<RealType>" CACHE STRING "Set by default for CUDA PR testing")
+set (Kokkos_ENABLE_Debug_Bounds_Check ON CACHE BOOL "Set by default for CUDA PR testing")
+set (KOKKOS_ENABLE_DEBUG ON CACHE BOOL "Set by default for CUDA PR testing")
+
+# TPL settings specific to CUDA build
+set (TPL_ENABLE_CUDA ON CACHE BOOL "Set by default for CUDA PR testing")
+set (TPL_ENABLE_CUSPARSE ON CACHE BOOL "Set by default for CUDA PR testing")
+set (TPL_ENABLE_Pthread OFF CACHE BOOL "Set by default for CUDA PR testing")
+set (TPL_ENABLE_BinUtils OFF CACHE BOOL "Set by default for CUDA PR testing")
+set (TPL_ENABLE_BLAS ON CACHE BOOL "Set by default for CUDA PR testing")
+set (TPL_BLAS_LIBRARY_DIRS "$ENV{CBLAS_ROOT}" "Set by default for CUDA PR testing")
+set (TPL_BLAS_LIBRARIES "-L$ENV{CBLAS_ROOT}/lib;-lblas;-lgfortran;-lgomp;-lm" CACHE STRING "Set by default for CUDA PR testing")
+set (TPL_ENABLE_Boost ON CACHE BOOL "Set by default for CUDA PR testing")
+set (Boost_INCLUDE_DIRS "$ENV{BOOST_ROOT}/include" CACHE FILEPATH "Set by default for CUDA PR testing")
+set (TPL_Boost_LIBRARIES "$ENV{BOOST_ROOT}/lib/libboost_program_options.a;$ENV{BOOST_ROOT}/lib/libboost_system.a" CACHE FILEPATH  "Set by default for CUDA PR testing")
+set (TPL_ENABLE_BoostLib ON CACHE BOOL "Set by default for CUDA PR testing")
+set (BoostLib_INCLUDE_DIRS "$ENV{BOOST_ROOT}/include" CACHE FILEPATH "Set by default for CUDA PR testing")
+set (TPL_BoostLib_LIBRARIES "$ENV{BOOST_ROOT}/lib/libboost_program_options.a;$ENV{BOOST_ROOT}/lib/libboost_system.a" CACHE FILEPATH "Set by default for CUDA PR testing")
+set (TPL_ENABLE_METIS OFF CACHE BOOL "Set by default for CUDA PR testing")
+set (TPL_ENABLE_ParMETIS OFF CACHE BOOL "Set by default for CUDA PR testing")
+set (TPL_ENABLE_Scotch OFF CACHE BOOL "Set by default for CUDA PR testing")
+set (TPL_ENABLE_HWLOC OFF CACHE BOOL "Set by default for CUDA PR testing")
+set (TPL_ENABLE_LAPACK ON CACHE BOOL "Set by default for CUDA PR testing")
+set (TPL_LAPACK_LIBRARIES "-L$ENV{LAPACK_ROOT}/lib;-llapack;-lgfortran;-lgomp" CACHE STRING "Set by default for CUDA PR testing")
+set (TPL_ENABLE_Zlib OFF CACHE BOOL "Set by default for CUDA PR testing")
+set (TPL_ENABLE_CGNS OFF CACHE BOOL "Set by default for CUDA PR testing")
+set (TPL_ENABLE_HDF5 ON CACHE BOOL "Set by default for CUDA PR testing")
+set (HDF5_INCLUDE_DIRS "$ENV{HDF5_ROOT}/include" CACHE FILEPATH "Set by default for CUDA PR testing")
+set (TPL_HDF5_LIBRARIES "-L$ENV{HDF5_ROOT}/lib;$ENV{HDF5_ROOT}/lib/libhdf5_hl.a;$ENV{HDF5_ROOT}/lib/libhdf5.a;-lz;-ldl" CACHE FILEPATH "Set by default for CUDA PR testing")
+set (TPL_ENABLE_Netcdf ON CACHE BOOL "Set by default for CUDA PR testing")
+set (Netcdf_INCLUDE_DIRS "$ENV{NETCDF_ROOT}/include" CACHE FILEPATH "Set by default for CUDA PR testing")
+IF ("$ENV{PNETCDF_ROOT}" STREQUAL "")
+  SET(PNETCDF_ROOT "$ENV{NETCDF_ROOT}")
+ELSE()
+  SET(PNETCDF_ROOT "$ENV{PNETCDF_ROOT}")
+ENDIF()
+set (TPL_Netcdf_LIBRARIES "-L$ENV{NETCDF_ROOT}/lib64;$ENV{NETCDF_ROOT}/lib64/libnetcdf.a;${PNETCDF_ROOT}/lib/libpnetcdf.a;${TPL_HDF5_LIBRARIES}" CACHE STRING "Set by default for CUDA PR testing")
+
+# SuperLU and SuperLUDist is available on ride and could be enabled for the CUDA PR build
+set (TPL_ENABLE_SuperLU OFF CACHE BOOL "Set by default for CUDA PR testing")
+set (TPL_ENABLE_SuperLUDist OFF CACHE BOOL "Set by default for CUDA PR testing")
+set (TPL_ENABLE_BoostLib OFF CACHE BOOL "Set by default for CUDA PR testing")
+set (TPL_ENABLE_Matio OFF CACHE BOOL "Set by default for CUDA PR testing")
+set (TPL_DLlib_LIBRARIES "-ldl" CACHE FILEPATH "Set by default for CUDA PR testing")
+
+# The compile times for two Panzer files went up to over 6 hours. This
+# turns off one feature that allows these in about 24 minutes. Please remove
+# when issue #7532 is resolved.
+set (Sacado_NEW_FAD_DESIGN_IS_DEFAULT OFF CACHE BOOL "Temporary fix for issue #7532" )
+
+# Disable some packages that can't be tested with this PR build
+set (Trilinos_ENABLE_ShyLU_NodeTacho OFF CACHE BOOL
+  "Can't test Tacho with CUDA without RDC" FORCE)
+
+# Temporary options to clean up build
+set (Teko_ModALPreconditioner_MPI_1_DISABLE ON CACHE BOOL "Temporary disable for CUDA PR testing")
+set (MueLu_ParameterListInterpreterTpetra_MPI_1_DISABLE ON CACHE BOOL "Temporary disable for CUDA PR testing")
+set (MueLu_ParameterListInterpreterTpetraHeavy_MPI_1_DISABLE ON CACHE BOOL "Temporary disable for CUDA PR testing")
+set (STKUnit_tests_stk_ngp_test_utest_MPI_4_DISABLE ON CACHE BOOL "Temporary disable for CUDA PR testing")
+set (ROL_example_PDE-OPT_0ld_adv-diff-react_example_01_MPI_4_DISABLE ON CACHE BOOL "Temporary disable for CUDA PR testing")
+set (ROL_example_PDE-OPT_0ld_adv-diff-react_example_02_MPI_4_DISABLE ON CACHE BOOL "Temporary disable for CUDA PR testing")
+set (ROL_example_PDE-OPT_0ld_poisson_example_01_MPI_4_DISABLE ON CACHE BOOL "Temporary disable for CUDA PR testing")
+set (ROL_example_PDE-OPT_0ld_stefan-boltzmann_example_03_MPI_4_DISABLE ON CACHE BOOL "Temporary disable for CUDA PR testing")
+set (ROL_example_PDE-OPT_navier-stokes_example_01_MPI_4_DISABLE ON CACHE BOOL "Temporary disable for CUDA PR testing")
+set (ROL_example_PDE-OPT_navier-stokes_example_02_MPI_4_DISABLE ON CACHE BOOL "Temporary disable for CUDA PR testing")
+set (ROL_example_PDE-OPT_nonlinear-elliptic_example_01_MPI_4_DISABLE ON CACHE BOOL "Temporary disable for CUDA PR testing")
+set (ROL_example_PDE-OPT_nonlinear-elliptic_example_02_MPI_4_DISABLE ON CACHE BOOL "Temporary disable for CUDA PR testing")
+set (ROL_example_PDE-OPT_obstacle_example_01_MPI_4_DISABLE ON CACHE BOOL "Temporary disable for CUDA PR testing")
+set (ROL_example_PDE-OPT_topo-opt_poisson_example_01_MPI_4_DISABLE ON CACHE BOOL "Temporary disable for CUDA PR testing")
+set (ROL_test_elementwise_TpetraMultiVector_MPI_4_DISABLE ON CACHE BOOL "Temporary disable for CUDA PR testing")
+set (ROL_NonlinearProblemTest_MPI_4_DISABLE ON CACHE BOOL "Temporary disable for CUDA PR testing")
+set (PanzerAdaptersSTK_CurlLaplacianExample-ConvTest-Quad-Order-4_DISABLE ON CACHE BOOL "Temporary disable for CUDA PR testing")
+set (PanzerAdaptersSTK_MixedPoissonExample-ConvTest-Hex-Order-3_DISABLE ON CACHE BOOL "Temporary disable for CUDA PR testing")
+set (TrilinosCouplings_Example_Maxwell_MueLu_MPI_1_DISABLE ON CACHE BOOL "Temporary disable for CUDA PR testing")
+set (TrilinosCouplings_Example_Maxwell_MueLu_MPI_4_DISABLE ON CACHE BOOL "Temporary disable for CUDA PR testing")
+
+# Disable some tests that should not need to be disabled but do because the
+# Trilinos PR tester is using too high a parallel level for ctest. (If the
+# ctest parallel test level is dropped from 29 to 8, all of these will pass.)
+set (MueLu_UnitTestsIntrepid2Tpetra_MPI_4_DISABLE ON CACHE BOOL "Temporary disable for CUDA PR testing")
+set (PanzerAdaptersSTK_main_driver_energy-ss-blocked-tp_DISABLE ON CACHE BOOL "Temporary disable for CUDA PR testing")
+set (PanzerAdaptersSTK_MixedCurlLaplacianExample-ConvTest-Tri-Order-1_DISABLE ON CACHE BOOL "Temporary disable for CUDA PR testing")
+set (PanzerAdaptersSTK_PoissonInterfaceExample_3d_MPI_4_DISABLE ON CACHE BOOL "Temporary disable for CUDA PR testing")
+set (PanzerMiniEM_MiniEM-BlockPrec_Augmentation_MPI_4_DISABLE ON CACHE BOOL "Temporary disable for CUDA PR testing")
+set (PanzerMiniEM_MiniEM-BlockPrec_RefMaxwell_MPI_4_DISABLE ON CACHE BOOL "Temporary disable for CUDA PR testing")
+set (ROL_example_PDE-OPT_poisson-boltzmann_example_01_MPI_4_DISABLE ON CACHE BOOL "Temporary disable for CUDA PR testing")
+
+# Disable a couple of unit tests in test KokkosCore_UnitTest_Cuda_MPI_1 that
+# are randomly failing in PR test iterations (#6799)
+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 SEACAS tests that grep results out of stderr...
+set (SEACASIoss_create_path_fpp_DISABLE ON CACHE BOOL "Temporary disable due to jsrun polluting stderr")
+set (SEACASAprepro_lib_aprepro_lib_unit_test_DISABLE ON CACHE BOOL "Temporary disable due to jsrun polluting stderr")
+set (SEACASAprepro_lib_aprepro_lib_array_test_DISABLE ON CACHE BOOL "Temporary disable due to jsrun polluting stderr")
+set (SEACASAprepro_aprepro_unit_test_DISABLE ON CACHE BOOL "Temporary disable due to jsrun polluting stderr")
+set (SEACASAprepro_aprepro_array_test_DISABLE ON CACHE BOOL "Temporary disable due to jsrun polluting stderr")
+set (SEACASAprepro_aprepro_command_line_vars_test_DISABLE ON CACHE BOOL "Temporary disable due to jsrun polluting stderr")
+set (SEACASAprepro_aprepro_command_line_include_test_DISABLE ON CACHE BOOL "Temporary disable due to jsrun polluting stderr")
+set (SEACASAprepro_aprepro_test_dump_reread_DISABLE ON CACHE BOOL "Temporary disable due to jsrun polluting stderr")
+
+set (CMAKE_CXX_STANDARD "14" CACHE STRING "Set C++ standard to C++14")
+# set (CMAKE_CXX_EXTENSIONS OFF CACHE BOOL "Kokkos turns off CXX extensions")
+
+include("${CMAKE_CURRENT_LIST_DIR}/PullRequestLinuxCommonTestingSettings.cmake")

cmake/std/PullRequestLinuxCudaVortexDriver.sh

@@ -0,0 +1,22 @@
+#!/bin/bash -l
+
+if [ "${BSUB_CTEST_TIME_LIMIT}" == "" ] ; then
+  export BSUB_CTEST_TIME_LIMIT=12:00
+fi
+
+if [ "${Trilinos_CTEST_DO_ALL_AT_ONCE}" == "" ] ; then
+  export Trilinos_CTEST_DO_ALL_AT_ONCE=TRUE
+fi
+
+# comment out sh and add what we need individually.
+#source $WORKSPACE/Trilinos/cmake/std/atdm/load-env.sh $JOB_NAME
+
+set -x
+
+#TODO: review appropriate job size
+bsub -Is -nnodes 2 -J ${JOB_NAME} -W ${BSUB_CTEST_TIME_LIMIT} \
+  ${WORKSPACE}/Trilinos/cmake/std/PullRequestLinuxDriver.sh
+
+# NOTE: Above, this bsub command should grab a two
+# nodes.  The option '-x' makes sure that only this
+# job runs on those nodes.

cmake/std/PullRequestLinuxDriver.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-SCRIPTFILE=$(realpath $BASH_SOURCE)
+SCRIPTFILE=$(realpath ${WORKSPACE:?}/Trilinos/cmake/std/PullRequestLinuxDriver.sh)
 SCRIPTPATH=$(dirname $SCRIPTFILE)
 source ${SCRIPTPATH:?}/common.bash
 # set -x  # echo commands
@@ -13,6 +13,7 @@ function bootstrap_modules() {
 
     cuda_regex=".*(_cuda_).*"
     ride_regex=".*(ride).*"
+    vortex_regex=".*(vortex).*"
     if [[ ${JOB_BASE_NAME:?} =~ ${cuda_regex} ]]; then
         if [[ ${NODE_NAME:?} =~ ${ride_regex} ]]; then
             message_std "PRDriver> " "Job is CUDA"
@@ -22,6 +23,12 @@ function bootstrap_modules() {
             module load python/3.7.3
             get_python_packages pip3
             export PYTHON_EXE=python3
+        elif [[ ${NODE_NAME:?} =~ ${vortex_regex} ]]; then
+            echo -e "Job is CUDA node is vortex"
+            module load git/2.20.0
+            module load python/3.7.2 
+            get_python_packages pip3
+            export PYTHON_EXE=python3
         else
             message_std "PRDriver> " "ERROR: Unable to find matching environment for CUDA job not on Ride."
             exit -1
@@ -72,13 +79,14 @@ bootstrap_modules
 
 # Identify the path to the trilinos repository root
 REPO_ROOT=`readlink -f ${SCRIPTPATH:?}/../..`
+test -d ${REPO_ROOT:?}/.git || REPO_ROOT=`readlink -f ${WORKSPACE:?}/Trilinos`
 message_std "PRDriver> " "REPO_ROOT : ${REPO_ROOT}"
 
 # Get the md5 checksum of this script:
-sig_script_old=$(get_md5sum ${SCRIPTFILE:?})
+sig_script_old=$(get_md5sum ${REPO_ROOT:?}/cmake/std/PullRequestLinuxDriver.sh)
 
 # Get the md5 checksum of the Merge script
-sig_merge_old=$(get_md5sum ${SCRIPTPATH}/PullRequestLinuxDriverMerge.py)
+sig_merge_old=$(get_md5sum ${REPO_ROOT:?}/cmake/std/PullRequestLinuxDriverMerge.py)
 
 
 print_banner "Merge Source into Target"
@@ -92,7 +100,7 @@ merge_cmd_options=(
     ${TRILINOS_SOURCE_SHA:?}
     ${WORKSPACE:?}
     )
-merge_cmd="${PYTHON_EXE:?} ${SCRIPTPATH}/PullRequestLinuxDriverMerge.py ${merge_cmd_options[@]}"
+merge_cmd="${PYTHON_EXE:?} ${REPO_ROOT:?}/cmake/std/PullRequestLinuxDriverMerge.py ${merge_cmd_options[@]}"
 
 
 # Call the script to handle merging the incoming branch into
@@ -110,13 +118,13 @@ print_banner "Merge completed"
 
 
 # Get the md5 checksum of this script:
-sig_script_new=$(get_md5sum ${SCRIPTFILE:?})
+sig_script_new=$(get_md5sum ${REPO_ROOT:?}/cmake/std/PullRequestLinuxDriver.sh)
 message_std "PRDriver> " "Old md5 checksum ${sig_script_old:?} for ${SCRIPTFILE:?}"
 message_std "PRDriver> " "New md5 checksum ${sig_script_new:?} for ${SCRIPTFILE:?}"
 message_std "PRDriver> " ""
 
 # Get the md5 checksum of the Merge script
-sig_merge_new=$(get_md5sum ${SCRIPTPATH}/PullRequestLinuxDriverMerge.py)
+sig_merge_new=$(get_md5sum ${REPO_ROOT:?}/cmake/std/PullRequestLinuxDriverMerge.py)
 message_std "PRDriver> " "Old md5 checksum ${sig_merge_old:?} for ${SCRIPTPATH}/PullRequestLinuxDriverMerge.py"
 message_std "PRDriver> " "New md5 checksum ${sig_merge_new:?} for ${SCRIPTPATH}/PullRequestLinuxDriverMerge.py"
 
@@ -125,7 +133,7 @@ then
     message_std "PRDriver> " ""
     message_std "PRDriver> " "Driver or Merge script change detected. Re-launching PR Driver"
     message_std "PRDriver> " ""
-    ${SCRIPTFILE:?}
+    ${REPO_ROOT:?}/cmake/std/PullRequestLinuxDriver.sh
     exit $?
 fi
 
@@ -135,7 +143,7 @@ message_std "PRDriver> " ""
 
 # determine what MODE we are using
 mode="standard"
-if [[ "${JOB_BASE_NAME}" == "Trilinos_pullrequest_gcc_8.3.0_installation_testing" ]]; then
+if [[ "${JOB_BASE_NAME:?}" == "Trilinos_pullrequest_gcc_8.3.0_installation_testing" ]]; then
     mode="installation"
 fi
 
@@ -161,7 +169,7 @@ test_cmd_options=(
 )
 
 # Execute the TEST operation
-test_cmd="${PYTHON_EXE:?} ${SCRIPTPATH}/PullRequestLinuxDriverTest.py ${test_cmd_options[@]}"
+test_cmd="${PYTHON_EXE:?} ${REPO_ROOT:?}/cmake/std/PullRequestLinuxDriverTest.py ${test_cmd_options[@]}"
 
 
 # Call the script to launch the tests

cmake/std/PullRequestLinuxGCC8.3.0TestingSettings.cmake

@@ -6,6 +6,8 @@
 
 # Usage: cmake -C PullRequestLinuxGCC8.3.0TestingSettings.cmake
 
+set (CMAKE_CXX_STANDARD "17" CACHE STRING "Set C++ standard to C++17")
+
 # Misc options typically added by CI testing mode in TriBITS
 
 # Use the below option only when submitting to the dashboard