diff --git a/packages/muelu/src/Headers/MueLu_UseShortNamesScalar.hpp b/packages/muelu/src/Headers/MueLu_UseShortNamesScalar.hpp index b094106158d5..a5bf3f68b544 100644 --- 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; #endif -#ifdef MUELU_NULLSPACEFACTORY_KOKKOS_SHORT -using NullspaceFactory_kokkos [[maybe_unused]] = MueLu::NullspaceFactory_kokkos; -#endif #ifdef MUELU_NULLSPACEPRESMOOTHFACTORY_SHORT using NullspacePresmoothFactory [[maybe_unused]] = MueLu::NullspacePresmoothFactory; #endif diff --git a/packages/muelu/src/Interface/MueLu_FactoryFactory_decl.hpp b/packages/muelu/src/Interface/MueLu_FactoryFactory_decl.hpp index a6c6add07da2..5176bc2fb677 100644 --- 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 index cc144b4366fe..0694928ceceb 100644 --- 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 FactoryFactory if (factoryName == "CoalesceDropFactory_kokkos") return Build2(paramList, factoryMapIn, factoryManagersIn); if (factoryName == "GeometricInterpolationPFactory_kokkos") return Build2(paramList, factoryMapIn, factoryManagersIn); #ifdef HAVE_MUELU_DEPRECATED_CODE - if (factoryName == "NullspaceFactory_kokkos") return Build2(paramList, factoryMapIn, factoryManagersIn); if (factoryName == "SaPFactory_kokkos") return Build2(paramList, factoryMapIn, factoryManagersIn); #endif if (factoryName == "SemiCoarsenPFactory_kokkos") return Build2(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 deleted file mode 100644 index 82fd49a91699..000000000000 --- a/packages/muelu/src/Transfers/Smoothed-Aggregation/MueLu_NullspaceFactory_kokkos_decl.hpp +++ /dev/null @@ -1,23 +0,0 @@ -// @HEADER -// ***************************************************************************** -// MueLu: A package for multigrid based preconditioning -// -// Copyright 2012 NTESS and the MueLu contributors. -// SPDX-License-Identifier: BSD-3-Clause -// ***************************************************************************** -// @HEADER - -#ifndef MUELU_NULLSPACEFACTORY_KOKKOS_DECL_HPP -#define MUELU_NULLSPACEFACTORY_KOKKOS_DECL_HPP - -#include "MueLu_NullspaceFactory.hpp" - -namespace MueLu { - -template -class [[deprecated]] NullspaceFactory_kokkos : public NullspaceFactory {}; - -} // namespace MueLu - -#define MUELU_NULLSPACEFACTORY_KOKKOS_SHORT -#endif // 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 deleted file mode 100644 index bad8376962c7..000000000000 --- a/packages/muelu/src/Transfers/Smoothed-Aggregation/MueLu_NullspaceFactory_kokkos_def.hpp +++ /dev/null @@ -1,15 +0,0 @@ -// @HEADER -// ***************************************************************************** -// MueLu: A package for multigrid based preconditioning -// -// Copyright 2012 NTESS and the MueLu contributors. -// SPDX-License-Identifier: BSD-3-Clause -// ***************************************************************************** -// @HEADER - -#ifndef MUELU_NULLSPACEFACTORY_KOKKOS_DEF_HPP -#define MUELU_NULLSPACEFACTORY_KOKKOS_DEF_HPP - -#include "MueLu_NullspaceFactory_kokkos_decl.hpp" - -#endif // 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 index e00acf6f5b63..c606287c8edf 100644 --- 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 index 9b9aeff30d1e..20dc4095f4f0 100644 --- 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 deleted file mode 100644 index 805c7ee1970f..000000000000 --- a/packages/muelu/src/Utils/ForwardDeclaration/MueLu_NullspaceFactory_kokkos_fwd.hpp +++ /dev/null @@ -1,27 +0,0 @@ -// @HEADER -// ***************************************************************************** -// MueLu: A package for multigrid based preconditioning -// -// Copyright 2012 NTESS and the MueLu contributors. -// SPDX-License-Identifier: BSD-3-Clause -// ***************************************************************************** -// @HEADER - -#ifndef MUELU_NULLSPACEFACTORY_KOKKOS_FWD_HPP -#define MUELU_NULLSPACEFACTORY_KOKKOS_FWD_HPP - -#include "MueLu_ConfigDefs.hpp" -#if defined(HAVE_MUELU_DEPRECATED_CODE) - -namespace MueLu { -template -class NullspaceFactory_kokkos; -} - -#ifndef MUELU_NULLSPACEFACTORY_KOKKOS_SHORT -#define MUELU_NULLSPACEFACTORY_KOKKOS_SHORT -#endif - -#endif - -#endif // MUELU_NULLSPACEFACTORY_KOKKOS_FWD_HPP