Merge Pull Request #13638 from trilinos/Trilinos/master_merge_2024112…

…9_175819

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

.github/workflows/AT2.yml

@@ -92,7 +92,7 @@ jobs:
 
           printf "\n\n\n"
 
-          echo "image: ${AT2_IMAGE:-unknown}"
+          echo "image: ${AT2_IMAGE_FULLPATH:-${AT2_IMAGE:-unknown}}"
 
           python3 ${GITHUB_WORKSPACE}/packages/framework/pr_tools/PullRequestLinuxDriverTest.py \
             --target-branch-name ${{ github.event.pull_request.base.ref }} \
@@ -103,18 +103,20 @@ jobs:
             --workspace-dir /home/runner/_work/Trilinos \
             --source-dir ${GITHUB_WORKSPACE} \
             --build-dir /home/Trilinos/build \
-            --dashboard-build-name `cat /etc/hostname` \
+            --dashboard-build-name=PR-${{ github.event.pull_request.number }}_${AT2_IMAGE}_debug_shared \
             --ctest-driver /home/runner/_work/Trilinos/Trilinos/cmake/SimpleTesting/cmake/ctest-driver.cmake \
             --ctest-drop-site sems-cdash-son.sandia.gov/cdash \
             --filename-subprojects ./package_subproject_list.cmake \
-            --filename-packageenables ./packageEnables.cmake
+            --filename-packageenables ./packageEnables.cmake \
+            --max-cores-allowed=29 \
+            --num-concurrent-tests=16
       - name: Summary
         if: ${{ !cancelled() }}
         shell: bash -l {0}
         working-directory: /home/Trilinos/build
         run: |
           echo "## Image" >> $GITHUB_STEP_SUMMARY
-          echo "image: ${AT2_IMAGE:-unknown}" >> $GITHUB_STEP_SUMMARY
+          echo "image: ${AT2_IMAGE_FULLPATH:-${AT2_IMAGE:-unknown}}" >> $GITHUB_STEP_SUMMARY
           echo "## CDash Links" >> $GITHUB_STEP_SUMMARY
           echo "### Current Build" >> $GITHUB_STEP_SUMMARY
           AT2_URL=$(</home/runner/AT2_URL.txt)
@@ -183,7 +185,7 @@ jobs:
 
           printf "\n\n\n"
 
-          echo "image: ${AT2_IMAGE:-unknown}"
+          echo "image: ${AT2_IMAGE_FULLPATH:-${AT2_IMAGE:-unknown}}"
 
           python3 ${GITHUB_WORKSPACE}/packages/framework/pr_tools/PullRequestLinuxDriverTest.py \
             --target-branch-name ${{ github.event.pull_request.base.ref }} \
@@ -194,18 +196,20 @@ jobs:
             --workspace-dir /home/runner/_work/Trilinos \
             --source-dir ${GITHUB_WORKSPACE} \
             --build-dir /home/Trilinos/build \
-            --dashboard-build-name `cat /etc/hostname` \
+            --dashboard-build-name=PR-${{ github.event.pull_request.number }}_${AT2_IMAGE}_release-debug_shared \
             --ctest-driver /home/runner/_work/Trilinos/Trilinos/cmake/SimpleTesting/cmake/ctest-driver.cmake \
             --ctest-drop-site sems-cdash-son.sandia.gov/cdash \
             --filename-subprojects ./package_subproject_list.cmake \
-            --filename-packageenables ./packageEnables.cmake
+            --filename-packageenables ./packageEnables.cmake \
+            --max-cores-allowed=29 \
+            --num-concurrent-tests=16
       - name: Summary
         if: ${{ !cancelled() }}
         shell: bash -l {0}
         working-directory: /home/Trilinos/build
         run: |
           echo "## Image" >> $GITHUB_STEP_SUMMARY
-          echo "image: ${AT2_IMAGE:-unknown}" >> $GITHUB_STEP_SUMMARY
+          echo "image: ${AT2_IMAGE_FULLPATH:-${AT2_IMAGE:-unknown}}" >> $GITHUB_STEP_SUMMARY
           echo "## CDash Links" >> $GITHUB_STEP_SUMMARY
           echo "### Current Build" >> $GITHUB_STEP_SUMMARY
           AT2_URL=$(</home/runner/AT2_URL.txt)
