Merge Pull Request #13658 from trilinos/Trilinos/master_merge_2024120…

…6_175820

Automatically Merged using Trilinos Master Merge AutoTester
PR Title: b'Trilinos Master Merge PR Generator: Auto PR created to promote from master_merge_20241206_175820 branch to master'
PR Author: trilinos-autotester

cmake/ProjectCompilerPostConfig.cmake

@@ -43,7 +43,7 @@ IF (KokkosEnable)
 ENDIF()
 
 set(upcoming_warnings shadow ${Trilinos_ADDITIONAL_WARNINGS})
-set(promoted_warnings parentheses sign-compare unused-variable reorder)
+set(promoted_warnings parentheses sign-compare unused-variable reorder uninitialized)
 
 if("${Trilinos_WARNINGS_MODE}" STREQUAL "WARN")
     enable_warnings("${upcoming_warnings}")

cmake/TPLs/FindTPLBLAS.cmake

@@ -22,4 +22,4 @@ if (MSVC AND NOT
 endif()
 
 tribits_tpl_find_include_dirs_and_libraries( BLAS
-  REQUIRED_LIBS_NAMES "blas blas_win32")
+  REQUIRED_LIBS_NAMES "blas blas_win32 openblas")

cmake/TPLs/FindTPLLAPACK.cmake

@@ -16,4 +16,4 @@ if (MSVC AND NOT
 endif()
 
 tribits_tpl_find_include_dirs_and_libraries( LAPACK
-  REQUIRED_LIBS_NAMES "lapack lapack_win32")
+  REQUIRED_LIBS_NAMES "lapack lapack_win32 openblas")

cmake/tribits/common_tpls/FindTPLBLAS.cmake

@@ -8,7 +8,7 @@
 # @HEADER
 
 
-set(REQUIRED_LIBS_NAMES "blas blas_win32")
+set(REQUIRED_LIBS_NAMES "blas blas_win32 openblas")
 
 #
 # Second, search for BLAS components (if allowed) using the standard

cmake/tribits/common_tpls/FindTPLLAPACK.cmake

@@ -14,7 +14,7 @@
 # to trigger the right behavior in the function
 # tribits_tpl_find_include_dirs_and_libraries().
 #
-set(REQUIRED_LIBS_NAMES "lapack lapack_win32")
+set(REQUIRED_LIBS_NAMES "lapack lapack_win32 openblas")
 
 #
 # Second, search for LAPACK components (if allowed) using the standard

packages/adelus/src/Adelus_forward.hpp

@@ -105,9 +105,11 @@ void forward(HandleType& ahandle, ZViewType& Z, RHSViewType& RHS)
       //  count_row++;
       //}
       int curr_lrid = k/nprocs_col;//note: nprocs_col (global var) cannot be read in a device function
-      Kokkos::parallel_for(Kokkos::RangePolicy<execution_space>(0,RHS.extent(1)), KOKKOS_LAMBDA (const int i) {
-        ck(0,i) = RHS(curr_lrid,i);
-      });
+      if (curr_lrid < static_cast<int>(RHS.extent(0))) { //note: to avoid out-of-bounds access on the RHS
+        Kokkos::parallel_for(Kokkos::RangePolicy<execution_space>(0,RHS.extent(1)), KOKKOS_LAMBDA (const int i) {
+          ck(0,i) = RHS(curr_lrid,i);
+        });
+      }
 
 #if defined(ADELUS_HOST_PINNED_MEM_MPI) && (defined(KOKKOS_ENABLE_CUDA) || defined(KOKKOS_ENABLE_HIP))
       Kokkos::deep_copy(h_ck,ck);

packages/framework/ini-files/config-specs.ini

@@ -392,18 +392,16 @@ opt-set-cmake-var Scotch_LIBRARY_DIRS PATH : ${SEMS_SCOTCH_LIBRARY_PATH|ENV}
 # Explicit libraries
 opt-set-cmake-var TPL_DLlib_LIBRARIES PATH : ${DL_LIBRARIES|ENV}
 opt-set-cmake-var TPL_Netcdf_LIBRARIES STRING : ${SEMS_NETCDF_LIBRARY_PATH|ENV}/libnetcdf.so;${SEMS_NETCDF_LIBRARY_PATH|ENV}/libpnetcdf.a
