kokkos#6805: make mdspan helpers namespace consistent

nmm0 · Mar 7, 2024 · c173db3 · c173db3
1 parent d60f30c
commit c173db3
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/core/src/Kokkos_View.hpp b/core/src/Kokkos_View.hpp
@@ -1758,16 +1758,18 @@ class View : public ViewTraits<DataType, Properties...> {
   // MDSpan converting constructors
 #ifdef KOKKOS_ENABLE_IMPL_MDSPAN
  public:
-  template <typename U = typename Impl::MDSpanViewTraits<traits>::mdspan_type>
+  template <typename U = typename Experimental::Impl::MDSpanViewTraits<
+                traits>::mdspan_type>
   KOKKOS_INLINE_FUNCTION MDSPAN_CONDITIONAL_EXPLICIT(traits::is_managed) View(
-      const typename Impl::MDSpanViewTraits<traits>::mdspan_type& mds,
-      std::enable_if_t<
-          !std::is_same_v<Impl::UnsupportedKokkosArrayLayout, U>>* = nullptr)
+      const typename Experimental::Impl::MDSpanViewTraits<traits>::mdspan_type&
+          mds,
+      std::enable_if_t<!std::is_same_v<
+          Experimental::Impl::UnsupportedKokkosArrayLayout, U>>* = nullptr)
       : View(mds.data_handle(),
              Experimental::Impl::array_layout_from_mapping<
                  typename traits::array_layout,
-                 typename Impl::MDSpanViewTraits<traits>::mdspan_type>(
-                 mds.mapping())) {}
+                 typename Experimental::Impl::MDSpanViewTraits<
+                     traits>::mdspan_type>(mds.mapping())) {}
 #endif  // KOKKOS_ENABLE_IMPL_MDSPAN
 };
 

diff --git a/core/unit_test/view/TestMDSpanConversion.hpp b/core/unit_test/view/TestMDSpanConversion.hpp
@@ -33,7 +33,7 @@ struct TestViewMDSpanConversion {
                                           const MDSpanExtents &exts) {
     using view_type   = Kokkos::View<DataType, KokkosLayout,
                                    Kokkos::MemoryTraits<Kokkos::Unmanaged>>;
-    using natural_mdspan_type = typename Kokkos::Impl::MDSpanViewTraits<typename view_type::traits>::mdspan_type;
+    using natural_mdspan_type = typename Kokkos::Experimental::Impl::MDSpanViewTraits<typename view_type::traits>::mdspan_type;
     using mdspan_type = Kokkos::mdspan<value_type, MDSpanExtents, MDSpanLayout>;
 
     static_assert(std::is_convertible_v<mdspan_type, natural_mdspan_type>);