@@ -217,7 +221,7 @@ jobs:
           echo "https://github.com/trilinos/Trilinos/wiki/Containers" >> $GITHUB_STEP_SUMMARY
           echo "https://gitlab-ex.sandia.gov/trilinos-project/trilinos-containers/-/wikis/Containers-at-Sandia" >> $GITHUB_STEP_SUMMARY
 
-  cuda11-uvm-EXPERIMENTAL:
+  cuda11-EXPERIMENTAL:
     needs: pre-checks
     runs-on: [self-hosted, cuda-11.4.2_gcc-10.3.0_openmpi-4.1.6]
     if: ${{ needs.pre-checks.outputs.should_skip != 'true' && (github.event.action == 'synchronize' || github.event.action == 'opened' || github.event.review.state == 'APPROVED') }}
@@ -273,31 +277,32 @@ jobs:
 
           printf "\n\n\n"
 
-          echo "image: ${AT2_IMAGE:-unknown}"
+          echo "image: ${AT2_IMAGE_FULLPATH:-${AT2_IMAGE:-unknown}}"
           type python
           python3 ${GITHUB_WORKSPACE}/packages/framework/pr_tools/PullRequestLinuxDriverTest.py \
             --target-branch-name ${{ github.event.pull_request.base.ref }} \
-            --genconfig-build-name rhel8_cuda-gcc-openmpi_release_static_Ampere80_no-asan_complex_no-fpic_mpi_pt_no-rdc_uvm_deprecated-on_no-package-enables \
+            --genconfig-build-name rhel8_cuda-11-gcc-openmpi_release_static_Ampere80_no-asan_complex_no-fpic_mpi_pt_no-rdc_no-uvm_deprecated-on_no-package-enables \
             --pullrequest-number ${{ github.event.pull_request.number }} \
             --pullrequest-env-config-file ${GITHUB_WORKSPACE}/packages/framework/pr_tools/trilinos_pr.ini \
             --pullrequest-gen-config-file ${GITHUB_WORKSPACE}/packages/framework/GenConfig/src/gen-config.ini \
             --workspace-dir /home/runner/_work/Trilinos \
             --source-dir ${GITHUB_WORKSPACE} \
             --build-dir /home/Trilinos/build \
-            --dashboard-build-name `cat /etc/hostname` \
+            --dashboard-build-name=PR-${{ github.event.pull_request.number }}_${AT2_IMAGE}_release_static_uvm \
             --ctest-driver /home/runner/_work/Trilinos/Trilinos/cmake/SimpleTesting/cmake/ctest-driver.cmake \
             --ctest-drop-site sems-cdash-son.sandia.gov/cdash \
             --filename-subprojects ./package_subproject_list.cmake \
             --filename-packageenables ./packageEnables.cmake \
-            --max-cores-allowed=96 \
-            --num-concurrent-tests=96
+            --max-cores-allowed=56 \
+            --num-concurrent-tests=112 \
+            --slots-per-gpu=8
       - name: Summary
         if: ${{ !cancelled() }}
         shell: bash -l {0}
         working-directory: /home/Trilinos/build
         run: |
           echo "## Image" >> $GITHUB_STEP_SUMMARY
-          echo "image: ${AT2_IMAGE:-unknown}" >> $GITHUB_STEP_SUMMARY
+          echo "image: ${AT2_IMAGE_FULLPATH:-${AT2_IMAGE:-unknown}}" >> $GITHUB_STEP_SUMMARY
           echo "## CDash Links" >> $GITHUB_STEP_SUMMARY
           echo "### Current Build" >> $GITHUB_STEP_SUMMARY
           AT2_URL=$(</home/runner/AT2_URL.txt)
@@ -365,7 +370,7 @@ jobs:
 
           printf "\n\n\n"
 
-          echo "image: ${AT2_IMAGE:-unknown}"
+          echo "image: ${AT2_IMAGE_FULLPATH:-${AT2_IMAGE:-unknown}}"
           type python
           python3 ${GITHUB_WORKSPACE}/packages/framework/pr_tools/PullRequestLinuxDriverTest.py \
             --target-branch-name ${{ github.event.pull_request.base.ref }} \