-opt-set-cmake-var TPL_BLAS_LIBRARIES STRING : ${BLAS_LIBRARIES|ENV}
-opt-set-cmake-var TPL_LAPACK_LIBRARIES STRING : ${LAPACK_LIBRARIES|ENV}
 
-[COMMON_SPACK_TPLS]
-use COMMON
-
-# BLAS & LAPACK
+[SPACK_NETLIB_BLAS_LAPACK]
 opt-set-cmake-var TPL_BLAS_LIBRARIES STRING FORCE : -L${BLAS_ROOT|ENV}/lib;-lblas;-lgfortran;-lgomp
 opt-set-cmake-var TPL_BLAS_LIBRARY_DIRS STRING FORCE : ${BLAS_ROOT|ENV}/lib
 opt-set-cmake-var TPL_LAPACK_LIBRARIES STRING FORCE : -L${BLAS_ROOT|ENV}/lib;-llapack;-lgfortran;-lgomp
 opt-set-cmake-var TPL_LAPACK_LIBRARY_DIRS STRING FORCE : ${BLAS_ROOT|ENV}/lib
 
+[COMMON_SPACK_TPLS]
+use COMMON
+
 # Boost
 opt-set-cmake-var BoostLib_INCLUDE_DIRS PATH FORCE : ${BOOST_INC|ENV}
 opt-set-cmake-var BoostLib_LIBRARY_DIRS PATH FORCE : ${BOOST_LIB|ENV}
@@ -460,8 +458,6 @@ use COMMON_SPACK_TPLS
 
 # Overrides from [COMMON_SPACK_TPLS] to let container handle the values
 opt-set-cmake-var TPL_Netcdf_LIBRARIES STRING FORCE : ""
-opt-set-cmake-var TPL_BLAS_LIBRARIES   STRING FORCE : ""
-opt-set-cmake-var TPL_LAPACK_LIBRARIES STRING FORCE : ""
 opt-set-cmake-var TPL_HDF5_LIBRARIES   STRING FORCE : ""
 
 opt-set-cmake-var SuperLU_LIBRARY_NAMES STRING FORCE : superlu;m
@@ -1176,11 +1172,7 @@ opt-set-cmake-var Rythmos_StepperBuilder_UnitTest_MPI_1_DISABLE BOOL : ON
 
 [RHEL_COMPILER|CUDA]
 use NODE-TYPE|CUDA
-opt-set-cmake-var MPI_EXEC                  FILEPATH     : mpiexec
-opt-set-cmake-var TPL_BLAS_LIBRARY_DIRS     STRING FORCE : ${CBLAS_ROOT|ENV}/lib
-opt-set-cmake-var TPL_BLAS_LIBRARIES        STRING FORCE : ${CBLAS_ROOT|ENV}/lib/libblas.a;-L${CBLAS_ROOT|ENV}/lib;-lgfortran;-lgomp;-lm
-opt-set-cmake-var TPL_LAPACK_LIBRARY_DIRS   STRING FORCE : ${LAPACK_ROOT|ENV}/lib
-opt-set-cmake-var TPL_LAPACK_LIBRARIES      STRING FORCE : -L${LAPACK_ROOT|ENV}/lib;-lgfortran;-lgomp;${LAPACK_ROOT|ENV}/lib/liblapack.a
+opt-set-cmake-var MPI_EXEC FILEPATH : mpiexec
 
 [COMPILER|GNU]
 opt-set-cmake-var MPI_EXEC FILEPATH : mpirun
@@ -1189,8 +1181,7 @@ opt-set-cmake-var Trilinos_WARNINGS_MODE STRING : WARN
 [COMPILER|INTEL]
 opt-set-cmake-var MPI_EXEC FILEPATH : mpirun
 
-[SEMS_COMMON_CUDA]
-# TPL ENABLE/DISABLE settings
+[CUDA_TPL_ENABLES]
 opt-set-cmake-var TPL_ENABLE_BLAS BOOL FORCE : ON
 opt-set-cmake-var TPL_ENABLE_BinUtils BOOL FORCE : OFF
 opt-set-cmake-var TPL_ENABLE_Boost BOOL FORCE : ON
