Trilinos Master Merge PR Generator: Auto PR created to promote from master_merge_20230616_175856 branch to master

CMakeLists.txt

@@ -125,7 +125,9 @@ SET(${PROJECT_NAME}_ENABLE_EXPORT_MAKEFILES OFF CACHE BOOL
 # Do all of the processing for this Tribits project
 TRIBITS_PROJECT()
 
-INSTALL_BUILD_STATS_SCRIPTS()
+if (COMMAND INSTALL_BUILD_STATS_SCRIPTS)
+  INSTALL_BUILD_STATS_SCRIPTS()
+endif()
 
 # Install TriBITS so that other projects can use it.
 ADVANCED_SET(${PROJECT_NAME}_INSTALL_TriBITS ON CACHE BOOL

cmake/CallbackSetupExtraOptions.cmake

@@ -88,7 +88,12 @@ ENDMACRO()
 # Set up for build stats
 #
 
-include("${Trilinos_SOURCE_DIR}/commonTools/build_stats/BuildStatsWrappers.cmake")
-generate_build_stats_wrappers()
-remove_build_stats_file_on_configure()
-remove_build_stats_timing_files_on_fresh_configure()
+set(buildStatsWrappersFile
+  "${Trilinos_SOURCE_DIR}/commonTools/build_stats/BuildStatsWrappers.cmake")
+if (EXISTS "${buildStatsWrappersFile}")
+  include("${Trilinos_SOURCE_DIR}/commonTools/build_stats/BuildStatsWrappers.cmake")
+  generate_build_stats_wrappers()
+  remove_build_stats_file_on_configure()
+  remove_build_stats_timing_files_on_fresh_configure()
+endif()
+

cmake/tribits/core/package_arch/TribitsReadDepsFilesCreateDepsGraph.cmake

@@ -182,8 +182,18 @@ macro(tribits_read_all_package_deps_files_create_deps_graph)
   set(${PROJECT_NAME}_DEFINED_INTERNAL_PACKAGES "") # Packages and subpackages
 
   foreach(TRIBITS_PACKAGE  IN LISTS ${PROJECT_NAME}_DEFINED_INTERNAL_TOPLEVEL_PACKAGES)
-    tribits_read_toplevel_package_deps_files_add_to_graph(${TRIBITS_PACKAGE}
-      ${${TRIBITS_PACKAGE}_REL_SOURCE_DIR})
+    set(absPackageSrcDir "${PROJECT_SOURCE_DIR}/${${TRIBITS_PACKAGE}_REL_SOURCE_DIR}")
+    set(packageDependenciesFile "${absPackageSrcDir}/cmake/Dependencies.cmake")
+    if ( (NOT EXISTS "${packageDependenciesFile}")
+      AND (NOT ${PROJECT_NAME}_ASSERT_DEFINED_DEPENDENCIES  IN_LIST
+        ${PROJECT_NAME}_ASSERT_DEFINED_DEPENDENCIES_ERROR_VALUES_LIST)
+      )
+      # ToDo: Print message about the package being missing depending on the
+      # value of ${PROJECT_NAME}_ASSERT_DEFINED_DEPENDENCIES!
+    else()
+      message("${TRIBITS_PACKAGE} package dependency file: '${packageDependenciesFile}' exists!")
+      tribits_read_toplevel_package_deps_files_add_to_graph(${TRIBITS_PACKAGE})
+    endif()
   endforeach()
 
   list(LENGTH ${PROJECT_NAME}_DEFINED_INTERNAL_PACKAGES

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

@@ -1853,6 +1853,19 @@ use rhel7_sems-gnu-8.3.0-openmpi-1.10.1-serial_debug_shared_no-kokkos-arch_no-as
 use BUILD-TYPE|DEBUG-COVERAGE-GNU
 use PACKAGE-ENABLES|ALL
 
+[rhel7_sems-gnu-8.3.0-openmpi-1.10.1-serial_debug_shared_no-kokkos-arch_no-asan_complex-float_no-fpic_mpi_no-pt_no-rdc_no-uvm_deprecated-on_no-package-enables]
+#uses sems-archive modules
+use rhel7_sems-gnu-8.3.0-openmpi-1.10.1-serial_debug_shared_no-kokkos-arch_no-asan_no-complex_no-fpic_mpi_no-pt_no-rdc_no-uvm_deprecated-on_no-package-enables
+opt-set-cmake-var Trilinos_ENABLE_DOUBLE                                 BOOL FORCE   : OFF
+opt-set-cmake-var Trilinos_ENABLE_COMPLEX_DOUBLE                         BOOL FORCE   : OFF
+opt-set-cmake-var Trilinos_ENABLE_FLOAT                                  BOOL FORCE   : ON
+opt-set-cmake-var Trilinos_ENABLE_COMPLEX_FLOAT                          BOOL FORCE   : ON
+
+[rhel7_sems-gnu-8.3.0-openmpi-1.10.1-serial_debug_shared_no-kokkos-arch_no-asan_complex-float_no-fpic_mpi_no-pt_no-rdc_no-uvm_deprecated-on_all]
+#uses sems-archive modules
+use rhel7_sems-gnu-8.3.0-openmpi-1.10.1-serial_debug_shared_no-kokkos-arch_no-asan_complex-float_no-fpic_mpi_no-pt_no-rdc_no-uvm_deprecated-on_no-package-enables
+use PACKAGE-ENABLES|ALL
+
 [rhel7_sems-gnu-8.3.0-serial_release-debug_shared_no-kokkos-arch_no-asan_no-complex_no-fpic_no-mpi_no-pt_no-rdc_no-uvm_deprecated-on_no-package-enables]
 #uses sems-archive modules
 use RHEL7_SEMS_COMPILER|GNU

packages/framework/ini-files/supported-config-flags.ini

@@ -209,6 +209,8 @@ use-asan:  SELECT_ONE
 use-complex:  SELECT_ONE
     no-complex
     complex
+    complex-float
+    complex-double
 
 # Whether or not to turn on position independent code.
 use-fpic:  SELECT_ONE

packages/kokkos-kernels/batched/CMakeLists.txt

@@ -16,6 +16,15 @@ IF (NOT KokkosKernels_ENABLE_COMPONENT_BLAS)
   LIST(APPEND SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/batched/KokkosBatched_Util.cpp)
 ENDIF()
 
-# Adding unit-tests
-KOKKOSKERNELS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/batched)
-KOKKOSKERNELS_INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${CMAKE_CURRENT_SOURCE_DIR}/batched)
+IF(KokkosKernels_ENABLE_TESTS OR KokkosKernels_ENABLE_TESTS_AND_PERFSUITE)
+  # Adding unit-tests
+  KOKKOSKERNELS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/batched)
+  KOKKOSKERNELS_INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING
+    ${CMAKE_CURRENT_SOURCE_DIR}/batched)
+ENDIF()
+# NOTE: Above, the build directory 'batched' is not created unless unit tests
+# are actually enabled (which are actually included from the base-level
+# CMakeLists.txt file).  And the KokkosKernelsTargets.cmake file that gets
+# generated from this CMake package in the build dir will be broken if these
+# are listed in the `INTERFACE_INCLUDE_DIRECTORIES` property when the build
+# `batched` is not created (see Trilinos PR #11966).