@@ -376,7 +381,7 @@ jobs:
             --workspace-dir /home/runner/_work/Trilinos \
             --source-dir ${GITHUB_WORKSPACE} \
             --build-dir /home/Trilinos/build \
-            --dashboard-build-name `cat /etc/hostname` \
+            --dashboard-build-name=PR-${{ github.event.pull_request.number }}_${AT2_IMAGE}_framework-tests \
             --ctest-driver /home/runner/_work/Trilinos/Trilinos/cmake/SimpleTesting/cmake/ctest-driver.cmake \
             --ctest-drop-site sems-cdash-son.sandia.gov/cdash \
             --filename-subprojects ./package_subproject_list.cmake \
@@ -387,7 +392,7 @@ jobs:
         working-directory: /home/Trilinos/build
         run: |
           echo "## Image" >> $GITHUB_STEP_SUMMARY
-          echo "image: ${AT2_IMAGE:-unknown}" >> $GITHUB_STEP_SUMMARY
+          echo "image: ${AT2_IMAGE_FULLPATH:-${AT2_IMAGE:-unknown}}" >> $GITHUB_STEP_SUMMARY
           echo "## CDash Links" >> $GITHUB_STEP_SUMMARY
           echo "### Current Build" >> $GITHUB_STEP_SUMMARY
           AT2_URL=$(</home/runner/AT2_URL.txt)
@@ -398,4 +403,3 @@ jobs:
           echo "## Helpful Links" >> $GITHUB_STEP_SUMMARY
           echo "https://github.com/trilinos/Trilinos/wiki/Containers" >> $GITHUB_STEP_SUMMARY
           echo "https://gitlab-ex.sandia.gov/trilinos-project/trilinos-containers/-/wikis/Containers-at-Sandia" >> $GITHUB_STEP_SUMMARY
-

.github/workflows/codeql.yml

@@ -45,7 +45,7 @@ jobs:
       uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@662472033e021d55d94146f66f6058822b0b39fd # v3.27.0
+      uses: github/codeql-action/init@f09c1c0a94de965c15400f5634aa42fac8fb8f88 # v3.27.5
       with:
         languages: ${{ matrix.language }}
         build-mode: ${{ matrix.build-mode }}
@@ -108,6 +108,6 @@ jobs:
           ninja -j 16
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@662472033e021d55d94146f66f6058822b0b39fd # v3.27.0
+      uses: github/codeql-action/analyze@f09c1c0a94de965c15400f5634aa42fac8fb8f88 # v3.27.5
       with:
         category: "/language:${{matrix.language}}"

.github/workflows/dependency-review.yml

@@ -17,11 +17,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
+        uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
         with:
           egress-policy: audit
 
       - name: 'Checkout Repository'
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - name: 'Dependency Review'
-        uses: actions/dependency-review-action@4081bf99e2866ebe428fc0477b69eb4fcda7220a # v4.4.0
+        uses: actions/dependency-review-action@3b139cfc5fae8b618d3eae3675e383bb1769c019 # v4.5.0

.github/workflows/scorecards.yml

@@ -66,6 +66,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@662472033e021d55d94146f66f6058822b0b39fd # v3.27.0
+        uses: github/codeql-action/upload-sarif@f09c1c0a94de965c15400f5634aa42fac8fb8f88 # v3.27.5
         with:
           sarif_file: results.sarif

.gitignore

@@ -163,3 +163,7 @@ rsync.*
 
 # pycharm ide
 .idea
+
+# clangd server stuff
+.cache/
+compile_commands.json

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)
+set(promoted_warnings parentheses sign-compare unused-variable reorder)
 
 if("${Trilinos_WARNINGS_MODE}" STREQUAL "WARN")
     enable_warnings("${upcoming_warnings}")

cmake/TPLs/FindTPLCUSOLVER.cmake

@@ -1,17 +1,6 @@
 