@@ -1211,20 +1202,21 @@ opt-set-cmake-var TPL_ENABLE_Scotch BOOL FORCE : OFF
 opt-set-cmake-var TPL_ENABLE_SuperLU BOOL FORCE : OFF
 opt-set-cmake-var TPL_ENABLE_SuperLUDist BOOL FORCE : OFF
 opt-set-cmake-var TPL_ENABLE_Zlib BOOL FORCE : ON
+opt-set-cmake-var EpetraExt_ENABLE_HDF5 BOOL FORCE : OFF
+opt-set-cmake-var Kokkos_ENABLE_CUDA BOOL FORCE : ON
+opt-set-cmake-var Zoltan_ENABLE_Scotch BOOL FORCE : OFF
 
-#TPL_*_LIBRARIES
-opt-set-cmake-var TPL_BLAS_LIBRARIES STRING FORCE : -L${BLAS_ROOT|ENV}/lib;-lopenblas;-lgfortran;-lgomp
-opt-set-cmake-var TPL_BLAS_LIBRARY_DIRS STRING FORCE : ${BLAS_ROOT|ENV}/lib
+[SEMS_CUDA_TPL_LOCATIONS]
 opt-set-cmake-var TPL_BoostLib_LIBRARIES STRING FORCE : ${BOOST_LIB|ENV}/libboost_program_options.a;${BOOST_LIB|ENV}/libboost_system.a
 opt-set-cmake-var TPL_Boost_LIBRARIES STRING FORCE : ${BOOST_LIB|ENV}/libboost_program_options.a;${BOOST_LIB|ENV}/libboost_system.a
 opt-set-cmake-var TPL_DLlib_LIBRARIES FILEPATH FORCE : "-ldl"
 opt-set-cmake-var TPL_HDF5_LIBRARIES STRING FORCE : ${HDF5_LIB|ENV}/libhdf5_hl.so;${HDF5_LIB|ENV}/libhdf5.a;${ZLIB_LIB|ENV}/libz.a;-ldl
-opt-set-cmake-var TPL_LAPACK_LIBRARIES STRING FORCE : -L${BLAS_ROOT|ENV}/lib;-lopenblas;-lgfortran;-lgomp
-opt-set-cmake-var TPL_LAPACK_LIBRARY_DIRS STRING FORCE : ${BLAS_ROOT|ENV}/lib
 opt-set-cmake-var TPL_METIS_LIBRARIES STRING FORCE : ${METIS_LIB|ENV}/libmetis.so
 opt-set-cmake-var TPL_Netcdf_LIBRARIES STRING FORCE : -L${NETCDF_C_ROOT|ENV}/lib64;${NETCDF_C_ROOT|ENV}/lib/libnetcdf.a;${PARALLEL_NETCDF_ROOT|ENV}/lib/libpnetcdf.a;${TPL_HDF5_LIBRARIES|CMAKE}
+# see https://github.com/trilinos/Trilinos/issues/11109#issuecomment-1272146298
+opt-set-cmake-var TPL_BLAS_LIBRARIES STRING FORCE : /lib64/libblas.so.3
+opt-set-cmake-var TPL_LAPACK_LIBRARIES STRING FORCE : /lib64/liblapack.so.3
 
-#TPL_[INCLUDE|LIBRARY]_DIRS
 opt-set-cmake-var Netcdf_INCLUDE_DIRS STRING FORCE : ${NETCDF_C_INC|ENV}
 opt-set-cmake-var ParMETIS_INCLUDE_DIRS STRING FORCE : ${PARMETIS_INC|ENV}
 opt-set-cmake-var ParMETIS_LIBRARY_DIRS STRING FORCE : ${PARMETIS_LIB|ENV}
@@ -1233,12 +1225,13 @@ opt-set-cmake-var Scotch_LIBRARY_DIRS STRING FORCE : ${SCOTCH_LIB|ENV}
 opt-set-cmake-var SuperLU_INCLUDE_DIRS STRING FORCE : ${SUPERLU_INC|ENV}
 opt-set-cmake-var SuperLU_LIBRARY_DIRS STRING FORCE : ${SUPERLU_LIB|ENV}
 
