Work around STF mdspan<const T> issue

NVIDIA · Jan 21, 2025 · 59a3a4a · 59a3a4a
1 parent 10b5572
commit 59a3a4a
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/cudax/include/cuda/experimental/__stf/internal/data_interface.cuh b/cudax/include/cuda/experimental/__stf/internal/data_interface.cuh
@@ -59,10 +59,10 @@ struct readonly_type_of
 };
 
 // Specialization of `readonly_type_of` for `mdspan`.
-template <typename T, typename... More>
-struct readonly_type_of<mdspan<T, More...>>
+template <typename T, typename Extents, typename Layout, template <typename> class Accessor>
+struct readonly_type_of<mdspan<T, Extents, Layout, Accessor<T>>>
 {
-  using type = mdspan<const T, More...>;
+  using type = mdspan<T, Extents, Layout, Accessor<T>>;
 };
 
 // Helper struct to deduce read-write types.
@@ -73,17 +73,17 @@ struct rw_type_of
 };
 
 // Specialization of rw_type_of for `mdspan`.
-template <typename T, typename... More>
-struct rw_type_of<mdspan<const T, More...>>
+template <typename T, typename Extents, typename Layout, template <typename> class Accessor>
+struct rw_type_of<mdspan<const T, Extents, Layout, Accessor<const T>>>
 {
-  using type = mdspan<T, More...>;
+  using type = mdspan<T, Extents, Layout, Accessor<T>>;
 };
 
 // Specialization of rw_type_of for const mdspan.
-template <typename T, typename... More>
-struct rw_type_of<const mdspan<const T, More...>>
+template <typename T, typename Extents, typename Layout, template <typename> class Accessor>
+struct rw_type_of<const mdspan<const T, Extents, Layout, Accessor<const T>>>
 {
-  using type = mdspan<T, More...>;
+  using type = mdspan<T, Extents, Layout, Accessor<T>>;
 };
 
 } // namespace reserved