Sparse, Graph: remove deprecated declarations

benchmarks/sparse/KokkosSparse_par_ilut.cpp

@@ -36,8 +36,8 @@ namespace {
 using KokkosSparse::Experimental::par_ilut_numeric;
 using KokkosSparse::Experimental::par_ilut_symbolic;
 
-using KokkosSparse::Experimental::spiluk_numeric;
-using KokkosSparse::Experimental::spiluk_symbolic;
+using KokkosSparse::spiluk_numeric;
+using KokkosSparse::spiluk_symbolic;
 using KokkosSparse::Experimental::SPILUKAlgorithm;
 
 // Build up useful types

docs/source/API/sparse/CrsMatrix_constructors.rst

@@ -11,13 +11,6 @@ KokkosSparse::CrsMatrix<>::CrsMatrix
   template <typename InScalar, typename InOrdinal, typename InDevice, typename InMemTraits, typename InSizeType>
   CrsMatrix(const std::string&, const CrsMatrix<InScalar, InOrdinal, InDevice, InMemTraits, InSizeType>& mat_);
 
-  template <typename InOrdinal, typename InLayout, typename InDevice, typename InMemTraits, typename InSizeType>
-  [[deprecated(
-      "Use the constructor that accepts ncols as input "
-      "instead.")]] CrsMatrix(const std::string& label,
-                              const Kokkos::StaticCrsGraph<InOrdinal, InLayout, InDevice, InMemTraits, InSizeType>&
-                                  graph_);
-
   template <typename InOrdinal, typename InLayout, typename InDevice, typename InMemTraits, typename InSizeType>
   CrsMatrix(const std::string& label,
             const Kokkos::StaticCrsGraph<InOrdinal, InLayout, InDevice, InMemTraits, InSizeType>& graph_,
@@ -38,11 +31,10 @@ Constructs a CrsMatrix from specified inputs.
 1. Default constructors with empty graph and values.
 2. Copy constructor, it performs shallow copies of the underlying data into the constructed CrsMatrix.
 3. Copy constructor, does a deep copy of the ``mat_`` into the constructed CrsMatrix. ``mat_`` and the constructed CrsMatrix can be in different memory spaces.
-4. **Deprecated** Constructor from existing ``graph_``. It makes a shallow copy of the graph and initializes the ``values`` view to zeros and sets its label.
-5. Constructor from existing ``graph_``. It makes a shallow copy of the graph and initializes the ``values`` view to zeros and sets its label, assign the number of columns to ``ncols``.
-6. Construct the matrix from ``graph_``, ``values`` and ``ncols`` using their respective copy constructors (shallow copies).
-7. Constructor from raw pointers on host, the pointers are wrapped into unmanaged views that are then deep copied into device views.
-8. Constructor using input views and copy constructs the underlying graph and values view.
+4. Constructor from existing ``graph_``. It makes a shallow copy of the graph and initializes the ``values`` view to zeros and sets its label, assign the number of columns to ``ncols``.
+5. Construct the matrix from ``graph_``, ``values`` and ``ncols`` using their respective copy constructors (shallow copies).
+6. Constructor from raw pointers on host, the pointers are wrapped into unmanaged views that are then deep copied into device views.
+7. Constructor using input views and copy constructs the underlying graph and values view.
 
 ..
    .. warning::

docs/source/deprecation_page.rst

@@ -15,4 +15,3 @@ The following macros are deprecated as they ignore the standard or Kokkos' reser
 - ``__KOKKOSBATCHED_ENABLE_INTEL_MKL__``
 - ``__KOKKOSBATCHED_ENABLE_INTEL_MKL_BATCHED__``
 - ``__KOKKOSBATCHED_ENABLE_AVX__``
-- ``KOKKOS_CUSPARSE_SAFE_CALL``

graph/src/KokkosGraph_MIS2.hpp

@@ -75,36 +75,4 @@ inline const char* mis2_algorithm_name(MIS2_Algorithm algo) {
 
 }  // end namespace KokkosGraph
 
-// For backward compatibility
-namespace KokkosGraph {
-namespace Experimental {
-
-template <typename device_t, typename rowmap_t, typename colinds_t,
-          typename lno_view_t = typename colinds_t::non_const_type>
-[[deprecated]] lno_view_t graph_d2_mis(const rowmap_t& rowmap, const colinds_t& colinds,
-                                       MIS2_Algorithm algo = MIS2_FAST) {
-  return KokkosGraph::graph_d2_mis<device_t, rowmap_t, colinds_t, lno_view_t>(rowmap, colinds, algo);
-}
-
-template <typename device_t, typename rowmap_t, typename colinds_t,
-          typename labels_t = typename colinds_t::non_const_type>
-[[deprecated]] labels_t graph_mis2_coarsen(const rowmap_t& rowmap, const colinds_t& colinds,
-                                           typename colinds_t::non_const_value_type& numClusters) {
-  return KokkosGraph::graph_mis2_coarsen<device_t, rowmap_t, colinds_t, labels_t>(rowmap, colinds, numClusters);
-}
-
-template <typename device_t, typename rowmap_t, typename colinds_t,
-          typename labels_t = typename colinds_t::non_const_type>
-[[deprecated]] labels_t graph_mis2_aggregate(const rowmap_t& rowmap, const colinds_t& colinds,
-                                             typename colinds_t::non_const_value_type& numAggregates) {
-  return KokkosGraph::graph_mis2_aggregate<device_t, rowmap_t, colinds_t, labels_t>(rowmap, colinds, numAggregates);
-}
-
-[[deprecated]] inline const char* mis2_algorithm_name(MIS2_Algorithm algo) {
-  return KokkosGraph::mis2_algorithm_name(algo);
-}
-
-}  // namespace Experimental
-}  // namespace KokkosGraph
-
 #endif

sparse/src/KokkosSparse_BsrMatrix.hpp

@@ -317,11 +317,6 @@ class BsrMatrix {
 
   //! Type of a host-memory mirror of the sparse matrix.
   typedef BsrMatrix<ScalarType, OrdinalType, host_mirror_space, MemoryTraits, size_type> host_mirror_type;
-#ifdef KOKKOS_ENABLE_DEPRECATED_CODE_4
-  [[deprecated(
-      "KokkosSparse::BsrMatrix::HostMirror is deprecated please use KokkosSparse::BsrMatrix::host_mirror_type "
-      "instead.")]] typedef host_mirror_type HostMirror;
-#endif
   //! Type of the graph structure of the sparse matrix.
   typedef StaticCrsGraph<ordinal_type, Kokkos::LayoutLeft, device_type, memory_traits, size_type> StaticCrsGraphType;
   //! Type of the graph structure of the sparse matrix - consistent with Kokkos.

sparse/src/KokkosSparse_CrsMatrix.hpp

@@ -330,11 +330,6 @@ class CrsMatrix {
 
   //! Type of a host-memory mirror of the sparse matrix.
   typedef CrsMatrix<ScalarType, OrdinalType, host_mirror_space, MemoryTraits, SizeType> host_mirror_type;
-#ifdef KOKKOS_ENABLE_DEPRECATED_CODE_4
-  [[deprecated(
-      "KokkosSparse::CrsMatrix::HostMirror is deprecated please use KokkosSparse::CrsMatrix::host_mirror_type "
-      "instead.")]] typedef host_mirror_type HostMirror;
-#endif
   //! Type of the graph structure of the sparse matrix.
   typedef StaticCrsGraph<ordinal_type, KokkosKernels::default_layout, device_type, memory_traits, size_type>
       StaticCrsGraphType;
@@ -433,18 +428,6 @@ class CrsMatrix {
     graph    = StaticCrsGraphType(cols, rowmap);
   }
 
-  /// \brief Construct with a graph that will be shared.
-  ///
-  /// Allocate the values array for subsequent fill.
-  template <typename InOrdinal, typename InLayout, typename InDevice, typename InMemTraits, typename InSizeType>
-  [[deprecated(
-      "Use the constructor that accepts ncols as input "
-      "instead.")]] CrsMatrix(const std::string& label,
-                              const StaticCrsGraph<InOrdinal, InLayout, InDevice, InMemTraits, InSizeType>& graph_)
-      : graph(graph_.entries, graph_.row_map),
-        values(label, graph_.entries.extent(0)),
-        numCols_(maximum_entry(graph_) + 1) {}
-
   /// \brief Constructor that accepts a a static graph, and numCols.
   ///
   /// The matrix will store and use the row map, indices

sparse/src/KokkosSparse_StaticCrsGraph.hpp

@@ -253,12 +253,6 @@ class StaticCrsGraph {
   using staticcrsgraph_type = StaticCrsGraph<DataType, Arg1Type, Arg2Type, Arg3Type, SizeType>;
   using host_mirror_type =
       StaticCrsGraph<data_type, array_layout, typename traits::host_mirror_space, memory_traits, size_type>;
-#ifdef KOKKOS_ENABLE_DEPRECATED_CODE_4
-  [[deprecated(
-      "KokkosSparse::StaticCrsGraph::HostMirror is deprecated please use "
-      "KokkosSparse::StaticCrsGraph::host_mirror_type instead.")]] using HostMirror = host_mirror_type;
-#endif
-
   using row_map_type   = Kokkos::View<const size_type*, array_layout, device_type, memory_traits>;
   using entries_type   = Kokkos::View<data_type*, array_layout, device_type, memory_traits>;
   using row_block_type = Kokkos::View<const size_type*, array_layout, device_type, memory_traits>;

sparse/src/KokkosSparse_Utils_cusparse.hpp

@@ -54,21 +54,6 @@ inline void cusparse_internal_safe_call(cusparseStatus_t cusparseStatus, const c
 #define KOKKOSSPARSE_IMPL_CUSPARSE_SAFE_CALL(call) \
   KokkosSparse::Impl::cusparse_internal_safe_call(call, #call, __FILE__, __LINE__)
 
-// Deprecated public interface for the cuSparse safe calls
-#if defined(KOKKOS_COMPILER_MSVC)
-#define KOKKOS_CUSPARSE_SAFE_CALL(call)                                                                          \
-  (__pragma(message("warning: KOKKOS_CUSPARSE_SAFE_CALL is deprecated and will be removed in a future version")) \
-       KOKKOSPARSE_IMPL_CUSPARSE_SAFE_CALL(call))
-#elif defined(KOKKOS_COMPILER_GNU) || defined(KOKKOS_COMPILER_CLANG)
-#define KOKKOS_CUSPARSE_SAFE_CALL(call)                                                             \
-  (__extension__({                                                                                  \
-    _Pragma("\"KOKKOS_CUSPARSE_SAFE_CALL is deprecated and will be removed in a future version\""); \
-    KOKKOSPARSE_IMPL_CUSPARSE_SAFE_CALL(call);                                                      \
-  }))
-#else
-#define KOKKOS_CUSPARSE_SAFE_CALL(call) KOKKOSPARSE_IMPL_CUSPARSE_SAFE_CALL(call)  // no good way to deprecate?
-#endif
-
 template <typename T>
 cudaDataType cuda_data_type_from() {
   // Note:  compile-time failure is disabled to allow for packages such as