+[CUDA]
+use CUDA_TPL_ENABLES
+
 #CXX Settings
 opt-set-cmake-var CMAKE_CXX_FLAGS STRING : -fPIC -Wall -Warray-bounds -Wchar-subscripts -Wcomment -Wenum-compare -Wformat -Wuninitialized -Wmaybe-uninitialized -Wmain -Wnarrowing -Wnonnull -Wreorder -Wreturn-type -Wsequence-point -Wtrigraphs -Wunused-function -Wunused-but-set-variable -Wwrite-strings
 
 #Package Options
-opt-set-cmake-var EpetraExt_ENABLE_HDF5 BOOL FORCE : OFF
-opt-set-cmake-var Kokkos_ENABLE_CUDA BOOL FORCE : ON
 opt-set-cmake-var Kokkos_ENABLE_CUDA_LAMBDA BOOL FORCE : ON
 opt-set-cmake-var Kokkos_ENABLE_CXX11_DISPATCH_LAMBDA BOOL FORCE : ON
 #opt-set-cmake-var Kokkos_ENABLE_Debug_Bounds_Check BOOL FORCE : ON
@@ -1247,10 +1240,15 @@ opt-set-cmake-var Panzer_FADTYPE STRING FORCE : "Sacado::Fad::DFad<RealType>"
 opt-set-cmake-var Phalanx_KOKKOS_DEVICE_TYPE STRING FORCE : CUDA
 opt-set-cmake-var Sacado_ENABLE_HIERARCHICAL_DFAD BOOL FORCE : ON
 opt-set-cmake-var Tpetra_INST_SERIAL BOOL FORCE : ON
-opt-set-cmake-var Zoltan_ENABLE_Scotch BOOL FORCE : OFF
 
-[CUDA11-RUN-SERIAL-TESTS]
+[SEMS_COMMON_CUDA]
+use CUDA
+use SEMS_CUDA_TPL_LOCATIONS
+
+[CUDA-RUN-SERIAL-TESTS]
 opt-set-cmake-var Kokkos_CoreUnitTest_Cuda1_SET_RUN_SERIAL BOOL FORCE : ON
+opt-set-cmake-var Kokkos_CoreUnitTest_CudaTimingBased_SET_RUN_SERIAL BOOL FORCE : ON
+opt-set-cmake-var Kokkos_CoreUnitTest_Default_SET_RUN_SERIAL BOOL FORCE : ON
 opt-set-cmake-var KokkosKernels_sparse_cuda_MPI_1_SET_RUN_SERIAL BOOL FORCE : ON
 opt-set-cmake-var KokkosKernels_batched_dla_cuda_MPI_1_SET_RUN_SERIAL BOOL FORCE : ON
 opt-set-cmake-var Intrepid2_unit-test_MonolithicExecutable_Intrepid2_Tests_MPI_1_SET_RUN_SERIAL BOOL FORCE : ON
@@ -1335,6 +1333,7 @@ use USE-DEPRECATED|YES
 use PACKAGE-ENABLES|NO-PACKAGE-ENABLES
 
 use COMMON_SPACK_TPLS
+use SPACK_NETLIB_BLAS_LAPACK
 
 opt-set-cmake-var MPI_EXEC_PRE_NUMPROCS_FLAGS                   STRING     : --bind-to;none --mca btl vader,self
 opt-set-cmake-var Teko_DISABLE_LSCSTABALIZED_TPETRA_ALPAH_INV_D BOOL       : ON
@@ -1375,6 +1374,7 @@ use USE-UVM|NO
 use USE-DEPRECATED|YES
 use PACKAGE-ENABLES|NO-PACKAGE-ENABLES
 use COMMON_SPACK_TPLS
+use SPACK_NETLIB_BLAS_LAPACK
 
 opt-set-cmake-var MPI_EXEC_PRE_NUMPROCS_FLAGS                   STRING     : --bind-to;none --mca btl vader,self
 
