Merge branch 'develop' into adelus-add-old-factorsolve-interfaces

.github/ISSUE_TEMPLATE/bug_report.md

@@ -8,7 +8,8 @@ assignees: ''
 ---
 
 ## Bug Report
-@trilinos/package_name
+Trilinos organization members, please @ mention the correct package team.  
+If you are not a member, please refer to https://github.com/trilinos/Trilinos/wiki/Trilinos-Package-Owners to mention the correct parties (because non-members cannot mention Github teams).
 
 ### Description
 What went wrong?  What should have happened?  Do you have an idea what might

.github/ISSUE_TEMPLATE/documentation.md

@@ -8,7 +8,8 @@ assignees: ''
 ---
 
 ## Documentation
-@trilinos/\<PackageName\>
+Trilinos organization members, please @ mention the correct package team.  
+If you are not a member, please refer to https://github.com/trilinos/Trilinos/wiki/Trilinos-Package-Owners to mention the correct parties (because non-members cannot mention Github teams).
 
 What would you like to see in the documentation?  How does our current
 documentation not meet your needs?  How has this lack of documentation affected

.github/ISSUE_TEMPLATE/enhancement.md

@@ -8,7 +8,8 @@ assignees: ''
 ---
 
 ## Enhancement
-@trilinos/\<PackageName\>
+Trilinos organization members, please @ mention the correct package team.  
+If you are not a member, please refer to https://github.com/trilinos/Trilinos/wiki/Trilinos-Package-Owners to mention the correct parties (because non-members cannot mention Github teams).
 
 What feature/addition is needed?  How does this differ from what we currently
 have?  Are there any alternative solutions you've considered?  Do you have

.github/ISSUE_TEMPLATE/question.md

@@ -8,7 +8,8 @@ assignees: ''
 ---
 
 ## Question
-@trilinos/\<PackageName\>
+Trilinos organization members, please @ mention the correct package team.  
+If you are not a member, please refer to https://github.com/trilinos/Trilinos/wiki/Trilinos-Package-Owners to mention the correct parties (because non-members cannot mention Github teams).
 
 What are you wondering about?  What has you confused?  What answers do you
 need?  What are you trying to accomplish?  How does your question fit into what

README.md

