Fix two tests for AMD unified memory archs

crtrott · Mar 5, 2024 · d095dd2 · d095dd2
1 parent 9eff88f
commit d095dd2
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/containers/unit_tests/TestWithoutInitializing.hpp b/containers/unit_tests/TestWithoutInitializing.hpp
@@ -38,7 +38,7 @@
 ///@}
 
 /// Some tests are skipped for unified memory space.
-#if defined(KOKKOS_ENABLE_IMPL_CUDA_UNIFIED_MEMORY)
+#if defined(KOKKOS_ENABLE_IMPL_CUDA_UNIFIED_MEMORY) || defined(KOKKOS_ENABLE_IMPL_HIP_UNIFIED_MEMORY)
 #define GTEST_SKIP_IF_UNIFIED_MEMORY_SPACE \
   GTEST_SKIP() << "skipping since unified memory requires additional fences";
 #else

diff --git a/core/unit_test/hip/TestHIP_Spaces.cpp b/core/unit_test/hip/TestHIP_Spaces.cpp
@@ -38,8 +38,13 @@ TEST(hip, space_access) {
   static_assert(!Kokkos::Impl::MemorySpaceAccess<Kokkos::HostSpace,
                                                  Kokkos::HIPSpace>::assignable);
 
+#if !defined(KOKKOS_ENABLE_IMPL_HIP_UNIFIED_MEMORY)
   static_assert(!Kokkos::Impl::MemorySpaceAccess<Kokkos::HostSpace,
                                                  Kokkos::HIPSpace>::accessible);
+#else
+  static_assert(Kokkos::Impl::MemorySpaceAccess<Kokkos::HostSpace,
+                                                 Kokkos::HIPSpace>::accessible);
+#endif
 
   static_assert(
       !Kokkos::Impl::MemorySpaceAccess<Kokkos::HostSpace,
@@ -149,8 +154,13 @@ TEST(hip, space_access) {
       Kokkos::SpaceAccessibility<Kokkos::HIP,
                                  Kokkos::HIPManagedSpace>::accessible);
 
+#if !defined(KOKKOS_ENABLE_IMPL_HIP_UNIFIED_MEMORY)
   static_assert(!Kokkos::SpaceAccessibility<Kokkos::HostSpace,
                                             Kokkos::HIPSpace>::accessible);
+#else
+  static_assert(Kokkos::SpaceAccessibility<Kokkos::HostSpace,
+                                            Kokkos::HIPSpace>::accessible);
+#endif
 
   static_assert(
       Kokkos::SpaceAccessibility<Kokkos::HostSpace,
@@ -160,8 +170,14 @@ TEST(hip, space_access) {
       Kokkos::SpaceAccessibility<Kokkos::HostSpace,
                                  Kokkos::HIPManagedSpace>::accessible);
 
+#if !defined(KOKKOS_ENABLE_IMPL_HIP_UNIFIED_MEMORY)
   static_assert(std::is_same<Kokkos::Impl::HostMirror<Kokkos::HIPSpace>::Space,
                              Kokkos::HostSpace>::value);
+#else
+  static_assert(std::is_same<Kokkos::Impl::HostMirror<Kokkos::HIPSpace>::Space,
+                   Kokkos::Device<Kokkos::HostSpace::execution_space,
+                                  Kokkos::HIPSpace>>::value);
+#endif
 
   static_assert(
       std::is_same<Kokkos::Impl::HostMirror<Kokkos::HIPHostPinnedSpace>::Space,