@@ -1468,14 +1468,10 @@ opt-set-cmake-var TPL_ENABLE_SuperLUDist BOOL FORCE : OFF
 opt-set-cmake-var TPL_ENABLE_Zlib BOOL FORCE : ON
 
 #TPL_*_LIBRARIES
-# see https://github.com/trilinos/Trilinos/issues/11109#issuecomment-1272146298
-opt-set-cmake-var TPL_BLAS_LIBRARIES STRING FORCE : /lib64/libblas.so.3
 opt-set-cmake-var TPL_BoostLib_LIBRARIES STRING FORCE : ${BOOST_LIB|ENV}/libboost_program_options.a;${BOOST_LIB|ENV}/libboost_system.a
 opt-set-cmake-var TPL_Boost_LIBRARIES STRING FORCE : ${BOOST_LIB|ENV}/libboost_program_options.a;${BOOST_LIB|ENV}/libboost_system.a
 opt-set-cmake-var TPL_DLlib_LIBRARIES FILEPATH FORCE : "-ldl"
 opt-set-cmake-var TPL_HDF5_LIBRARIES STRING FORCE : ${HDF5_LIB|ENV}/libhdf5_hl.so;${HDF5_LIB|ENV}/libhdf5.a;${ZLIB_LIB|ENV}/libz.a;-ldl
-# see https://github.com/trilinos/Trilinos/issues/11109#issuecomment-1272146298
-opt-set-cmake-var TPL_LAPACK_LIBRARIES STRING FORCE : /lib64/liblapack.so.3
 opt-set-cmake-var TPL_METIS_LIBRARIES STRING FORCE : ${METIS_LIB|ENV}/libmetis.so
 opt-set-cmake-var TPL_Netcdf_LIBRARIES STRING FORCE : -L${NETCDF_C_ROOT|ENV}/lib64;${NETCDF_C_ROOT|ENV}/lib/libnetcdf.a;${PARALLEL_NETCDF_ROOT|ENV}/lib/libpnetcdf.a;${TPL_HDF5_LIBRARIES|CMAKE}
 
@@ -1532,7 +1528,7 @@ opt-set-cmake-var Adelus_vector_random_npr4_rhs1_MPI_4_DISABLE BOOL : ON
 
 use PACKAGE-ENABLES|NO-EPETRA
 
-use CUDA11-RUN-SERIAL-TESTS
+use CUDA-RUN-SERIAL-TESTS
 
 [rhel8_sems-cuda-11.4.2-sems-gnu-10.1.0-sems-openmpi-4.1.4_release_static_Volta70_no-asan_complex_no-fpic_mpi_pt_no-rdc_no-uvm_deprecated-on_all]
 # uses sems-v2 modules
@@ -1561,15 +1557,20 @@ use PACKAGE-ENABLES|NO-PACKAGE-ENABLES
 use PACKAGE-ENABLES|NO-EPETRA
 use COMMON_SPACK_TPLS
 use SEMS_COMMON_CUDA
-
-use CUDA11-RUN-SERIAL-TESTS
+use CUDA-RUN-SERIAL-TESTS
 
 opt-set-cmake-var Trilinos_ENABLE_TESTS BOOL FORCE : OFF
 
 [rhel8_sems-cuda-11.4.2-gnu-10.1.0-openmpi-4.1.6_release_static_Volta70_no-asan_complex_no-fpic_mpi_pt_no-rdc_uvm_deprecated-on_all]
 use rhel8_sems-cuda-11.4.2-gnu-10.1.0-openmpi-4.1.6_release_static_Volta70_no-asan_complex_no-fpic_mpi_pt_no-rdc_uvm_deprecated-on_no-package-enables
 use PACKAGE-ENABLES|ALL-NO-EPETRA
 
