kokkos#6805: fix host function call from device and fix more cuda war…

…nings in mdspan
nmm0 · Feb 23, 2024 · c5711c1 · c5711c1
1 parent 49162ef
commit c5711c1
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 10 deletions.
diff --git a/core/src/View/MDSpan/Kokkos_MDSpan_Extents.hpp b/core/src/View/MDSpan/Kokkos_MDSpan_Extents.hpp
@@ -23,6 +23,7 @@ static_assert(false,
 #define KOKKOS_EXPERIMENTAL_MDSPAN_EXTENTS_HPP
 
 #include "Kokkos_MDSpan_Header.hpp"
+#include <Kokkos_Core_fwd.hpp>
 
 namespace Kokkos::Impl {
 
@@ -110,7 +111,7 @@ struct DataTypeFromExtents {
 /// Convert from a mdspan extent to a Kokkos extent, inserting 0s for static
 /// extents
 template <class Extents>
-auto dimension_from_extent(const Extents &e, std::size_t r) noexcept {
+KOKKOS_INLINE_FUNCTION auto dimension_from_extent(const Extents &e, std::size_t r) noexcept {
   return Extents::static_extent(r) == dynamic_extent ? e.extent(r) : 0;
 }
 }  // namespace Kokkos::Experimental::Impl

diff --git a/core/src/View/MDSpan/Kokkos_MDSpan_Layout.hpp b/core/src/View/MDSpan/Kokkos_MDSpan_Layout.hpp
@@ -59,7 +59,7 @@ struct ViewOffsetFromExtents {
 
 template <class ElementType, class Extents, class LayoutPolicy,
           class AccessorPolicy>
-auto array_layout_from_mdspan(
+KOKKOS_INLINE_FUNCTION auto array_layout_from_mdspan(
     const mdspan<ElementType, Extents, LayoutPolicy, AccessorPolicy> &mds) {
   using layout_type = typename ArrayLayoutFromLayout<LayoutPolicy>::type;
   const auto &ext   = mds.extents();
@@ -81,7 +81,7 @@ auto array_layout_from_mdspan(
 
 template <class ElementType, class Extents, class LayoutPolicy,
           class AccessorPolicy>
-auto view_offset_from_mdspan(
+KOKKOS_INLINE_FUNCTION auto view_offset_from_mdspan(
     const mdspan<ElementType, Extents, LayoutPolicy, AccessorPolicy> &mds) {
   using offset_type =
       typename ViewOffsetFromExtents<ElementType, Extents, LayoutPolicy>::type;

diff --git a/tpls/mdspan/include/experimental/__p0009_bits/layout_left.hpp b/tpls/mdspan/include/experimental/__p0009_bits/layout_left.hpp
@@ -254,7 +254,8 @@ class layout_left::mapping {
 
    // [mdspan.submdspan.mapping], submdspan mapping specialization
    template<class... SliceSpecifiers>
-     constexpr auto submdspan_mapping_impl(
+    MDSPAN_INLINE_FUNCTION
+    constexpr auto submdspan_mapping_impl(
        SliceSpecifiers... slices) const;
 
    template<class... SliceSpecifiers>

diff --git a/tpls/mdspan/include/experimental/__p0009_bits/layout_right.hpp b/tpls/mdspan/include/experimental/__p0009_bits/layout_right.hpp
@@ -253,7 +253,8 @@ class layout_right::mapping {
 
    // [mdspan.submdspan.mapping], submdspan mapping specialization
    template<class... SliceSpecifiers>
-     constexpr auto submdspan_mapping_impl(
+   MDSPAN_INLINE_FUNCTION
+   constexpr auto submdspan_mapping_impl(
        SliceSpecifiers... slices) const;
 
    template<class... SliceSpecifiers>

diff --git a/tpls/mdspan/include/experimental/__p0009_bits/layout_stride.hpp b/tpls/mdspan/include/experimental/__p0009_bits/layout_stride.hpp
@@ -549,7 +549,8 @@ struct layout_stride {
 
    // [mdspan.submdspan.mapping], submdspan mapping specialization
    template<class... SliceSpecifiers>
-     constexpr auto submdspan_mapping_impl(
+   MDSPAN_INLINE_FUNCTION
+   constexpr auto submdspan_mapping_impl(
        SliceSpecifiers... slices) const;
 
    template<class... SliceSpecifiers>

diff --git a/tpls/mdspan/include/experimental/__p2630_bits/submdspan_mapping.hpp b/tpls/mdspan/include/experimental/__p2630_bits/submdspan_mapping.hpp
@@ -31,10 +31,6 @@ template <class LayoutMapping> struct submdspan_mapping_result {
 };
 
 namespace detail {
-using detail::first_of;
-using detail::stride_of;
-using detail::inv_map_rank;
-
 // constructs sub strides
 template <class SrcMapping, class... slice_strides, size_t... InvMapIdxs>
 MDSPAN_INLINE_FUNCTION

diff --git a/tpls/mdspan/include/experimental/__p2642_bits/layout_padded.hpp b/tpls/mdspan/include/experimental/__p2642_bits/layout_padded.hpp
@@ -110,6 +110,7 @@ struct padded_extent {
       return {find_next_multiple(pv,
                                    exts.extent(_ExtentToPadIdx))};
     } else {
+      (void)pv; // Some compilers complain about pv not being used here
       return {};
     }
   }