Make layout_stride::stride() constraints standard compliant

kokkos · Oct 20, 2023 · 1927de0 · 1927de0
1 parent 9ff2207
commit 1927de0
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 8 deletions.
diff --git a/include/experimental/__p0009_bits/layout_stride.hpp b/include/experimental/__p0009_bits/layout_stride.hpp
@@ -462,11 +462,7 @@ struct layout_stride {
 
 
     MDSPAN_INLINE_FUNCTION
-    constexpr index_type stride(rank_type r) const noexcept
-#if MDSPAN_HAS_CXX_20
-      requires ( Extents::rank() > 0 )
-#endif
-    {
+    constexpr index_type stride(rank_type r) const noexcept {
       return __strides_storage()[r];
     }
 

diff --git a/tests/libcxx-backports/layout_stride/layout_stride.properties.pass.cpp b/tests/libcxx-backports/layout_stride/layout_stride.properties.pass.cpp
@@ -101,7 +101,7 @@ test_layout_mapping_stride(E ext, std::array<typename E::index_type, E::rank()>
 
 constexpr bool test() {
   constexpr size_t D = std::dynamic_extent;
-  //test_layout_mapping_stride(std::extents<int>(), std::array<int, 0>{}, true); //FIXME
+  test_layout_mapping_stride(std::extents<int>(), std::array<int, 0>{}, true);
   test_layout_mapping_stride(std::extents<char, 4, 5>(), std::array<char, 2>{1, 4}, true);
   test_layout_mapping_stride(std::extents<char, 4, 5>(), std::array<char, 2>{1, 5}, false);
   test_layout_mapping_stride(std::extents<unsigned, D, 4>(7), std::array<unsigned, 2>{20, 2}, false);

diff --git a/tests/libcxx-backports/layout_stride/layout_stride.static_requirements.pass.cpp b/tests/libcxx-backports/layout_stride/layout_stride.static_requirements.pass.cpp
@@ -123,7 +123,7 @@ void test_layout_mapping_stride() {
 
 int main(int, char**) {
   constexpr size_t D = std::dynamic_extent;
-  //test_layout_mapping_stride<std::extents<int>>(); //FIXME
+  test_layout_mapping_stride<std::extents<int>>();
   test_layout_mapping_stride<std::extents<char, 4, 5>>();
   test_layout_mapping_stride<std::extents<unsigned, D, 4>>();
   test_layout_mapping_stride<std::extents<size_t, D, D, D, D>>();

diff --git a/tests/test_layout_stride.cpp b/tests/test_layout_stride.cpp
@@ -224,6 +224,7 @@ TEST(TestLayoutStrideStrideConstraint, test_layout_stride_stride_constraint) {
 
   Kokkos::extents<int> ext0d{};
   Kokkos::layout_stride::mapping m0d{ext0d, std::array<int,0>{}};
-  ASSERT_FALSE((is_stride_avail< decltype(m0d), int >::value));
+  // This is weird, but its what the standard says
+  ASSERT_TRUE((is_stride_avail< decltype(m0d), int >::value));
 }
 #endif