Cleaning up namespace utilization based on review comments

Signed-off-by: Luc Berger-Vergiat <lberge@sandia.gov>

Author: lucbv

tests/kokkos-based/gtest_fixtures.hpp

@@ -26,9 +26,10 @@
 
 // it is fine to put these here even if this
 // is a header since this is limited to tests
-using Kokkos::mdspan;
-using Kokkos::extents;
-using Kokkos::dynamic_extent;
+using MDSPAN_IMPL_STANDARD_NAMESPACE::mdspan;
+using MDSPAN_IMPL_STANDARD_NAMESPACE::extents;
+using MDSPAN_IMPL_STANDARD_NAMESPACE::dynamic_extent;
+using MDSPAN_IMPL_STANDARD_NAMESPACE::MDSPAN_IMPL_PROPOSED_NAMESPACE::dims;
 
 //
 // helper class for generating random numbers
@@ -170,7 +171,7 @@ class _blas1_signed_fixture : public ::testing::Test
   Kokkos::View<value_type*, Kokkos::HostSpace> y_view;
   Kokkos::View<value_type*, Kokkos::HostSpace> z_view;
 
-  using mdspan_t = mdspan<value_type, extents<size_t, dynamic_extent>>;
+  using mdspan_t = mdspan<value_type, dims<1>>;
   mdspan_t x;
   mdspan_t y;
   mdspan_t z;
@@ -292,8 +293,8 @@ class _blas2_signed_fixture : public ::testing::Test
   Kokkos::View<value_type*,  Kokkos::HostSpace> y_e0_view;
   Kokkos::View<value_type*,  Kokkos::HostSpace> z_e0_view;
 
-  using mdspan_r1_t = mdspan<value_type, extents<size_t, dynamic_extent>>;
-  using mdspan_r2_t = mdspan<value_type, extents<size_t, dynamic_extent, dynamic_extent>>;
+  using mdspan_r1_t = mdspan<value_type, dims<1>>;
+  using mdspan_r2_t = mdspan<value_type, dims<2>>;
   mdspan_r2_t A_e0e1; //e0 x e1
   mdspan_r2_t B_e0e1; //e0 x e1
   mdspan_r2_t A_sym_e0; //e0 x e0, symmetric

tests/kokkos-based/helpers.hpp

