Merge Pull Request #13341 from trilinos/Trilinos/master_merge_2024080…

…9_175814

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

packages/amesos2/test/solvers/Solver_Test.cpp

@@ -1515,7 +1515,7 @@ bool do_kokkos_test_with_types(const string& mm_file,
       auto row_map = A2->graph.row_map;
       Kokkos::RangePolicy<execution_space> policy(0, vals.size());
       Kokkos::parallel_for(policy, KOKKOS_LAMBDA(size_t i) {
-        if(i < row_map(1)) { // just do 1st row
+        if(i < size_t(row_map(1))) { // just do 1st row
           vals(i) = vals(i) * vals(i);
         }
       });

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

@@ -1738,42 +1738,51 @@ opt-set-cmake-var KokkosKernels_batched_dla_cuda_MPI_1_SET_RUN_SERIAL BOOL FORCE
 opt-set-cmake-var Intrepid2_unit-test_MonolithicExecutable_Intrepid2_Tests_MPI_1_SET_RUN_SERIAL BOOL FORCE : ON
 
 [GCC_PACKAGE_SPECIFIC_WARNING_FLAGS]
-opt-set-cmake-var Amesos_CXX_FLAGS STRING : ${CMAKE_CXX_FLAGS|CMAKE} -Wno-error=shadow
-opt-set-cmake-var Amesos2_CXX_FLAGS STRING : ${CMAKE_CXX_FLAGS|CMAKE} -Wno-error=shadow
-opt-set-cmake-var Belos_CXX_FLAGS STRING : ${CMAKE_CXX_FLAGS|CMAKE} -Wno-error=shadow
-opt-set-cmake-var Domi_CXX_FLAGS STRING : ${CMAKE_CXX_FLAGS|CMAKE} -Wno-error=shadow
-opt-set-cmake-var Epetra_CXX_FLAGS STRING : ${CMAKE_CXX_FLAGS|CMAKE} -Wno-error=shadow
-opt-set-cmake-var EpetraExt_CXX_FLAGS STRING : ${CMAKE_CXX_FLAGS|CMAKE} -Wno-error=shadow
-opt-set-cmake-var FEI_CXX_FLAGS STRING : ${CMAKE_CXX_FLAGS|CMAKE} -Wno-error=shadow
-opt-set-cmake-var Galeri_CXX_FLAGS STRING : ${CMAKE_CXX_FLAGS|CMAKE} -Wno-error=shadow
-opt-set-cmake-var Ifpack_CXX_FLAGS STRING : ${CMAKE_CXX_FLAGS|CMAKE} -Wno-error=shadow
-opt-set-cmake-var Intrepid_CXX_FLAGS STRING : ${CMAKE_CXX_FLAGS|CMAKE} -Wno-error=shadow
-opt-set-cmake-var Intrepid2_CXX_FLAGS STRING : ${CMAKE_CXX_FLAGS|CMAKE} -Werror -Wno-error=shadow
-opt-set-cmake-var Isorropia_CXX_FLAGS STRING : ${CMAKE_CXX_FLAGS|CMAKE} -Wno-error=shadow
-opt-set-cmake-var ML_CXX_FLAGS STRING : ${CMAKE_CXX_FLAGS|CMAKE} -Wno-error=shadow
-opt-set-cmake-var Moertel_CXX_FLAGS STRING : ${CMAKE_CXX_FLAGS|CMAKE} -Wno-error=shadow
-opt-set-cmake-var NOX_CXX_FLAGS STRING : ${CMAKE_CXX_FLAGS|CMAKE} -Wno-error=shadow
-opt-set-cmake-var Pamgen_CXX_FLAGS STRING : ${CMAKE_CXX_FLAGS|CMAKE} -Wno-error=shadow
-opt-set-cmake-var Phalanx_CXX_FLAGS STRING : ${CMAKE_CXX_FLAGS|CMAKE} -Wno-error=shadow
-opt-set-cmake-var Pike_CXX_FLAGS STRING : ${CMAKE_CXX_FLAGS|CMAKE} -Werror
-opt-set-cmake-var Piro_CXX_FLAGS STRING : ${CMAKE_CXX_FLAGS|CMAKE} -Wno-error=shadow
-opt-set-cmake-var ROL_CXX_FLAGS STRING : ${CMAKE_CXX_FLAGS|CMAKE} -Wno-error=shadow
-opt-set-cmake-var Sacado_CXX_FLAGS STRING : ${CMAKE_CXX_FLAGS|CMAKE} -Wno-error=shadow
-opt-set-cmake-var Shards_CXX_FLAGS STRING : ${CMAKE_CXX_FLAGS|CMAKE} -Wno-error=shadow
-opt-set-cmake-var ShyLU_Node_CXX_FLAGS STRING : ${CMAKE_CXX_FLAGS|CMAKE} -Wno-error=shadow
-opt-set-cmake-var STK_CXX_FLAGS STRING : ${CMAKE_CXX_FLAGS|CMAKE} -Wno-error=shadow
-opt-set-cmake-var Stokhos_CXX_FLAGS STRING : ${CMAKE_CXX_FLAGS|CMAKE} -Wno-error=shadow
+# Supported packages
+opt-set-cmake-var Amesos2_CXX_FLAGS     STRING : ${CMAKE_CXX_FLAGS|CMAKE} -Wno-error=shadow
+opt-set-cmake-var Belos_CXX_FLAGS       STRING : ${CMAKE_CXX_FLAGS|CMAKE} -Wno-error=shadow
+opt-set-cmake-var Domi_CXX_FLAGS        STRING : ${CMAKE_CXX_FLAGS|CMAKE} -Wno-error=shadow
+opt-set-cmake-var FEI_CXX_FLAGS         STRING : ${CMAKE_CXX_FLAGS|CMAKE} -Wno-error=shadow
+opt-set-cmake-var Galeri_CXX_FLAGS      STRING : ${CMAKE_CXX_FLAGS|CMAKE} -Wno-error=shadow
+opt-set-cmake-var Intrepid2_CXX_FLAGS   STRING : ${CMAKE_CXX_FLAGS|CMAKE} -Werror -Wno-error=shadow
+opt-set-cmake-var Moertel_CXX_FLAGS     STRING : ${CMAKE_CXX_FLAGS|CMAKE} -Wno-error=shadow
+opt-set-cmake-var NOX_CXX_FLAGS         STRING : ${CMAKE_CXX_FLAGS|CMAKE} -Wno-error=shadow
+opt-set-cmake-var Pamgen_CXX_FLAGS      STRING : ${CMAKE_CXX_FLAGS|CMAKE} -Wno-error=shadow
+opt-set-cmake-var Phalanx_CXX_FLAGS     STRING : ${CMAKE_CXX_FLAGS|CMAKE} -Wno-error=shadow
+opt-set-cmake-var Pike_CXX_FLAGS        STRING : ${CMAKE_CXX_FLAGS|CMAKE} -Werror
+opt-set-cmake-var Piro_CXX_FLAGS        STRING : ${CMAKE_CXX_FLAGS|CMAKE} -Wno-error=shadow
+opt-set-cmake-var ROL_CXX_FLAGS         STRING : ${CMAKE_CXX_FLAGS|CMAKE} -Wno-error=shadow
+opt-set-cmake-var Sacado_CXX_FLAGS      STRING : ${CMAKE_CXX_FLAGS|CMAKE} -Wno-error=shadow
+opt-set-cmake-var Shards_CXX_FLAGS      STRING : ${CMAKE_CXX_FLAGS|CMAKE} -Wno-error=shadow
+opt-set-cmake-var ShyLU_Node_CXX_FLAGS  STRING : ${CMAKE_CXX_FLAGS|CMAKE} -Wno-error=shadow
+opt-set-cmake-var STK_CXX_FLAGS         STRING : ${CMAKE_CXX_FLAGS|CMAKE} -Wno-error=shadow
+opt-set-cmake-var Stokhos_CXX_FLAGS     STRING : ${CMAKE_CXX_FLAGS|CMAKE} -Wno-error=shadow
 opt-set-cmake-var Stratimikos_CXX_FLAGS STRING : ${CMAKE_CXX_FLAGS|CMAKE} -Wno-error=shadow
-# opt-set-cmake-var Tempus_CXX_FLAGS STRING : ${CMAKE_CXX_FLAGS|CMAKE} -Werror
+# opt-set-cmake-var Tempus_CXX_FLAGS      STRING : ${CMAKE_CXX_FLAGS|CMAKE} -Werror
+opt-set-cmake-var Zoltan_CXX_FLAGS      STRING : ${CMAKE_CXX_FLAGS|CMAKE} -Wno-error=shadow
 opt-set-cmake-var TrilinosCouplings_CXX_FLAGS STRING : ${CMAKE_CXX_FLAGS|CMAKE} -Wno-error=shadow
-opt-set-cmake-var Zoltan_CXX_FLAGS STRING : ${CMAKE_CXX_FLAGS|CMAKE} -Wno-error=shadow
+
+# Deprecated packages
+opt-set-cmake-var Amesos_CXX_FLAGS      STRING FORCE : ${CMAKE_CXX_FLAGS|CMAKE} -w
+opt-set-cmake-var AztecOO_CXX_FLAGS     STRING FORCE : ${CMAKE_CXX_FLAGS|CMAKE} -w
+opt-set-cmake-var Epetra_CXX_FLAGS      STRING FORCE : ${CMAKE_CXX_FLAGS|CMAKE} -w
+opt-set-cmake-var EpetraExt_CXX_FLAGS   STRING FORCE : ${CMAKE_CXX_FLAGS|CMAKE} -w
+opt-set-cmake-var Ifpack_CXX_FLAGS      STRING FORCE : ${CMAKE_CXX_FLAGS|CMAKE} -w
+opt-set-cmake-var Intrepid_CXX_FLAGS    STRING FORCE : ${CMAKE_CXX_FLAGS|CMAKE} -w
+opt-set-cmake-var Isorropia_CXX_FLAGS   STRING FORCE : ${CMAKE_CXX_FLAGS|CMAKE} -w
+opt-set-cmake-var ML_CXX_FLAGS          STRING FORCE : ${CMAKE_CXX_FLAGS|CMAKE} -w
+opt-set-cmake-var Pliris_CXX_FLAGS      STRING FORCE : ${CMAKE_CXX_FLAGS|CMAKE} -w
+opt-set-cmake-var PyTrilinos_CXX_FLAGS  STRING FORCE : ${CMAKE_CXX_FLAGS|CMAKE} -w
+opt-set-cmake-var ShyLU_DD_CXX_FLAGS    STRING FORCE : ${CMAKE_CXX_FLAGS|CMAKE} -w
+opt-set-cmake-var Triutils_CXX_FLAGS    STRING FORCE : ${CMAKE_CXX_FLAGS|CMAKE} -w
+opt-set-cmake-var ThyraEpetraAdapters_CXX_FLAGS     STRING FORCE : ${CMAKE_CXX_FLAGS|CMAKE} -w
+opt-set-cmake-var ThyraEpetraExtAdapters_CXX_FLAGS  STRING FORCE : ${CMAKE_CXX_FLAGS|CMAKE} -w
+
 
 [GCC_OPENMP_PACKAGE_SPECIFIC_WARNING_FLAGS]
 use GCC_PACKAGE_SPECIFIC_WARNING_FLAGS
-opt-set-cmake-var Panzer_CXX_FLAGS STRING : ${CMAKE_CXX_FLAGS|CMAKE} -Wno-error=shadow
+opt-set-cmake-var Panzer_CXX_FLAGS  STRING : ${CMAKE_CXX_FLAGS|CMAKE} -Wno-error=shadow
 opt-set-cmake-var Percept_CXX_FLAGS STRING : ${CMAKE_CXX_FLAGS|CMAKE} -Wno-error=shadow
-opt-set-cmake-var Pliris_CXX_FLAGS STRING : ${CMAKE_CXX_FLAGS|CMAKE} -Wno-error=shadow
-opt-set-cmake-var ShyLU_DD_CXX_FLAGS STRING : ${CMAKE_CXX_FLAGS|CMAKE} -Wno-error=shadow
 
 
 # Full configurations intended to be loaded.
@@ -3101,7 +3110,7 @@ opt-set-cmake-var TPL_ENABLE_Scotch   BOOL FORCE : OFF
 opt-set-cmake-var TPL_Netcdf_LIBRARIES STRING FORCE : ${NETCDF_C_LIB|ENV}/libnetcdf.so
 
 opt-set-cmake-var Trilinos_ENABLE_Fortran OFF    BOOL         : OFF
-opt-set-cmake-var CMAKE_CXX_FLAGS                STRING       : -Wall -Wno-clobbered -Wno-vla -Wno-pragmas -Wno-unknown-pragmas -Wno-parentheses -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-variable -Wno-unused-label -Werror=shadow -DTRILINOS_HIDE_DEPRECATED_HEADER_WARNINGS
+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-label -Werror=parentheses -Werror=sign-compare -Werror=unused-variable -DTRILINOS_HIDE_DEPRECATED_HEADER_WARNINGS
 
 use GCC_PACKAGE_SPECIFIC_WARNING_FLAGS
 
@@ -3135,7 +3144,7 @@ use COMMON_SPACK_TPLS
 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
 opt-set-cmake-var Teko_DISABLE_LSCSTABALIZED_TPETRA_ALPAH_INV_D BOOL         : ON
-opt-set-cmake-var CMAKE_CXX_FLAGS                               STRING       : -fno-strict-aliasing -Wall -Wno-clobbered -Wno-vla -Wno-pragmas -Wno-unknown-pragmas -Wno-parentheses -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-inline -Wno-nonnull-compare -Wno-address -DTRILINOS_HIDE_DEPRECATED_HEADER_WARNINGS
+opt-set-cmake-var CMAKE_CXX_FLAGS                               STRING       : -fno-strict-aliasing -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-inline -Wno-nonnull-compare -Wno-address -Werror=sign-compare -Werror=unused-variable -Werror=parentheses -DTRILINOS_HIDE_DEPRECATED_HEADER_WARNINGS
 
 # TPL_BLAS_LIBRARIES is redefined here with libm for SuperLU to properly link
 opt-set-cmake-var TPL_BLAS_LIBRARIES STRING FORCE : -L${BLAS_ROOT|ENV}/lib;-lblas;-lgfortran;-lgomp;-lm
@@ -3178,7 +3187,7 @@ opt-set-cmake-var ROL_example_PDE-OPT_helmholtz_example_02_MPI_1_DISABLE BOOL
 opt-set-cmake-var Pliris_vector_random_MPI_3_DISABLE                     BOOL         : ON
 opt-set-cmake-var Pliris_vector_random_MPI_4_DISABLE                     BOOL         : ON
 
-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 -Wno-error -DTRILINOS_HIDE_DEPRECATED_HEADER_WARNINGS
+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 -Werror=sign-compare -Werror=unused-variable -Werror=parentheses -DTRILINOS_HIDE_DEPRECATED_HEADER_WARNINGS
 
 # Test failures as of 11-28-22
 opt-set-cmake-var ROL_example_PDE-OPT_navier-stokes_example_01_MPI_4_DISABLE BOOL : ON

packages/muelu/example/advanced/multiplesolve/StandardReuse.cpp

@@ -18,6 +18,8 @@
 #include <Galeri_XpetraUtils.hpp>
 #include <Galeri_XpetraMaps.hpp>
 
+#include <Xpetra_MatrixFactory2.hpp>
+
 #include <MueLu.hpp>
 #include <MueLu_Level.hpp>
 #include <MueLu_Factory.hpp>

packages/muelu/src/Misc/MueLu_RAPShiftFactory_decl.hpp

@@ -13,7 +13,7 @@
 #include <string>
 
 #include <Xpetra_Matrix_fwd.hpp>
-#include <Xpetra_MatrixFactory_fwd.hpp>
+#include <Xpetra_MatrixFactory2_fwd.hpp>
 #include <Xpetra_Vector_fwd.hpp>
 #include <Xpetra_VectorFactory_fwd.hpp>
 

packages/muelu/src/Misc/MueLu_RAPShiftFactory_def.hpp

@@ -17,6 +17,7 @@
 #include <Xpetra_MatrixUtils.hpp>
 #include <Xpetra_Vector.hpp>
 #include <Xpetra_VectorFactory.hpp>
+#include <Xpetra_MatrixFactory2.hpp>
 
 #include "MueLu_RAPShiftFactory_decl.hpp"
 #include "MueLu_MasterList.hpp"

packages/muelu/src/Transfers/Energy-Minimization/Solvers/MueLu_CGSolver_def.hpp

@@ -11,6 +11,7 @@
 #define MUELU_CGSOLVER_DEF_HPP
 
 #include <Xpetra_MatrixFactory.hpp>
+#include <Xpetra_MatrixFactory2.hpp>
 #include <Xpetra_MatrixMatrix.hpp>
 
 #include "MueLu_Utilities.hpp"

packages/muelu/src/Transfers/Energy-Minimization/Solvers/MueLu_GMRESSolver_def.hpp

@@ -13,6 +13,7 @@
 #include <Teuchos_LAPACK.hpp>
 
 #include <Xpetra_MatrixFactory.hpp>
+#include <Xpetra_MatrixFactory2.hpp>
 #include <Xpetra_MatrixMatrix.hpp>
 #include <Xpetra_IO.hpp>
 

packages/shylu/shylu_node/tacho/src/impl/Tacho_NumericTools_Base.hpp

@@ -36,6 +36,7 @@ template <typename ValueType, typename DeviceType> class NumericToolsBase {
   using ordinal_type_array = typename supernode_info_type::ordinal_type_array;
   using size_type_array = typename supernode_info_type::size_type_array;
   using value_type_array = typename supernode_info_type::value_type_array;
+  using int_type_array = typename supernode_info_type::int_type_array;
 
   using ordinal_pair_type_array = typename supernode_info_type::ordinal_pair_type_array;
   using value_type_matrix = typename supernode_info_type::value_type_matrix;