@@ -25,6 +25,10 @@ unique design feature of Trilinos is its focus on packages.
 
 - [Trilinos Configure, Build, Test, and Install Reference Guide](https://trilinos.org/docs/files/TrilinosBuildReference.html)
 
+- To ensure appropriate parties receive your issues, please direct issues by mentioning the
+  [Trilinos package owners](https://github.com/trilinos/Trilinos/wiki/Trilinos-Package-Owners).
+  External users may not mention Github teams, but may mention individual owners instead.
+
 - For help with a particular package, see the website and accompanying
   documentation for that package. Links to these can be found down the
   right side of any page on the website and at [the package website](https://trilinos.github.io/packages.html).

packages/amesos2/src/Amesos2_Superlumt_def.hpp

@@ -462,7 +462,7 @@ namespace Amesos2 {
 
     RCP<const Teuchos::ParameterList> valid_params = getValidParameters_impl();
 
-    int default_nprocs = Kokkos::DefaultHostExecutionSpace::concurrency();
+    int default_nprocs = Kokkos::DefaultHostExecutionSpace().concurrency();
     data_.options.nprocs = parameterList->get<int>("nprocs", default_nprocs);
 
     data_.options.trans = this->control_.useTranspose_ ? SLUMT::TRANS : SLUMT::NOTRANS;
@@ -521,7 +521,7 @@ namespace Amesos2 {
     if( is_null(valid_params) ){
       Teuchos::RCP<Teuchos::ParameterList> pl = Teuchos::parameterList();
 
-      int default_nprocs = Kokkos::DefaultHostExecutionSpace::concurrency();
+      int default_nprocs = Kokkos::DefaultHostExecutionSpace().concurrency();
       Teuchos::RCP<EnhancedNumberValidator<int> > nprocs_validator
         = Teuchos::rcp( new EnhancedNumberValidator<int>() );
       nprocs_validator->setMin(default_nprocs);

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

@@ -296,6 +296,9 @@
 #------------------------------------------------------------------------------
 
 [COMMON]
+opt-set-cmake-var CMAKE_GENERATOR STRING : Ninja
+#opt-set-cmake-var Trilinos_ENABLE_BUILD_STATS BOOL : ON
+
 # LINK_JOBS_LIMIT only has an affect when CMAKE_GENERATOR=Ninja, default to 2
 opt-set-cmake-var Trilinos_PARALLEL_LINK_JOBS_LIMIT STRING : 2
 
@@ -632,6 +635,11 @@ opt-set-cmake-var Sacado_ENABLE_HIERARCHICAL_DFAD BOOL   : OFF
 opt-set-cmake-var TPL_ENABLE_CUDA                 BOOL   : OFF
 opt-set-cmake-var TPL_ENABLE_CUSPARSE             BOOL   : OFF
 
+[NODE-TYPE|OPENMP-NO-SERIAL]
+use NODE-TYPE|OPENMP
+opt-set-cmake-var Tpetra_INST_SERIAL   BOOL FORCE : OFF
+opt-set-cmake-var Kokkos_ENABLE_SERIAL BOOL       : OFF
+
 
 
 #
@@ -862,7 +870,7 @@ opt-set-cmake-var Trilinos_ENABLE_Zoltan2Core BOOL : ON
 
 [NODE-TYPE|CUDA_USE-RDC|YES_USE-PT|YES]
 # LINK_JOBS_LIMIT only has an affect when CMAKE_GENERATOR=Ninja
-opt-set-cmake-var Trilinos_PARALLEL_LINK_JOBS_LIMIT STRING FORCE : 10
+opt-set-cmake-var Trilinos_PARALLEL_LINK_JOBS_LIMIT STRING FORCE : 32
 
 [NODE-TYPE|CUDA_USE-RDC|YES_USE-PT|NO]
 # LINK_JOBS_LIMIT only has an affect when CMAKE_GENERATOR=Ninja
@@ -1570,7 +1578,7 @@ use PACKAGE-ENABLES|ALL
 
 [rhel7_sems-gnu-8.3.0-openmpi-1.10.1-openmp_release-debug_static_no-kokkos-arch_no-asan_no-complex_no-fpic_mpi_no-pt_no-rdc_no-uvm_deprecated-on_pr]
 use RHEL7_SEMS_COMPILER|GNU
-use NODE-TYPE|OPENMP
+use NODE-TYPE|OPENMP-NO-SERIAL
 use BUILD-TYPE|RELEASE-DEBUG
 use RHEL7_SEMS_LIB-TYPE|STATIC
 use KOKKOS-ARCH|NO-KOKKOS-ARCH
@@ -1743,15 +1751,15 @@ opt-set-cmake-var TPL_HDF5_LIBRARIES STRING FORCE : ${HDF5_LIB|ENV}/libhdf5_hl.s
 # ML CONFIGURATION ERROR:  SuperLU_5.0 detected - only SuperLU version < 5.0 currently supported for this package.
 opt-set-cmake-var ML_ENABLE_SuperLU BOOL FORCE : OFF
 
-[rhel7_sems-intel-2021.3-sems-openmpi-4.0.5_release-debug_shared_no-kokkos-arch_no-asan_no-complex_fpic_mpi_no-pt_no-rdc_no-uvm_deprecated-on_all]
-use rhel7_sems-intel-2021.3-sems-openmpi-4.0.5_release-debug_shared_no-kokkos-arch_no-asan_no-complex_fpic_mpi_no-pt_no-rdc_no-uvm_deprecated-on_no-package-enables
-use PACKAGE-ENABLES|ALL
-
 opt-set-cmake-var Zoltan_ch_simple_parmetis_parallel_DISABLE BOOL FORCE : ON
 opt-set-cmake-var Zoltan_ch_7944_parmetis_parallel_DISABLE BOOL FORCE   : ON
 opt-set-cmake-var Zoltan_ch_simple_scotch_parallel_DISABLE BOOL FORCE   : ON
 opt-set-cmake-var Epetra_Directory_test_LL_MPI_1_DISABLE BOOL FORCE     : ON
 
+[rhel7_sems-intel-2021.3-sems-openmpi-4.0.5_release-debug_shared_no-kokkos-arch_no-asan_no-complex_fpic_mpi_no-pt_no-rdc_no-uvm_deprecated-on_all]
+use rhel7_sems-intel-2021.3-sems-openmpi-4.0.5_release-debug_shared_no-kokkos-arch_no-asan_no-complex_fpic_mpi_no-pt_no-rdc_no-uvm_deprecated-on_no-package-enables
+use PACKAGE-ENABLES|ALL
+
 [rhel7_sems-cuda-11.4.2-sems-gnu-10.1.0-sems-openmpi-4.0.5_release_static_Volta70_no-asan_complex_no-fpic_mpi_pt_no-rdc_no-uvm_deprecated-on_no-package-enables]
 use RHEL7_SEMS_COMPILER|CUDA
 use NODE-TYPE|CUDA
@@ -1828,7 +1836,7 @@ opt-set-cmake-var Tpetra_INST_SERIAL BOOL FORCE : ON
 opt-set-cmake-var Zoltan_ENABLE_Scotch BOOL FORCE : OFF
 
 # Test failures as of 11-28-22
-opt-set-cmake-var MiniTensor_test_Test_01_MPI_1_DISALBE BOOL : ON
+#opt-set-cmake-var MiniTensor_test_Test_01_MPI_1_DISABLE BOOL : ON
 opt-set-cmake-var PanzerAdaptersSTK_tQuad8ToQuad4Factory_MPI_2_DISABLE BOOL : ON
 opt-set-cmake-var PanzerAdaptersSTK_tQuadraticToLinearMeshFactory_MPI_2_DISABLE BOOL : ON
 opt-set-cmake-var Pliris_vector_random_MPI_3_DISABLE BOOL : ON

packages/framework/pr_tools/LaunchDriver.py

@@ -29,16 +29,13 @@ def get_launch_env(build_name : str, system : str):
   """
   Gets the launch environment based on the detected system.
   This is an early environment that's required for running the driver.
-  
+
   Returns:
       str: The environment used to launch the driver.
   """
   env = ""
   if "_rdc" in build_name:
-      env += " TRILINOS_MAX_CORES=10"
-
-  if system == "weaver" or system == "ats2":
-      env += " Trilinos_CTEST_DO_ALL_AT_ONCE=TRUE"
+      env += " TRILINOS_MAX_CORES=96"
 
   if env == "":
       return ""
@@ -49,25 +46,22 @@ def get_launch_env(build_name : str, system : str):
 def get_launch_cmd(build_name : str, system : str):
   """
   Gets the launch command based on the detected system.
-  
+
   Returns:
       str: The command used to launch the driver.
   """
-  if system == "weaver" or system == "ats2":
-    cmd = "bsub -Is -J " + build_name + " -W 12:00"
-  else:
-    cmd = ""  
+  cmd = ""
 
   return cmd + " "
 
 
 def get_driver_args(system : str):
   """
   Gets the driver arguments based on the detected system.
-  
+
   Returns:
       str: The arguments passed to the driver.
-  """  
+  """
   return " " + "--on_" + system
 
 
@@ -112,4 +106,3 @@ def main(argv):
 
 if __name__ == "__main__":
     main(sys.argv[1 :])
-

packages/framework/pr_tools/trilinosprhelpers/unittests/environment-specs.ini

@@ -357,7 +357,6 @@ use RHEL7_SEMS-SERIAL
 use RHEL7_PRE
 module-load  sems-gcc                        : 7.2.0
 module-load  sems-cuda                       : 10.1
-envvar-set   CUDA_LAUNCH_BLOCKING            : 1
 envvar-set   CUDA_MANAGED_FORCE_DEVICE_ALLOC : 1
 envvar-set   KOKKOS_NUM_DEVICES              : 2
 use MPI-COMPILER-VARS

packages/framework/pr_tools/unittests/test_LaunchDriver.py

@@ -27,34 +27,19 @@ def setUp(self):
 
     ## Test LaunchDriver methods
     def testUnitGetLaunchEnv(self):
-      env = ld.get_launch_env(self.build_name, "weaver")
-      self.assertEqual(env, "env Trilinos_CTEST_DO_ALL_AT_ONCE=TRUE ")
-
-      env = ld.get_launch_env(self.build_name, "ats2")
-      self.assertEqual(env, "env Trilinos_CTEST_DO_ALL_AT_ONCE=TRUE ")
-
-      env = ld.get_launch_env(self.build_name+"_rdc", "weaver")
-      self.assertEqual(env, "env TRILINOS_MAX_CORES=10 Trilinos_CTEST_DO_ALL_AT_ONCE=TRUE ")
+      env = ld.get_launch_env(self.build_name+"_rdc", "dne")
+      self.assertEqual(env, "env TRILINOS_MAX_CORES=96 ")
 
       env = ld.get_launch_env(self.build_name, "dne")
       self.assertEqual(env, "")
 
 
     def testUnitGetLaunchCmd(self):
-      cmd = ld.get_launch_cmd(self.build_name, "weaver")
-      self.assertEqual(cmd, "bsub -Is -J " + self.build_name + " -W 12:00 ")
-
-      cmd = ld.get_launch_cmd(self.build_name, "ats2")
-      self.assertEqual(cmd, "bsub -Is -J " + self.build_name + " -W 12:00 ")
-
       cmd = ld.get_launch_cmd(self.build_name, "dne")
       self.assertEqual(cmd, " ")
 
 
     def testUnitGetDriverArgs(self):
-      args = ld.get_driver_args("ats2")
-      self.assertEqual(args, " --on_ats2")
-
       args = ld.get_driver_args("dne1")
       self.assertEqual(args, " --on_dne1")