+[rhel8_sems-cuda-11.4.2-gnu-10.1.0-openmpi-4.1.6_release_static_Volta70_no-asan_complex_no-fpic_mpi_pt_no-rdc_uvm_deprecated-on_all-no-epetra]
+use rhel8_sems-cuda-11.4.2-gnu-10.1.0-openmpi-4.1.6_release_static_Volta70_no-asan_complex_no-fpic_mpi_pt_no-rdc_uvm_deprecated-on_all
+
+use CUDA-RUN-SERIAL-TESTS
+opt-set-cmake-var Trilinos_ENABLE_TESTS BOOL FORCE : ON
+
 [rhel8_sems-cuda-11.4.2-gnu-10.1.0-openmpi-4.1.6_release_static_Volta70_no-asan_complex_no-fpic_mpi_pt_no-rdc_no-uvm_deprecated-on_no-package-enables]
 # uses sems-v2 modules
 use RHEL8
@@ -1615,14 +1616,10 @@ opt-set-cmake-var TPL_ENABLE_SuperLUDist BOOL FORCE : OFF
 opt-set-cmake-var TPL_ENABLE_Zlib BOOL FORCE : ON
 
 #TPL_*_LIBRARIES
-# see https://github.com/trilinos/Trilinos/issues/11109#issuecomment-1272146298
-opt-set-cmake-var TPL_BLAS_LIBRARIES STRING FORCE : /lib64/libblas.so.3
 opt-set-cmake-var TPL_BoostLib_LIBRARIES STRING FORCE : ${BOOST_LIB|ENV}/libboost_program_options.a;${BOOST_LIB|ENV}/libboost_system.a
 opt-set-cmake-var TPL_Boost_LIBRARIES STRING FORCE : ${BOOST_LIB|ENV}/libboost_program_options.a;${BOOST_LIB|ENV}/libboost_system.a
 opt-set-cmake-var TPL_DLlib_LIBRARIES FILEPATH FORCE : "-ldl"
 opt-set-cmake-var TPL_HDF5_LIBRARIES STRING FORCE : ${HDF5_LIB|ENV}/libhdf5_hl.so;${HDF5_LIB|ENV}/libhdf5.a;${ZLIB_LIB|ENV}/libz.a;-ldl
-# see https://github.com/trilinos/Trilinos/issues/11109#issuecomment-1272146298
-opt-set-cmake-var TPL_LAPACK_LIBRARIES STRING FORCE : /lib64/liblapack.so.3
 opt-set-cmake-var TPL_METIS_LIBRARIES STRING FORCE : ${METIS_LIB|ENV}/libmetis.so
 opt-set-cmake-var TPL_Netcdf_LIBRARIES STRING FORCE : -L${NETCDF_C_ROOT|ENV}/lib64;${NETCDF_C_ROOT|ENV}/lib/libnetcdf.a;${PARALLEL_NETCDF_ROOT|ENV}/lib/libpnetcdf.a;${TPL_HDF5_LIBRARIES|CMAKE}
 
@@ -1678,7 +1675,7 @@ opt-set-cmake-var Adelus_vector_random_npr4_rhs1_MPI_4_DISABLE BOOL : ON
 
 use PACKAGE-ENABLES|NO-EPETRA
 
-use CUDA11-RUN-SERIAL-TESTS
+use CUDA-RUN-SERIAL-TESTS
 
 [rhel8_sems-cuda-11.4.2-gnu-10.1.0-openmpi-4.1.6_release_static_Volta70_no-asan_complex_no-fpic_mpi_pt_no-rdc_no-uvm_deprecated-on_all]
 # uses sems-v2 modules
@@ -1703,6 +1700,7 @@ use USE-DEPRECATED|YES
 use PACKAGE-ENABLES|NO-PACKAGE-ENABLES
 
 use COMMON_SPACK_TPLS
+use SPACK_NETLIB_BLAS_LAPACK
 
 opt-set-cmake-var SuperLU_LIBRARY_NAMES STRING : superlu;m
 opt-set-cmake-var ML_ENABLE_SuperLU BOOL FORCE : OFF
@@ -1739,6 +1737,7 @@ use USE-DEPRECATED|YES
 use PACKAGE-ENABLES|NO-PACKAGE-ENABLES
 
 use COMMON_SPACK_TPLS
+use SPACK_NETLIB_BLAS_LAPACK
 
 opt-set-cmake-var MPI_EXEC_PRE_NUMPROCS_FLAGS                   STRING       : --bind-to;none --mca btl vader,self
 opt-set-cmake-var CMAKE_CXX_EXTENSIONS                          BOOL         : OFF
