Merge Pull Request #12338 from jgfouca/Trilinos/jgfouca/shylu_node_pt

Automatically Merged using Trilinos Pull Request AutoTester PR Title: b'ShyLU::FastILU promote to primary tested (PT)' PR Author: jgfouca
trilinos · Oct 3, 2023 · 4f5d999 · 4f5d999
2 parents 979ba35 + b8638bd
commit 4f5d999
Show file tree

Hide file tree

Showing 10 changed files with 479 additions and 514 deletions.
diff --git a/packages/ifpack2/example/RelaxationWithEquilibration.cpp b/packages/ifpack2/example/RelaxationWithEquilibration.cpp
@@ -1142,7 +1142,7 @@ template<class ViewType1,
                >::mag_type,
                typename ViewType2::non_const_value_type
              >::value,
-         const int rank = ViewType1::Rank>
+         const int rank = ViewType1::rank>
 class ElementWiseMultiply {};
 
 template<class ViewType1,
@@ -1157,7 +1157,7 @@ class ElementWiseMultiply<ViewType1,
                           takeAbsoluteValueOfScalingFactors,
                           1> {
 public:
-  static_assert (ViewType1::Rank == 1, "ViewType1 must be a rank-1 "
+  static_assert (ViewType1::rank == 1, "ViewType1 must be a rank-1 "
                  "Kokkos::View in order to use this specialization.");
 
   ElementWiseMultiply (const ViewType1& X,
@@ -1203,7 +1203,7 @@ class ElementWiseMultiply<ViewType1,
                           takeAbsoluteValueOfScalingFactors,
                           2> {
 public:
-  static_assert (ViewType1::Rank == 2, "ViewType1 must be a rank-2 "
+  static_assert (ViewType1::rank == 2, "ViewType1 must be a rank-2 "
                  "Kokkos::View in order to use this specialization.");
 
   ElementWiseMultiply (const ViewType1& X,
@@ -1340,7 +1340,7 @@ template<class ViewType1,
                >::mag_type,
                typename ViewType2::non_const_value_type
              >::value,
-         const int rank = ViewType1::Rank>
+         const int rank = ViewType1::rank>
 class ElementWiseDivide {};
 
 template<class ViewType1,
@@ -1355,7 +1355,7 @@ class ElementWiseDivide<ViewType1,
                         takeAbsoluteValueOfScalingFactors,
                         1> {
 public:
-  static_assert (ViewType1::Rank == 1, "ViewType1 must be a rank-1 "
+  static_assert (ViewType1::rank == 1, "ViewType1 must be a rank-1 "
                  "Kokkos::View in order to use this specialization.");
 
   ElementWiseDivide (const ViewType1& X,
@@ -1401,7 +1401,7 @@ class ElementWiseDivide<ViewType1,
                         takeAbsoluteValueOfScalingFactors,
                         2> {
 public:
-  static_assert (ViewType1::Rank == 2, "ViewType1 must be a rank-2 "
+  static_assert (ViewType1::rank == 2, "ViewType1 must be a rank-2 "
                  "Kokkos::View in order to use this specialization.");
 
   ElementWiseDivide (const ViewType1& X,

diff --git a/packages/ifpack2/src/Ifpack2_MDF_def.hpp b/packages/ifpack2/src/Ifpack2_MDF_def.hpp
@@ -472,9 +472,6 @@ void MDF<MatrixType>::initialize ()
   using Teuchos::rcp_implicit_cast;
   using Teuchos::Array;
   using Teuchos::ArrayView;
-  typedef Tpetra::CrsGraph<local_ordinal_type,
-                           global_ordinal_type,
-                           node_type> crs_graph_type;
   const char prefix[] = "Ifpack2::MDF::initialize: ";
 
   TEUCHOS_TEST_FOR_EXCEPTION

diff --git a/packages/ifpack2/src/Ifpack2_ReorderFilter_def.hpp b/packages/ifpack2/src/Ifpack2_ReorderFilter_def.hpp
@@ -535,7 +535,6 @@ permuteReorderedToOriginalTempl (const Tpetra::MultiVector<DomainScalar,local_or
 
 #ifdef HAVE_IFPACK2_DEBUG
   {
-    typedef Teuchos::ScalarTraits<DomainScalar> STS;
     typedef Teuchos::ScalarTraits<magnitude_type> STM;
     Teuchos::Array<magnitude_type> norms (reorderedX.getNumVectors ());
     reorderedX.norm2 (norms ());
@@ -569,7 +568,6 @@ permuteReorderedToOriginalTempl (const Tpetra::MultiVector<DomainScalar,local_or
 
 #ifdef HAVE_IFPACK2_DEBUG
   {
-    typedef Teuchos::ScalarTraits<RangeScalar> STS;
     typedef Teuchos::ScalarTraits<magnitude_type> STM;
     Teuchos::Array<magnitude_type> norms (originalY.getNumVectors ());
     originalY.norm2 (norms ());

diff --git a/packages/ifpack2/test/belos/tpetra_native.cpp b/packages/ifpack2/test/belos/tpetra_native.cpp
@@ -50,7 +50,7 @@ template<class ViewType1,
                >::mag_type,
                typename ViewType2::non_const_value_type
              >::value,
-         const int rank = ViewType1::Rank>
+         const int rank = ViewType1::rank>
 class ElementWiseMultiply {};
 
 template<class ViewType1,
@@ -65,7 +65,7 @@ class ElementWiseMultiply<ViewType1,
                           takeAbsoluteValueOfScalingFactors,
                           1> {
 public:
-  static_assert (ViewType1::Rank == 1, "ViewType1 must be a rank-1 "
+  static_assert (ViewType1::rank == 1, "ViewType1 must be a rank-1 "
                  "Kokkos::View in order to use this specialization.");
 
   ElementWiseMultiply (const ViewType1& X,
@@ -111,7 +111,7 @@ class ElementWiseMultiply<ViewType1,
                           takeAbsoluteValueOfScalingFactors,
                           2> {
 public:
-  static_assert (ViewType1::Rank == 2, "ViewType1 must be a rank-2 "
+  static_assert (ViewType1::rank == 2, "ViewType1 must be a rank-2 "
                  "Kokkos::View in order to use this specialization.");
 
   ElementWiseMultiply (const ViewType1& X,
@@ -251,7 +251,7 @@ template<class ViewType1,
                >::mag_type,
                typename ViewType2::non_const_value_type
              >::value,
-         const int rank = ViewType1::Rank>
+         const int rank = ViewType1::rank>
 class ElementWiseDivide {};
 
 template<class ViewType1,
@@ -266,7 +266,7 @@ class ElementWiseDivide<ViewType1,
                         takeAbsoluteValueOfScalingFactors,
                         1> {
 public:
-  static_assert (ViewType1::Rank == 1, "ViewType1 must be a rank-1 "
+  static_assert (ViewType1::rank == 1, "ViewType1 must be a rank-1 "
                  "Kokkos::View in order to use this specialization.");
 
   ElementWiseDivide (const ViewType1& X,
@@ -312,7 +312,7 @@ class ElementWiseDivide<ViewType1,
                         takeAbsoluteValueOfScalingFactors,
                         2> {
 public:
-  static_assert (ViewType1::Rank == 2, "ViewType1 must be a rank-2 "
+  static_assert (ViewType1::rank == 2, "ViewType1 must be a rank-2 "
                  "Kokkos::View in order to use this specialization.");
 
   ElementWiseDivide (const ViewType1& X,

diff --git a/packages/ifpack2/test/unit_tests/Ifpack2_UnitTestSingleProcessILUT.cpp b/packages/ifpack2/test/unit_tests/Ifpack2_UnitTestSingleProcessILUT.cpp
@@ -84,8 +84,6 @@ TEUCHOS_UNIT_TEST_TEMPLATE_3_DECL(Ifpack2ILUT, ParILUT, Scalar, LocalOrdinal, Gl
   using Teuchos::RCP;
   typedef Node NT;
 
-  typedef Tpetra::Map<LocalOrdinal,GlobalOrdinal,Node> tpetra_map_type;
-
   typedef Tpetra::CrsMatrix<Scalar,LocalOrdinal,GlobalOrdinal,NT>   crs_matrix_type;
 
   typedef Xpetra::TpetraCrsMatrix<Scalar,LocalOrdinal,GlobalOrdinal,NT> XCrsType;
@@ -99,6 +97,8 @@ TEUCHOS_UNIT_TEST_TEMPLATE_3_DECL(Ifpack2ILUT, ParILUT, Scalar, LocalOrdinal, Gl
 
 //#define IFPACK2_DEBUG_PARILUT // This duplicates a Kokkos-Kernels unit test.
 #ifdef IFPACK2_DEBUG_PARILUT
+  typedef Tpetra::Map<LocalOrdinal,GlobalOrdinal,Node> tpetra_map_type;
+
   GlobalOrdinal nx = 2, ny=2;
   const Teuchos::RCP<const tpetra_map_type> rowmap = tif_utest::create_tpetra_map<LocalOrdinal,GlobalOrdinal,Node>(4);
   RCP<crs_matrix_type> mtx = Teuchos::rcp(new crs_matrix_type(rowmap,4));

diff --git a/packages/shylu/shylu_node/cmake/Dependencies.cmake b/packages/shylu/shylu_node/cmake/Dependencies.cmake
@@ -5,7 +5,7 @@ SET(SUBPACKAGES_DIRS_CLASSIFICATIONS_OPTREQS
   HTS                   hts               ST       OPTIONAL
   Tacho                 tacho             PT       OPTIONAL
   Basker                basker            EX       OPTIONAL
-  FastILU               fastilu           EX       OPTIONAL
+  FastILU               fastilu           PT       OPTIONAL
   )
 
 SET(LIB_REQUIRED_DEP_PACKAGES)

diff --git a/packages/shylu/shylu_node/fastilu/src/shylu_fastic.hpp b/packages/shylu/shylu_node/fastilu/src/shylu_fastic.hpp
@@ -242,16 +242,16 @@ class FastICPrec
             initTime = t;
         }
 
-        void getL(OrdinalArray &lRowMap_, OrdinalArray &lColIdx_, ScalarArray &lVal_)
+        void getL(OrdinalArray &lRowMapArg, OrdinalArray &lColIdxArg, ScalarArray &lValArg)
         {
-            lRowMap_ = lRowMap;
-            lColIdx_ = lColIdx;
-            lVal_ = lVal;
+            lRowMapArg = lRowMap;
+            lColIdxArg = lColIdx;
+            lValArg = lVal;
         }
 
-        void getD(ScalarArray &diagElems_)
+        void getD(ScalarArray &diagElemsArg)
         {
-            diagElems_ = diagElems;
+            diagElemsArg = diagElems;
         }
 
         void transposeL()

diff --git a/packages/shylu/shylu_node/fastilu/src/shylu_fastildl.hpp b/packages/shylu/shylu_node/fastilu/src/shylu_fastildl.hpp
@@ -118,10 +118,6 @@ class FastILDLPrec
         ScalarArray ltVal;
         OrdinalArray ltColIdx;
         OrdinalArray ltRowMap;
-        // mirrors
-        ScalarArrayMirror ltVal_;
-        OrdinalArrayMirror ltColIdx_;
-        OrdinalArrayMirror ltRowMap_;
 
         //Pointer to the original host copy of A.
         ScalarArrayMirror aValHost;