Cleaning code based on reviews

Next commit will tackle the issues associated with namespaces.

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

Author: lucbv

tests/kokkos-based/helpers.hpp

@@ -92,9 +92,9 @@ 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 size_type = typename Kokkos::extents<size_t>::size_type;
-  for (size_type i = 0; i < A.extent(0); ++i) {
-    for (size_type j = 0; j < A.extent(1); ++j) {
+  using index_type = typename Kokkos::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

@@ -14,11 +14,12 @@ void mdspan_to_view_test_impl()
   using Kokkos::mdspan;
   using Kokkos::extents;
   using Kokkos::dynamic_extent;
+  using Kokkos::dim;
 
   // rank1, non-const
   {
     std::vector<MDSpanValueType> a(5);
-    using mdspan_t = mdspan<MDSpanValueType, extents<size_t, dynamic_extent>>;
+    using mdspan_t = mdspan<MDSpanValueType, dim<1>>;
     mdspan_t mdsp(a.data(), a.size());
 
     auto kv = KokkosKernelsSTD::Impl::mdspan_to_view(mdsp);
@@ -32,7 +33,7 @@ void mdspan_to_view_test_impl()
   // rank1, const
   {
     std::vector<MDSpanValueType> a(5);
-    using mdspan_t = mdspan<const MDSpanValueType, extents<size_t, dynamic_extent>>;
+    using mdspan_t = mdspan<const MDSpanValueType, dim<1>>;
     mdspan_t mdsp(a.data(), a.size());
 
     auto kv = KokkosKernelsSTD::Impl::mdspan_to_view(mdsp);
@@ -46,7 +47,7 @@ void mdspan_to_view_test_impl()
   // rank2, non-const
   {
     std::vector<MDSpanValueType> a(12);
-    using mdspan_t = mdspan<MDSpanValueType, extents<size_t, dynamic_extent, dynamic_extent>>;
+    using mdspan_t = mdspan<MDSpanValueType, dim<2>>;
     mdspan_t mdsp(a.data(), 3, 4);
 
     auto kv = KokkosKernelsSTD::Impl::mdspan_to_view(mdsp);
@@ -61,7 +62,7 @@ void mdspan_to_view_test_impl()
   // rank2, const
   {
     std::vector<MDSpanValueType> a(12);
-    using mdspan_t = mdspan<const MDSpanValueType, extents<size_t, dynamic_extent, dynamic_extent>>;
+    using mdspan_t = mdspan<const MDSpanValueType, dim<2>>;
     mdspan_t mdsp(a.data(), 3, 4);
 
     auto kv = KokkosKernelsSTD::Impl::mdspan_to_view(mdsp);
@@ -97,6 +98,7 @@ void transposed_mdspan_to_view_test_impl()
   using Kokkos::mdspan;
   using Kokkos::extents;
   using Kokkos::dynamic_extent;
+  using Kokkos::dim;
 
   using lr_t = Kokkos::layout_right;
   using ll_t = Kokkos::layout_left;
@@ -106,7 +108,7 @@ void transposed_mdspan_to_view_test_impl()
 
   {
     // mdspan is layout right
-    using mdspan_t = mdspan<MDSpanValueType, extents<size_t, dynamic_extent, dynamic_extent>, lr_t>;
+    using mdspan_t = mdspan<MDSpanValueType, dim<2>, lr_t>;
     mdspan_t mdsp(a.data(), 3, 4);
     auto mdsp_T = MDSPAN_IMPL_STANDARD_NAMESPACE::MDSPAN_IMPL_PROPOSED_NAMESPACE::linalg::transposed(mdsp);
 
@@ -134,7 +136,7 @@ void transposed_mdspan_to_view_test_impl()
 
   {
     // mdspan is layout left
-    using mdspan_t = mdspan<MDSpanValueType, extents<size_t, dynamic_extent, dynamic_extent>, ll_t>;
+    using mdspan_t = mdspan<MDSpanValueType, dim<2>, ll_t>;
     mdspan_t mdsp(a.data(), 3, 4);
     auto mdsp_T = MDSPAN_IMPL_STANDARD_NAMESPACE::MDSPAN_IMPL_PROPOSED_NAMESPACE::linalg::transposed(mdsp);
 

tests/native/conjugated.cpp

@@ -290,10 +290,6 @@ namespace {
   {
     using MDSPAN_IMPL_STANDARD_NAMESPACE :: MDSPAN_IMPL_PROPOSED_NAMESPACE :: linalg::impl::has_conj;
 
-    // static_assert(! has_conj<int>::value);
-    // static_assert(! has_conj< ::std::size_t>::value);
-    // static_assert(! has_conj<float>::value);
-    // static_assert(! has_conj<double>::value);
     static_assert(! has_conj<nonarithmetic_real>::value);
 
     static_assert(has_conj<std::complex<float>>::value);

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

@@ -11,10 +11,10 @@ namespace KokkosKernelsSTD {
 
 template<class ExeSpace,
 	 class ElementType_x,
-	 Kokkos::extents<int>::size_type ext_x,
+	 size_t ext_x,
          class Layout_x,
          class ElementType_y,
-	 Kokkos::extents<int>::size_type ext_y,
+	 size_t ext_y,
          class Layout_y,
    class Scalar>
 Scalar dot(kokkos_exec<ExeSpace> /*kexe*/,
@@ -71,10 +71,10 @@ Scalar dot(kokkos_exec<ExeSpace> /*kexe*/,
 
 template<class ExeSpace,
 	 class ElementType_x,
-	 Kokkos::extents<int>::size_type ext_x,
+	 size_t ext_x,
          class Layout_x,
          class ElementType_y,
-	 Kokkos::extents<int>::size_type ext_y,
+	 size_t ext_y,
          class Layout_y,
 	 class Scalar>
 Scalar dot(kokkos_exec<ExeSpace>,