@@ -1773,6 +1772,7 @@ use USE-DEPRECATED|YES
 use PACKAGE-ENABLES|NO-PACKAGE-ENABLES
 
 use COMMON_SPACK_TPLS
+use SPACK_NETLIB_BLAS_LAPACK
 
 opt-set-cmake-var SuperLU_LIBRARY_NAMES STRING FORCE : superlu;m
 opt-set-cmake-var ML_ENABLE_SuperLU     BOOL   FORCE : OFF
@@ -1877,11 +1877,6 @@ use PACKAGE-ENABLES|NO-PACKAGE-ENABLES
 
 use COMMON_SPACK_TPLS
 
-opt-set-cmake-var TPL_BLAS_LIBRARY_DIRS     STRING FORCE : ${OPENBLAS_ROOT|ENV}/lib
-opt-set-cmake-var TPL_BLAS_LIBRARIES        STRING FORCE : ${OPENBLAS_ROOT|ENV}/lib/libopenblas.a;-L${OPENBLAS_ROOT|ENV}/lib;-lgfortran;-lgomp;-lm
-opt-set-cmake-var TPL_LAPACK_LIBRARY_DIRS   STRING FORCE : ${OPENBLAS_ROOT|ENV}/lib
-opt-set-cmake-var TPL_LAPACK_LIBRARIES      STRING FORCE : ${OPENBLAS_ROOT|ENV}/lib/libopenblas.a;-L${OPENBLAS_ROOT|ENV}/lib;-lgfortran;-lgomp;-lm
-
 opt-set-cmake-var MPI_EXEC_PRE_NUMPROCS_FLAGS                                STRING       : --bind-to;none --mca btl vader,self
 opt-set-cmake-var CMAKE_CXX_FLAGS                                            STRING FORCE : -Wall -Wno-clobbered -Wno-vla -Wno-pragmas -Wno-unknown-pragmas -Wno-unused-local-typedefs -Wno-literal-suffix -Wno-deprecated-declarations -Wno-misleading-indentation -Wno-int-in-bool-context -Wno-maybe-uninitialized -Wno-nonnull-compare -Wno-address -Wno-inline
 
@@ -1934,11 +1929,6 @@ use COMMON_SPACK_TPLS
 
 opt-set-cmake-var CMAKE_CXX_FLAGS                STRING       : -Wall -Wno-clobbered -Wno-vla -Wno-pragmas -Wno-unknown-pragmas -Wno-unused-local-typedefs -Wno-literal-suffix -Wno-deprecated-declarations -Wno-misleading-indentation -Wno-int-in-bool-context -Wno-maybe-uninitialized -Wno-class-memaccess -Wno-nonnull-compare -Wno-address -Wno-inline -Wno-unused-but-set-variable -Wno-unused-label
 
-opt-set-cmake-var TPL_BLAS_LIBRARY_DIRS     STRING FORCE : ${OPENBLAS_ROOT|ENV}/lib
-opt-set-cmake-var TPL_BLAS_LIBRARIES        STRING FORCE : ${OPENBLAS_ROOT|ENV}/lib/libopenblas.a;-L${OPENBLAS_ROOT|ENV}/lib;-lgfortran;-lgomp;-lm
-opt-set-cmake-var TPL_LAPACK_LIBRARY_DIRS   STRING FORCE : ${OPENBLAS_ROOT|ENV}/lib
-opt-set-cmake-var TPL_LAPACK_LIBRARIES      STRING FORCE : ${OPENBLAS_ROOT|ENV}/lib/libopenblas.a;-L${OPENBLAS_ROOT|ENV}/lib;-lgfortran;-lgomp;-lm
-
 opt-set-cmake-var TPL_Netcdf_LIBRARIES      STRING FORCE : ""
 
 opt-set-cmake-var TPL_ENABLE_ParMETIS       BOOL FORCE   : OFF
@@ -2112,15 +2102,16 @@ use USE-RDC|NO
 use USE-UVM|NO
 use USE-DEPRECATED|YES
 use PACKAGE-ENABLES|NO-EPETRA
