SpaceAwareAccessor: fix issues (no-unique-address, is_empty)

CI serviced these. Also turn off tests if mdspan is not enabled
crtrott · Jun 18, 2024 · f29c746 · f29c746
1 parent 34db518
commit f29c746
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 6 deletions.
diff --git a/core/src/View/MDSpan/Kokkos_MDSpan_Accessor.hpp b/core/src/View/MDSpan/Kokkos_MDSpan_Accessor.hpp
@@ -1,4 +1,3 @@
-
 //@HEADER
 // ************************************************************************
 //
@@ -88,7 +87,15 @@ struct SpaceAwareAccessor {
   }
 
  private:
-  [[no_unique_address]] NestedAccessor nested_acc;
+// We either compile with our custom mdspan impl
+// in which case we discover inside it whether no_unique_address
+// works, or we use C++23 in which case it better be available
+#ifdef _MDSPAN_NO_UNIQUE_ADDRESS
+  _MDSPAN_NO_UNIQUE_ADDRESS
+#else
+  [[no_unique_address]]
+#endif
+  NestedAccessor nested_acc;
   template <class, class>
   friend struct SpaceAwareAccessor;
 };
@@ -135,7 +142,15 @@ struct SpaceAwareAccessor<AnonymousSpace, NestedAccessor> {
   }
 
  private:
-  [[no_unique_address]] NestedAccessor nested_acc;
+// We either compile with our custom mdspan impl
+// in which case we discover inside it whether no_unique_address
+// works, or we use C++23 in which case it better be available
+#ifdef _MDSPAN_NO_UNIQUE_ADDRESS
+  _MDSPAN_NO_UNIQUE_ADDRESS
+#else
+  [[no_unique_address]]
+#endif
+  NestedAccessor nested_acc;
   template <class, class>
   friend struct SpaceAwareAccessor;
 };

diff --git a/core/unit_test/CMakeLists.txt b/core/unit_test/CMakeLists.txt
@@ -212,10 +212,16 @@ foreach(Tag Threads;Serial;OpenMP;Cuda;HPX;OpenMPTarget;OpenACC;HIP;SYCL)
         Reductions
         Reductions_DeviceView
         SharedAlloc
+        SpaceAwareAccessorAccessViolation
+        SpaceAwareAccessor
         Swap
         )
     IF (NOT Kokkos_ENABLE_IMPL_MDSPAN)
-      LIST(REMOVE_ITEM ${Tag}_TESTNAMES1B MDSpanConversion)
+      LIST(REMOVE_ITEM ${Tag}_TESTNAMES1B
+         MDSpanConversion
+         SpaceAwareAccessorAccessViolation
+         SpaceAwareAccessor
+      )
     ENDIF()
     foreach(Name IN LISTS ${Tag}_TESTNAMES1B)
       set(file ${dir}/Test${Tag}_${Name}.cpp)
@@ -231,8 +237,6 @@ foreach(Tag Threads;Serial;OpenMP;Cuda;HPX;OpenMPTarget;OpenACC;HIP;SYCL)
 
     SET(${Tag}_SOURCES2A)
     foreach(Name
-      SpaceAwareAccessorAccessViolation
-      SpaceAwareAccessor
       TeamBasic
       TeamCombinedReducers
       TeamMDRange

diff --git a/core/unit_test/TestSpaceAwareAccessor.hpp b/core/unit_test/TestSpaceAwareAccessor.hpp
@@ -45,7 +45,9 @@ void test_space_aware_accessor() {
         static_assert(std::is_same_v<typename acc_t::offset_policy, acc_t>);
         static_assert(
             std::is_same_v<typename acc_t::memory_space, memory_space_t>);
+#ifndef _WIN32
         static_assert(std::is_empty_v<acc_t>);
+#endif
       },
       errors);
   ASSERT_EQ(errors, 0);