-IF (NOT TPL_ENABLE_CUDA)
-  MESSAGE(FATAL_ERROR "\nCUSOLVER: This TPL requires CUDA")
-ELSE()
-  find_library(CUDA_cusolver_LIBRARY
-    cusolver
-    HINTS ${CUDA_TOOLKIT_ROOT_DIR}/lib
-  )
-  IF(CUDA_cusolver_LIBRARY STREQUAL "CUDA_cusolver_LIBRARY-NOTFOUND") 
-    MESSAGE(FATAL_ERROR "\nCUSOLVER: could not find cusolver library.")
-  ENDIF()
-  SET(TPL_CUSOLVER_LIBRARIES ${CUDA_cusolver_LIBRARY})
-ENDIF()
-
-tribits_tpl_find_include_dirs_and_libraries(CUSOLVER  REQUIRED_LIBS_NAMES  cusparse)
-
-unset(TPL_CUSOLVER_LIBRARIES)
+tribits_extpkg_create_imported_all_libs_target_and_config_file( CUSOLVER
+  INNER_FIND_PACKAGE_NAME  CUDAToolkit
+  IMPORTED_TARGETS_FOR_ALL_LIBS  CUDA::cusolver )
+# Above, the CUDA TPL should have already found CUDAToolkit so we just need to
+# grab the target from it to form the CUSPARSE::all_libs target.

cmake/TPLs/FindTPLCUSOLVERDependencies.cmake

@@ -0,0 +1,2 @@
+tribits_extpkg_define_dependencies( CUSOLVER
+  DEPENDENCIES  CUDA)

packages/amesos2/src/Amesos2_EpetraCrsMatrix_MatrixAdapter_def.hpp