-use SEMS_COMMON_CUDA
+use CUDA
+use CUDA-RUN-SERIAL-TESTS
+
 opt-set-cmake-var Trilinos_ENABLE_TESTS BOOL : ON
 opt-set-cmake-var TPL_ENABLE_X11 BOOL : OFF
 opt-set-cmake-var MPI_EXEC_PRE_NUMPROCS_FLAGS STRING FORCE : --bind-to;none --mca btl ^smcuda
 opt-set-cmake-var Kokkos_ENABLE_IMPL_CUDA_MALLOC_ASYNC BOOL : OFF
 
 [rhel8_cuda-11-gcc-openmpi_release_static_Ampere80_no-asan_complex_no-fpic_mpi_pt_no-rdc_no-uvm_deprecated-on_no-package-enables]
 use rhel8_cuda-gcc-openmpi_release_static_Ampere80_no-asan_complex_no-fpic_mpi_pt_no-rdc_no-uvm_deprecated-on_no-package-enables
-use CUDA11-RUN-SERIAL-TESTS
 opt-set-cmake-var ROL_test_elementwise_TpetraMultiVector_MPI_4_DISABLE BOOL : ON
 
 [rhel8_cuda-gcc-openmpi_release_static_Ampere80_no-asan_complex_no-fpic_mpi_pt_no-rdc_uvm_deprecated-on_no-package-enables]
@@ -2138,13 +2129,12 @@ use USE-RDC|NO
 use USE-UVM|YES
 use USE-DEPRECATED|YES
 use PACKAGE-ENABLES|NO-EPETRA
-use SEMS_COMMON_CUDA
-use CUDA11-RUN-SERIAL-TESTS
+use CUDA
+use CUDA-RUN-SERIAL-TESTS
 
 opt-set-cmake-var Trilinos_ENABLE_TESTS BOOL FORCE : OFF
 opt-set-cmake-var Kokkos_ENABLE_TESTS BOOL FORCE : ON
 
-
 [rhel8_python_debug_shared_no-kokkos-arch_no-asan_no-complex_no-fpic_no-mpi_no-pt_no-rdc_no-uvm_deprecated-on_pr-framework]
 use PACKAGE-ENABLES|PR-FRAMEWORK
 

packages/framework/pr_tools/LaunchDriver.py

@@ -116,8 +116,11 @@ def main(argv):
   if args.kokkos_develop:
      cmd += " --kokkos-develop"
 
+  # extra-configure-args flag currently takes precedence over the env. var.
   if args.extra_configure_args:
      cmd += f" --extra-configure-args=\"{args.extra_configure_args}\""
+  elif os.getenv("EXTRA_CONFIGURE_ARGS"):
+     cmd += f" --extra-configure-args=\"{os.getenv('EXTRA_CONFIGURE_ARGS')}\""
 
   print("LaunchDriver> EXEC: " + cmd, flush=True)
 

packages/framework/pr_tools/trilinosprhelpers/TrilinosPRConfigurationBase.py

@@ -801,7 +801,8 @@ def prepare_test(self):
             "F77",
             "F90",
             "FC",
-            "MODULESHOME"
+            "MODULESHOME",
+            "EXTRA_CONFIGURE_ARGS"
             ]
         self.message("")
         tr_env.set_environment.pretty_print_envvars(envvar_filter=envvars_to_print)

packages/framework/pr_tools/trilinosprhelpers/TrilinosPRConfigurationStandard.py

@@ -17,7 +17,7 @@ class TrilinosPRConfigurationStandard(TrilinosPRConfigurationBase):
     Implements Standard mode Trilinos Pull Request Driver
     """
     def __init__(self, args):
-        super(TrilinosPRConfigurationStandard, self).__init__(args)
+        super().__init__(args)
 
 
     def execute_test(self):

packages/framework/pr_tools/unittests/test_PullRequestLinuxDriverTest.py

@@ -84,6 +84,7 @@ def setUp(self):
                                          req_mem_per_core=3.0,
                                          max_cores_allowed=12,
                                          num_concurrent_tests=-1,
+                                         slots_per_gpu=2,
                                          ccache_enable=False,
                                          dry_run=False,
                                          use_explicit_cachefile=False,