MueLu: Remove deprecated NullspaceFactory_kokkos

Signed-off-by: Christian Glusa <[email protected]>
trilinos · Dec 10, 2024 · b96086a · b96086a
1 parent 9a371c3
commit b96086a
Show file tree

Hide file tree

Showing 8 changed files with 0 additions and 73 deletions.
diff --git a/packages/muelu/src/Headers/MueLu_UseShortNamesScalar.hpp b/packages/muelu/src/Headers/MueLu_UseShortNamesScalar.hpp
@@ -218,9 +218,6 @@ using NotayAggregationFactory [[maybe_unused]] = MueLu::NotayAggregationFactory<
 #ifdef MUELU_NULLSPACEFACTORY_SHORT
 using NullspaceFactory [[maybe_unused]] = MueLu::NullspaceFactory<Scalar, LocalOrdinal, GlobalOrdinal, Node>;
 #endif
-#ifdef MUELU_NULLSPACEFACTORY_KOKKOS_SHORT
-using NullspaceFactory_kokkos [[maybe_unused]] = MueLu::NullspaceFactory_kokkos<Scalar, LocalOrdinal, GlobalOrdinal, Node>;
-#endif
 #ifdef MUELU_NULLSPACEPRESMOOTHFACTORY_SHORT
 using NullspacePresmoothFactory [[maybe_unused]] = MueLu::NullspacePresmoothFactory<Scalar, LocalOrdinal, GlobalOrdinal, Node>;
 #endif

diff --git a/packages/muelu/src/Interface/MueLu_FactoryFactory_decl.hpp b/packages/muelu/src/Interface/MueLu_FactoryFactory_decl.hpp
@@ -126,7 +126,6 @@
 #include "MueLu_CoalesceDropFactory_kokkos_fwd.hpp"
 #include "MueLu_GeometricInterpolationPFactory_kokkos_fwd.hpp"
 #ifdef HAVE_MUELU_DEPRECATED_CODE
-#include "MueLu_NullspaceFactory_kokkos_fwd.hpp"
 #include "MueLu_SaPFactory_kokkos_fwd.hpp"
 #endif
 #include "MueLu_SemiCoarsenPFactory_kokkos_fwd.hpp"

diff --git a/packages/muelu/src/Interface/MueLu_FactoryFactory_def.hpp b/packages/muelu/src/Interface/MueLu_FactoryFactory_def.hpp
@@ -105,7 +105,6 @@
 #include "MueLu_CoalesceDropFactory_kokkos.hpp"
 #include "MueLu_GeometricInterpolationPFactory_kokkos.hpp"
 #ifdef HAVE_MUELU_DEPRECATED_CODE
-#include "MueLu_NullspaceFactory_kokkos.hpp"
 #include "MueLu_SaPFactory_kokkos.hpp"
 #endif
 #include "MueLu_SemiCoarsenPFactory_kokkos.hpp"
@@ -216,7 +215,6 @@ RCP<const FactoryBase> FactoryFactory<Scalar, LocalOrdinal, GlobalOrdinal, Node>
   if (factoryName == "CoalesceDropFactory_kokkos") return Build2<CoalesceDropFactory_kokkos>(paramList, factoryMapIn, factoryManagersIn);
   if (factoryName == "GeometricInterpolationPFactory_kokkos") return Build2<GeometricInterpolationPFactory_kokkos>(paramList, factoryMapIn, factoryManagersIn);
 #ifdef HAVE_MUELU_DEPRECATED_CODE
-  if (factoryName == "NullspaceFactory_kokkos") return Build2<NullspaceFactory_kokkos>(paramList, factoryMapIn, factoryManagersIn);
   if (factoryName == "SaPFactory_kokkos") return Build2<SaPFactory_kokkos>(paramList, factoryMapIn, factoryManagersIn);
 #endif
   if (factoryName == "SemiCoarsenPFactory_kokkos") return Build2<SemiCoarsenPFactory_kokkos>(paramList, factoryMapIn, factoryManagersIn);

diff --git a/packages/muelu/src/Transfers/Smoothed-Aggregation/MueLu_NullspaceFactory_kokkos_decl.hpp b/packages/muelu/src/Transfers/Smoothed-Aggregation/MueLu_NullspaceFactory_kokkos_decl.hpp
diff --git a/packages/muelu/src/Transfers/Smoothed-Aggregation/MueLu_NullspaceFactory_kokkos_def.hpp b/packages/muelu/src/Transfers/Smoothed-Aggregation/MueLu_NullspaceFactory_kokkos_def.hpp
diff --git a/packages/muelu/src/Utils/ClassList/SC-LO-GO-NO.classList b/packages/muelu/src/Utils/ClassList/SC-LO-GO-NO.classList
@@ -67,7 +67,6 @@ MergedSmoother
 MultiVectorTransferFactory
 NotayAggregationFactory
 NullspaceFactory
-NullspaceFactory_kokkos - #if defined(HAVE_MUELU_DEPRECATED_CODE)
 NullspacePresmoothFactory
 ParameterListInterpreter
 PatternFactory

diff --git a/packages/muelu/src/Utils/ExplicitInstantiation/ETI_SC_LO_GO_NO_classes.cmake b/packages/muelu/src/Utils/ExplicitInstantiation/ETI_SC_LO_GO_NO_classes.cmake
@@ -66,7 +66,6 @@ APPEND_SET(MUELU_SC_LO_GO_NO_ETI_CLASSES MueLu::MergedSmoother )
 APPEND_SET(MUELU_SC_LO_GO_NO_ETI_CLASSES MueLu::MultiVectorTransferFactory )
 APPEND_SET(MUELU_SC_LO_GO_NO_ETI_CLASSES MueLu::NotayAggregationFactory )
 APPEND_SET(MUELU_SC_LO_GO_NO_ETI_CLASSES MueLu::NullspaceFactory )
-APPEND_SET(MUELU_SC_LO_GO_NO_ETI_CLASSES MueLu::NullspaceFactory_kokkos-.?if.defined[HAVE_MUELU_DEPRECATED_CODE] )
 APPEND_SET(MUELU_SC_LO_GO_NO_ETI_CLASSES MueLu::NullspacePresmoothFactory )
 APPEND_SET(MUELU_SC_LO_GO_NO_ETI_CLASSES MueLu::ParameterListInterpreter )
 APPEND_SET(MUELU_SC_LO_GO_NO_ETI_CLASSES MueLu::PatternFactory )

diff --git a/packages/muelu/src/Utils/ForwardDeclaration/MueLu_NullspaceFactory_kokkos_fwd.hpp b/packages/muelu/src/Utils/ForwardDeclaration/MueLu_NullspaceFactory_kokkos_fwd.hpp