@@ -36,7 +36,8 @@ namespace Amesos2 {
       o_map = rcpFromRef(this->mat_->RowMap());
       t_map = Util::tpetra_map_to_epetra_map<local_ordinal_t,global_ordinal_t,global_size_t,node_t>(*map);
 
-      RCP<Epetra_CrsMatrix> t_mat = rcp(new Epetra_CrsMatrix(Copy, *t_map, this->getMaxRowNNZ()));
+      int maxRowNNZ = 0; // this->getMaxRowNNZ();
+      RCP<Epetra_CrsMatrix> t_mat = rcp(new Epetra_CrsMatrix(Copy, *t_map, maxRowNNZ));
 
       Epetra_Import importer(*t_map, *o_map);
       t_mat->Import(*(this->mat_), importer, Insert);

packages/amesos2/src/Amesos2_ShyLUBasker_def.hpp

@@ -557,7 +557,7 @@ bool
 ShyLUBasker<Matrix,Vector>::loadA_impl(EPhase current_phase)
 {
   using Teuchos::as;
-  if(current_phase == SOLVE) return (false);
+  if(current_phase == SOLVE || current_phase == PREORDERING ) return( false );
 
   #ifdef HAVE_AMESOS2_TIMERS
   Teuchos::TimeMonitor convTimer(this->timers_.mtxConvTime_);
@@ -573,7 +573,8 @@ ShyLUBasker<Matrix,Vector>::loadA_impl(EPhase current_phase)
   {
 
     // Only the root image needs storage allocated
-    if( this->root_ ){
+    if( this->root_ && current_phase == SYMBFACT )
+    {
       Kokkos::resize(nzvals_view_, this->globalNumNonZeros_);
       Kokkos::resize(rowind_view_, this->globalNumNonZeros_);
       Kokkos::resize(colptr_view_, this->globalNumCols_ + 1); //this will be wrong for case of gapped col ids, e.g. 0,2,4,9; num_cols = 10 ([0,10)) but num GIDs = 4...

packages/epetraext/src/transform/EpetraExt_AMD_CrsGraph.cpp

@@ -123,7 +123,7 @@ operator()( OriginalTypeRef orig )
   std::vector<int> perm(n);
   std::vector<double> info(AMD_INFO);
 
-  amd_order( n, &iat[0], &jat[0], &perm[0], NULL, &info[0] ); 
+  amd_order( n, iat.data(), jat.data(), perm.data(), NULL, &info[0] ); 
 
   if( info[AMD_STATUS] == AMD_INVALID )
     std::cout << "AMD ORDERING: Invalid!!!!\n";
@@ -150,13 +150,30 @@ operator()( OriginalTypeRef orig )
   //Generate New Domain and Range Maps
   //for now, assume they start out as identical
   const Epetra_BlockMap & OldMap = orig.RowMap();
-  int nG = orig.NumGlobalRows();
 
-  std::vector<int> newElements( n );
-  for( int i = 0; i < n; ++i )
-    newElements[i] = OldMap.GID( perm[i] );
+#ifndef EPETRA_NO_32BIT_GLOBAL_INDICES
+    if(OldMap.GlobalIndicesInt()) {
+      int nG = orig.NumGlobalRows();
+      std::vector<int> newElements( n );
+      for( int i = 0; i < n; ++i )
+        newElements[i] = OldMap.GID( perm[i] );
 
-  NewMap_ = new Epetra_Map( nG, n, &newElements[0], OldMap.IndexBase(), OldMap.Comm() );
+      NewMap_ = new Epetra_Map( nG, n, newElements.data(), OldMap.IndexBase(), OldMap.Comm() );
+    }
+    else
+#endif
+#ifndef EPETRA_NO_64BIT_GLOBAL_INDICES
+    if(OldMap.GlobalIndicesLongLong()) {
+      long long nG = orig.NumGlobalRows64();
+      std::vector<long long> newElements( nG );
+      for( int i = 0; i < n; ++i )
+        newElements[i] = OldMap.GID64( perm[i] );
+
+      NewMap_ = new Epetra_Map( nG, n, newElements.data(), OldMap.IndexBase64(), OldMap.Comm() );
+    }
+    else
+#endif
+      throw "CrsGraph_AMD::operator(): GlobalIndices type unknown for OldMap";
 
   if( verbose_ )
   {

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

@@ -1069,6 +1069,8 @@ opt-set-cmake-var Kokkos_CoreUnitTest_CudaInterOpInit_MPI_1_SET_RUN_SERIAL BOOL
 [ATS2-TEST-DISABLES]
 opt-set-cmake-var Adelus_vector_random_MPI_1_DISABLE BOOL : ON
 opt-set-cmake-var Kokkos_CoreUnitTest_CudaTimingBased_MPI_1_DISABLE BOOL : ON
+opt-set-cmake-var Intrepid2_unit-test_Discretization_Basis_HGRAD_PYR_C1_FEM_test_02_CUDA_DFAD_DFAD_MPI_1_DISABLE BOOL : ON
+opt-set-cmake-var Intrepid2_unit-test_Discretization_Basis_HGRAD_TRI_Cn_FEM_test_02_CUDA_DOUBLE_DOUBLE_MPI_1_DISABLE BOOL : ON
 opt-set-cmake-var MueLu_ParameterListInterpreterTpetraHeavy_MPI_1_DISABLE BOOL : ON
 opt-set-cmake-var MueLu_ParameterListInterpreterTpetra_MPI_1_DISABLE BOOL : ON
 opt-set-cmake-var MueLu_UnitTestsIntrepid2Tpetra_MPI_4_DISABLE BOOL : ON
@@ -1187,7 +1189,7 @@ opt-set-cmake-var Trilinos_WARNINGS_MODE STRING : WARN
 [COMPILER|INTEL]
 opt-set-cmake-var MPI_EXEC FILEPATH : mpirun
 
-[SEMS_COMMON_CUDA_11]
+[SEMS_COMMON_CUDA]
 # TPL ENABLE/DISABLE settings
 opt-set-cmake-var TPL_ENABLE_BLAS BOOL FORCE : ON
 opt-set-cmake-var TPL_ENABLE_BinUtils BOOL FORCE : OFF
@@ -1441,7 +1443,7 @@ use USE-UVM|NO
 use USE-DEPRECATED|YES
 use PACKAGE-ENABLES|NO-PACKAGE-ENABLES
 use COMMON_SPACK_TPLS
-use SEMS_COMMON_CUDA_11
+use SEMS_COMMON_CUDA
 
 # TPL ENABLE/DISABLE settings
 opt-set-cmake-var TPL_ENABLE_BLAS BOOL FORCE : ON
@@ -1518,6 +1520,11 @@ opt-set-cmake-var ROL_test_elementwise_TpetraMultiVector_MPI_4_DISABLE BOOL : ON
 opt-set-cmake-var STKUnit_tests_stk_mesh_unit_tests_MPI_4_DISABLE BOOL : ON
 # This was failing fairly reliably and Nate said it should be okay to disable (https://github.com/trilinos/Trilinos/issues/11678)
 opt-set-cmake-var Kokkos_CoreUnitTest_CudaTimingBased_MPI_1_DISABLE BOOL : ON
+# nvcc compiler errors unless compiled with -j1
+opt-set-cmake-var Intrepid2_unit-test_Discretization_Basis_HGRAD_PYR_C1_FEM_test_02_CUDA_DFAD_DFAD_MPI_1_DISABLE BOOL : ON
+# temporary disable for reevaluation
+opt-set-cmake-var Intrepid2_unit-test_Discretization_Basis_HGRAD_TRI_Cn_FEM_test_02_CUDA_DOUBLE_DOUBLE_MPI_1_DISABLE BOOL : ON
+
 
 # Unstable
 opt-set-cmake-var Adelus_vector_random_npr3_rhs1_MPI_3_DISABLE BOOL : ON
@@ -1553,7 +1560,7 @@ use USE-DEPRECATED|YES
 use PACKAGE-ENABLES|NO-PACKAGE-ENABLES
 use PACKAGE-ENABLES|NO-EPETRA
 use COMMON_SPACK_TPLS
-use SEMS_COMMON_CUDA_11
+use SEMS_COMMON_CUDA
 
 use CUDA11-RUN-SERIAL-TESTS
 
@@ -1583,7 +1590,7 @@ use USE-DEPRECATED|YES
 
 use PACKAGE-ENABLES|NO-PACKAGE-ENABLES
 use COMMON_SPACK_TPLS
-use SEMS_COMMON_CUDA_11
+use SEMS_COMMON_CUDA
 
 # TPL ENABLE/DISABLE settings
 opt-set-cmake-var TPL_ENABLE_BLAS BOOL FORCE : ON
@@ -1660,6 +1667,10 @@ opt-set-cmake-var ROL_test_elementwise_TpetraMultiVector_MPI_4_DISABLE BOOL : ON
 opt-set-cmake-var STKUnit_tests_stk_mesh_unit_tests_MPI_4_DISABLE BOOL : ON
 # This was failing fairly reliably and Nate said it should be okay to disable (https://github.com/trilinos/Trilinos/issues/11678)
 opt-set-cmake-var Kokkos_CoreUnitTest_CudaTimingBased_MPI_1_DISABLE BOOL : ON
+# nvcc compiler errors unless compiled with -j1
+opt-set-cmake-var Intrepid2_unit-test_Discretization_Basis_HGRAD_PYR_C1_FEM_test_02_CUDA_DFAD_DFAD_MPI_1_DISABLE BOOL : ON
+# temporary disable for reevaluation
+opt-set-cmake-var Intrepid2_unit-test_Discretization_Basis_HGRAD_TRI_Cn_FEM_test_02_CUDA_DOUBLE_DOUBLE_MPI_1_DISABLE BOOL : ON
 
 # Unstable
 opt-set-cmake-var Adelus_vector_random_npr3_rhs1_MPI_3_DISABLE BOOL : ON
@@ -2101,7 +2112,16 @@ use USE-RDC|NO
 use USE-UVM|NO
 use USE-DEPRECATED|YES
 use PACKAGE-ENABLES|NO-EPETRA
-use SEMS_COMMON_CUDA_11
+use SEMS_COMMON_CUDA
+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]
 use NODE-TYPE|CUDA
@@ -2118,7 +2138,8 @@ use USE-RDC|NO
 use USE-UVM|YES
 use USE-DEPRECATED|YES
 use PACKAGE-ENABLES|NO-EPETRA
-use SEMS_COMMON_CUDA_11
+use SEMS_COMMON_CUDA
+use CUDA11-RUN-SERIAL-TESTS
 
 opt-set-cmake-var Trilinos_ENABLE_TESTS BOOL FORCE : OFF
 opt-set-cmake-var Kokkos_ENABLE_TESTS BOOL FORCE : ON