packages/muelu/src/MueCentral/MueLu_FactoryManager_def.hpp

@@ -227,6 +227,11 @@ namespace MueLu {
       if (varName == "pcoarsen: element to node map")   return GetFactory("P");
 #endif
 
+      // NOTE: These are user data, but we might want to print them, so they need a default factory
+      if (varName == "NodeMatrix")                    return NoFactory::getRCP();
+      if (varName == "NodeAggMatrix")                 return NoFactory::getRCP();
+
+
       TEUCHOS_TEST_FOR_EXCEPTION(true, MueLu::Exceptions::RuntimeError, "MueLu::FactoryManager::GetDefaultFactory(): No default factory available for building '" + varName + "'.");
     }
   }

packages/muelu/src/Operators/MueLu_RefMaxwell_def.hpp

@@ -1227,6 +1227,8 @@ namespace MueLu {
         UncoupledAggFact->SetParameter("aggregation: max agg size",Teuchos::ParameterEntry(maxAggSize));
         bool matchMLbehavior = parameterList_.get("aggregation: match ML phase2a",MasterList::getDefault<bool>("aggregation: match ML phase2a"));
         UncoupledAggFact->SetParameter("aggregation: match ML phase2a",Teuchos::ParameterEntry(matchMLbehavior));
+        bool avoidSingletons = parameterList_.get("aggregation: phase3 avoid singletons",MasterList::getDefault<bool>("aggregation: phase3 avoid singletons"));
+        UncoupledAggFact->SetParameter("aggregation: phase3 avoid singletons",Teuchos::ParameterEntry(avoidSingletons));
 
         coarseMapFact->SetFactory("Aggregates", UncoupledAggFact);
 

packages/rol/example/PDE-OPT/dynamic/adv_diff/example_01.cpp

@@ -53,7 +53,7 @@
 
 #include "ROL_Stream.hpp"
 #include "ROL_ParameterList.hpp"
-#include "ROL_OptimizationSolver.hpp"
+#include "ROL_Solver.hpp"
 #include "ROL_ReducedDynamicObjective.hpp"
 #include "ROL_Bounds.hpp"
 #include "ROL_DynamicConstraintCheck.hpp"
@@ -185,8 +185,9 @@ int main(int argc, char *argv[]) {
     /*************************************************************************/
     /***************** SOLVE OPTIMIZATION PROBLEM ****************************/
     /*************************************************************************/
-    ROL::OptimizationProblem<RealT> problem(obj,z,bnd);
-    ROL::OptimizationSolver<RealT> solver(problem,*parlist);
+    auto problem = ROL::makePtr<ROL::Problem<RealT>>(obj,z);
+    problem->addBoundConstraint(bnd);
+    ROL::Solver<RealT> solver(problem,*parlist);
     z->zero();
     std::clock_t timer = std::clock();
     solver.solve(*outStream);

packages/rol/example/PDE-OPT/dynamic/navier-stokes/example_01.cpp

@@ -57,7 +57,7 @@
 #include "ROL_Bounds.hpp"
 #include "ROL_Stream.hpp"
 #include "ROL_ParameterList.hpp"
-#include "ROL_OptimizationSolver.hpp"
+#include "ROL_Solver.hpp"
 #include "ROL_ReducedDynamicObjective.hpp"
 #include "ROL_DynamicConstraintCheck.hpp"
 #include "ROL_DynamicObjectiveCheck.hpp"
@@ -310,8 +310,9 @@ int main(int argc, char *argv[]) {
         (*zn)[0] = -amp * std::sin(2.0 * M_PI * Se * timeStamp[k].t[0] + ph);
       }
     }
-    ROL::OptimizationProblem<RealT> problem(obj,z);
-    ROL::OptimizationSolver<RealT> solver(problem,*parlist);
+    ROL::Ptr<ROL::Problem<RealT>> problem = ROL::makePtr<ROL::Problem<RealT>>(obj,z);
+    problem->finalize(false,true,*outStream);
+    ROL::Solver<RealT> solver(problem,*parlist);
     std::clock_t timer = std::clock();
     solver.solve(*outStream);
     *outStream << "Optimization time: "