@@ -92,7 +92,7 @@ mdspan_t make_mdspan(ValueType *data, std::size_t ext0, std::size_t ext1) {
 template<class A_t, class ValueType = typename A_t::value_type>
 void set(A_t A, ValueType value)
 {
-  using index_type = typename Kokkos::extents<size_t>::index_type;
+  using index_type = typename MDSPAN_IMPL_STANDARD_NAMESPACE::extents<size_t>::index_type;
   for (index_type i = 0; i < A.extent(0); ++i) {
     for (index_type j = 0; j < A.extent(1); ++j) {
       A(i, j) = value;

tests/kokkos-based/mdspan_to_view.cpp

@@ -11,15 +11,15 @@ void expect_shallow_copy(MDSpanType mdsp, KViewType kv)
 template<class MDSpanValueType, class KViewValueType = MDSpanValueType>
 void mdspan_to_view_test_impl()
 {
-  using Kokkos::mdspan;
-  using Kokkos::extents;
-  using Kokkos::dynamic_extent;
-  using Kokkos::dim;
+  using MDSPAN_IMPL_STANDARD_NAMESPACE::mdspan;
+  using MDSPAN_IMPL_STANDARD_NAMESPACE::extents;
+  using MDSPAN_IMPL_STANDARD_NAMESPACE::dynamic_extent;
+  using MDSPAN_IMPL_STANDARD_NAMESPACE::MDSPAN_IMPL_PROPOSED_NAMESPACE::dims;
 
   // rank1, non-const
   {
     std::vector<MDSpanValueType> a(5);
-    using mdspan_t = mdspan<MDSpanValueType, dim<1>>;
+    using mdspan_t = mdspan<MDSpanValueType, dims<1>>;
     mdspan_t mdsp(a.data(), a.size());
 
     auto kv = KokkosKernelsSTD::Impl::mdspan_to_view(mdsp);
@@ -33,7 +33,7 @@ void mdspan_to_view_test_impl()
   // rank1, const
   {
     std::vector<MDSpanValueType> a(5);
-    using mdspan_t = mdspan<const MDSpanValueType, dim<1>>;
+    using mdspan_t = mdspan<const MDSpanValueType, dims<1>>;
     mdspan_t mdsp(a.data(), a.size());
 
     auto kv = KokkosKernelsSTD::Impl::mdspan_to_view(mdsp);
@@ -47,7 +47,7 @@ void mdspan_to_view_test_impl()
   // rank2, non-const
   {
     std::vector<MDSpanValueType> a(12);
-    using mdspan_t = mdspan<MDSpanValueType, dim<2>>;
+    using mdspan_t = mdspan<MDSpanValueType, dims<2>>;
     mdspan_t mdsp(a.data(), 3, 4);
 
     auto kv = KokkosKernelsSTD::Impl::mdspan_to_view(mdsp);
@@ -62,7 +62,7 @@ void mdspan_to_view_test_impl()
   // rank2, const
   {
     std::vector<MDSpanValueType> a(12);
-    using mdspan_t = mdspan<const MDSpanValueType, dim<2>>;
+    using mdspan_t = mdspan<const MDSpanValueType, dims<2>>;
     mdspan_t mdsp(a.data(), 3, 4);
 
     auto kv = KokkosKernelsSTD::Impl::mdspan_to_view(mdsp);
@@ -95,10 +95,10 @@ TEST(mdspan_to_view, for_complex_double){
 template<class MDSpanValueType, class KViewValueType = MDSpanValueType>
 void transposed_mdspan_to_view_test_impl()
 {
-  using Kokkos::mdspan;
-  using Kokkos::extents;
-  using Kokkos::dynamic_extent;
-  using Kokkos::dim;
+  using MDSPAN_IMPL_STANDARD_NAMESPACE::mdspan;
+  using MDSPAN_IMPL_STANDARD_NAMESPACE::extents;
+  using MDSPAN_IMPL_STANDARD_NAMESPACE::dynamic_extent;
+  using MDSPAN_IMPL_STANDARD_NAMESPACE::MDSPAN_IMPL_PROPOSED_NAMESPACE::dims;
 
   using lr_t = Kokkos::layout_right;
   using ll_t = Kokkos::layout_left;
@@ -108,7 +108,7 @@ void transposed_mdspan_to_view_test_impl()
 
   {
     // mdspan is layout right
-    using mdspan_t = mdspan<MDSpanValueType, dim<2>, lr_t>;
+    using mdspan_t = mdspan<MDSpanValueType, dims<2>, lr_t>;
     mdspan_t mdsp(a.data(), 3, 4);
     auto mdsp_T = MDSPAN_IMPL_STANDARD_NAMESPACE::MDSPAN_IMPL_PROPOSED_NAMESPACE::linalg::transposed(mdsp);
 
@@ -136,7 +136,7 @@ void transposed_mdspan_to_view_test_impl()
 
   {
     // mdspan is layout left
-    using mdspan_t = mdspan<MDSpanValueType, dim<2>, ll_t>;
+    using mdspan_t = mdspan<MDSpanValueType, dims<2>, ll_t>;
     mdspan_t mdsp(a.data(), 3, 4);
     auto mdsp_T = MDSPAN_IMPL_STANDARD_NAMESPACE::MDSPAN_IMPL_PROPOSED_NAMESPACE::linalg::transposed(mdsp);
 

tpl-implementations/include/experimental/__p1673_bits/kokkos-kernels/static_extent_match.hpp

@@ -24,8 +24,10 @@ namespace Impl {
 template <class size_type>
 constexpr bool static_extent_match(size_type extent1, size_type extent2)
 {
-  return extent1 == Kokkos::dynamic_extent ||
-         extent2 == Kokkos::dynamic_extent ||
+  using MDSPAN_IMPL_STANDARD_NAMESPACE::dynamic_extent;
+
+  return extent1 == dynamic_extent ||
+         extent2 == dynamic_extent ||
          extent1 == extent2;
 }