Merge pull request #11720 from cgcgcg/mueluRemoveAmalgamationInfoKokkos

MueLu: Merge Kokkos and non-Kokkos AmalgamationInfo&Factory
trilinos · Mar 27, 2023 · f85b2e0 · f85b2e0
2 parents 11e668a + 98a0249
commit f85b2e0
Show file tree

Hide file tree

Showing 135 changed files with 474 additions and 1,329 deletions.
diff --git a/packages/muelu/research/caglusa/auxiliaryOperators.hpp b/packages/muelu/research/caglusa/auxiliaryOperators.hpp
@@ -15,7 +15,7 @@
 #include <MueLu_HierarchyManager.hpp>
 #include <MueLu_ParameterListInterpreter.hpp>
 #include <MueLu_RAPFactory.hpp>
-#include <MueLu_AmalgamationFactory_kokkos.hpp>
+#include <MueLu_AmalgamationFactory.hpp>
 #include <MueLu_CoalesceDropFactory_kokkos.hpp>
 #include <MueLu_ThresholdAFilterFactory.hpp>
 
@@ -105,7 +105,7 @@ namespace MueLu {
         fineLevel.Set("Coordinates",coords);
         fineLevel.Set("DofsPerNode",1);
         fineLevel.setlib(auxOp->getDomainMap()->lib());
-        auto amalgFact = rcp(new AmalgamationFactory_kokkos<Scalar,LocalOrdinal,GlobalOrdinal,Node>());
+        auto amalgFact = rcp(new AmalgamationFactory<Scalar,LocalOrdinal,GlobalOrdinal,Node>());
         auto dropFact = rcp(new CoalesceDropFactory_kokkos<Scalar,LocalOrdinal,GlobalOrdinal,Node>());
         dropFact->SetFactory("UnAmalgamationInfo", amalgFact);
 

diff --git a/packages/muelu/src/Graph/Containers/MueLu_Aggregates_kokkos_decl.hpp b/packages/muelu/src/Graph/Containers/MueLu_Aggregates_kokkos_decl.hpp
@@ -220,7 +220,7 @@ namespace MueLu {
 
         For local node ID i, the corresponding vector entry v[i] is the local aggregate id to which i belongs on the current processor.
     */
-    RCP<LOVector>& GetVertex2AggIdNonConst()     { return vertex2AggId_;       }
+    RCP<LOMultiVector>& GetVertex2AggIdNonConst()     { return vertex2AggId_;       }
 
     /*! @brief Returns nonconsant vector that maps local node IDs to owning processor IDs.
 
@@ -231,7 +231,7 @@ namespace MueLu {
 
         For local node ID i, the corresponding vector entry v[i] is the local aggregate id to which i belongs on the current processor.
     */
-    const RCP<LOVector>& GetVertex2AggId() const { return vertex2AggId_;       }
+    const RCP<LOMultiVector>& GetVertex2AggId() const { return vertex2AggId_;       }
 
     /*! @brief Returns constant vector that maps local node IDs to owning processor IDs.
 
@@ -293,7 +293,7 @@ namespace MueLu {
      * local id k has been assigned. While k is the local id on my processor (MyPID),
      * vertex2AggId[k] is the local id on the processor which actually owns the aggregate.
      */
-    RCP<LOVector> vertex2AggId_;
+    RCP<LOMultiVector> vertex2AggId_;
 
     /*!
      * If k is the local id on my processor (MyPID), the owning processor has the

diff --git a/packages/muelu/src/Graph/Containers/MueLu_Aggregates_kokkos_def.hpp b/packages/muelu/src/Graph/Containers/MueLu_Aggregates_kokkos_def.hpp
@@ -64,7 +64,7 @@ namespace MueLu {
     numAggregates_  = 0;
     numGlobalAggregates_  = 0;
 
-    vertex2AggId_ = LOVectorFactory::Build(graph.GetImportMap());
+    vertex2AggId_ = LOMultiVectorFactory::Build(graph.GetImportMap(), 1);
     vertex2AggId_->putScalar(MUELU_UNAGGREGATED);
 
     procWinner_ = LOVectorFactory::Build(graph.GetImportMap());
@@ -83,7 +83,7 @@ namespace MueLu {
     numAggregates_ = 0;
     numGlobalAggregates_  = 0;
 
-    vertex2AggId_ = LOVectorFactory::Build(map);
+    vertex2AggId_ = LOMultiVectorFactory::Build(map, 1);
     vertex2AggId_->putScalar(MUELU_UNAGGREGATED);
 
     procWinner_ = LOVectorFactory::Build(map);

diff --git a/packages/muelu/src/Graph/MatrixTransformation/MueLu_AmalgamationFactory_kokkos_decl.hpp b/packages/muelu/src/Graph/MatrixTransformation/MueLu_AmalgamationFactory_kokkos_decl.hpp