Sparse SpMV: fixing more namespace issues!

kokkos · Mar 7, 2024 · 0cf6093 · 0cf6093
1 parent 54afcb6
commit 0cf6093
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 16 deletions.
diff --git a/...e/eti/generated_specializations_cpp/spmv/KokkosSparse_spmv_bsrmatrix_eti_spec_inst.cpp.in b/...e/eti/generated_specializations_cpp/spmv/KokkosSparse_spmv_bsrmatrix_eti_spec_inst.cpp.in
@@ -19,11 +19,9 @@
 #include "KokkosSparse_spmv_bsrmatrix_spec.hpp"
 
 namespace KokkosSparse {
-namespace Experimental {
 namespace Impl {
 // clang-format off
 @SPARSE_SPMV_BSRMATRIX_ETI_INST_BLOCK@
 // clang-format on
 }  // namespace Impl
-}  // namespace Experimental
-}  // namespace KokkosSparse
+}  // namespace KokkosSparse
diff --git a/...ti/generated_specializations_cpp/spmv/KokkosSparse_spmv_mv_bsrmatrix_eti_spec_inst.cpp.in b/...ti/generated_specializations_cpp/spmv/KokkosSparse_spmv_mv_bsrmatrix_eti_spec_inst.cpp.in
@@ -19,11 +19,9 @@
 #include "KokkosSparse_spmv_bsrmatrix_spec.hpp"
 
 namespace KokkosSparse {
-namespace Experimental {
 namespace Impl {
 // clang-format off
 @SPARSE_SPMV_MV_BSRMATRIX_ETI_INST_BLOCK@
 /// // clang-format on
 }  // namespace Impl
-}  // namespace Experimental
 }  // namespace KokkosSparse
diff --git a/sparse/eti/generated_specializations_hpp/KokkosSparse_spmv_bsrmatrix_eti_spec_avail.hpp.in b/sparse/eti/generated_specializations_hpp/KokkosSparse_spmv_bsrmatrix_eti_spec_avail.hpp.in
@@ -17,12 +17,10 @@
 #ifndef KOKKOSSPARSE_SPMV_BSRMATRIX_ETI_SPEC_AVAIL_HPP_
 #define KOKKOSSPARSE_SPMV_BSRMATRIX_ETI_SPEC_AVAIL_HPP_
 namespace KokkosSparse {
-namespace Experimental {
 namespace Impl {
 // clang-format off
 @SPARSE_SPMV_BSRMATRIX_ETI_AVAIL_BLOCK@
 // clang-format on
 }  // namespace Impl
-}  // namespace Experimental
 }  // namespace KokkosSparse
 #endif
diff --git a/...se/eti/generated_specializations_hpp/KokkosSparse_spmv_mv_bsrmatrix_eti_spec_avail.hpp.in b/...se/eti/generated_specializations_hpp/KokkosSparse_spmv_mv_bsrmatrix_eti_spec_avail.hpp.in
@@ -18,12 +18,10 @@
 #define KOKKOSSPARSE_SPMV_MV_BSRMATRIX_ETI_SPEC_AVAIL_HPP_
 
 namespace KokkosSparse {
-namespace Experimental {
 namespace Impl {
 // clang-format off
 @SPARSE_SPMV_MV_BSRMATRIX_ETI_AVAIL_BLOCK@
 // clang-format on
 }  // namespace Impl
-}  // namespace Experimental
 }  // namespace KokkosSparse
 #endif
diff --git a/sparse/impl/KokkosSparse_spmv_bsrmatrix_spec.hpp b/sparse/impl/KokkosSparse_spmv_bsrmatrix_spec.hpp
@@ -46,9 +46,6 @@ struct spmv_mv_bsrmatrix_eti_spec_avail {
   enum : bool { value = false };
 };
 
-}  // namespace Impl
-}  // namespace KokkosSparse
-
 #define KOKKOSSPARSE_SPMV_BSRMATRIX_ETI_SPEC_AVAIL(                        \
     SCALAR_TYPE, ORDINAL_TYPE, OFFSET_TYPE, LAYOUT_TYPE, EXEC_SPACE_TYPE,  \
     MEM_SPACE_TYPE)                                                        \
@@ -95,6 +92,9 @@ struct spmv_mv_bsrmatrix_eti_spec_avail {
     enum : bool { value = true };                                          \
   };
 
+}  // namespace Impl
+}  // namespace KokkosSparse
+
 // Include which ETIs are available
 #include <KokkosSparse_spmv_bsrmatrix_tpl_spec_avail.hpp>
 #include <generated_specializations_hpp/KokkosSparse_spmv_bsrmatrix_eti_spec_avail.hpp>

diff --git a/sparse/src/KokkosSparse_spmv.hpp b/sparse/src/KokkosSparse_spmv.hpp
@@ -377,7 +377,7 @@ void spmv(const ExecutionSpace& space, Handle* handle, const char mode[],
                 typename AMatrix_Internal::non_const_value_type>::name() +
             "]";
         Kokkos::Profiling::pushRegion(label);
-        Experimental::Impl::SPMV_MV_BSRMATRIX<
+        Impl::SPMV_MV_BSRMATRIX<
             ExecutionSpace, HandleImpl, AMatrix_Internal, XVector_Internal,
             YVector_Internal,
             std::is_integral<
@@ -386,7 +386,7 @@ void spmv(const ExecutionSpace& space, Handle* handle, const char mode[],
                                       beta, y_i);
         Kokkos::Profiling::popRegion();
       } else {
-        Experimental::Impl::SPMV_MV_BSRMATRIX<
+        Impl::SPMV_MV_BSRMATRIX<
             ExecutionSpace, HandleImpl, AMatrix_Internal, XVector_Internal,
             YVector_Internal,
             std::is_integral<typename AMatrix_Internal::const_value_type>::

diff --git a/sparse/tpls/KokkosSparse_spmv_bsrmatrix_tpl_spec_avail.hpp b/sparse/tpls/KokkosSparse_spmv_bsrmatrix_tpl_spec_avail.hpp
@@ -22,7 +22,6 @@
 #endif
 
 namespace KokkosSparse {
-namespace Experimental {
 namespace Impl {
 // Specialization struct which defines whether a specialization exists
 template <class ExecutionSpace, class Handle, class AMatrix, class XVector,
@@ -348,7 +347,6 @@ KOKKOSSPARSE_SPMV_BSRMATRIX_TPL_SPEC_AVAIL_ROCSPARSE(Kokkos::complex<double>,
 #endif  // defined(KOKKOSKERNELS_ENABLE_TPL_ROCSPARSE)
 
 }  // namespace Impl
-}  // namespace Experimental
 }  // namespace KokkosSparse
 
 #endif  // KOKKOSPARSE_SPMV_BSRMATRIX_TPL_SPEC_AVAIL_HPP_