Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Enable span to work with contiguous std containers in C++17 #2613

Merged
merged 9 commits into from
Oct 30, 2024
Merged

Enable span to work with contiguous std containers in C++17 #2613

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b6c7aa3
Do not require `contiguous_iterator_tag` in C++17 as that is not sati…
miscco Oct 23, 2024
e8147cb
Try and unbreak clang
miscco Oct 24, 2024
4703ac8
Drop the additional check for existence of to_address
miscco Oct 29, 2024
7f82e3a
More tests
miscco Oct 29, 2024
8b93043
Do not change the concept
miscco Oct 30, 2024
c00ae09
Do not require ranges for spans C++17 constructors
miscco Oct 30, 2024
b9b3508
Disable execution checks
miscco Oct 30, 2024
6b279a3
Rely on the host stl to provide ranges
miscco Oct 30, 2024
09c56ef
fix spelling error
ericniebler Oct 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions libcudacxx/include/cuda/std/__iterator/data.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,14 @@ _LIBCUDACXX_BEGIN_NAMESPACE_STD

#if _CCCL_STD_VER > 2011

_CCCL_EXEC_CHECK_DISABLE
template <class _Cont>
constexpr _LIBCUDACXX_HIDE_FROM_ABI auto data(_Cont& __c) noexcept(noexcept(__c.data())) -> decltype(__c.data())
{
return __c.data();
}

_CCCL_EXEC_CHECK_DISABLE
template <class _Cont>
constexpr _LIBCUDACXX_HIDE_FROM_ABI auto data(const _Cont& __c) noexcept(noexcept(__c.data())) -> decltype(__c.data())
{
Expand Down
2 changes: 2 additions & 0 deletions libcudacxx/include/cuda/std/__iterator/size.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
_LIBCUDACXX_BEGIN_NAMESPACE_STD

#if _CCCL_STD_VER > 2011
_CCCL_EXEC_CHECK_DISABLE
template <class _Cont>
_LIBCUDACXX_HIDE_FROM_ABI constexpr auto size(const _Cont& __c) noexcept(noexcept(__c.size())) -> decltype(__c.size())
{
Expand All @@ -42,6 +43,7 @@ _LIBCUDACXX_HIDE_FROM_ABI constexpr size_t size(const _Tp (&)[_Sz]) noexcept
#endif // _CCCL_STD_VER > 2011

#if _CCCL_STD_VER > 2017
_CCCL_EXEC_CHECK_DISABLE
template <class _Cont>
_LIBCUDACXX_HIDE_FROM_ABI constexpr auto ssize(const _Cont& __c) noexcept(
noexcept(static_cast<common_type_t<ptrdiff_t, make_signed_t<decltype(__c.size())>>>(__c.size())))
Expand Down
80 changes: 46 additions & 34 deletions libcudacxx/include/cuda/std/detail/libcxx/include/span
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,12 @@ _CCCL_INLINE_VAR constexpr bool __is_std_span<span<_Tp, _Extent>> = true;
template <class _From, class _To>
_LIBCUDACXX_CONCEPT __span_array_convertible = _CCCL_TRAIT(is_convertible, _From (*)[], _To (*)[]);

# if _CCCL_STD_VER >= 2017 && !defined(_CCCL_COMPILER_MSVC_2017)
// We want to ensure that span interacts nicely with containers that might not have had the ranges treatment
# if defined(__cpp_lib_ranges) && !defined(_CCCL_COMPILER_MSVC_2017)
# define _CCCL_SPAN_USES_RANGES
# endif // __cpp_lib_ranges && !_CCCL_COMPILER_MSVC_2017

# if defined(_CCCL_SPAN_USES_RANGES)
template <class _Range, class _ElementType>
_LIBCUDACXX_CONCEPT_FRAGMENT(
__span_compatible_range_,
Expand Down Expand Up @@ -244,29 +249,30 @@ template <class _Sentinel, class _It>
_LIBCUDACXX_CONCEPT __span_compatible_sentinel_for =
_LIBCUDACXX_FRAGMENT(__span_compatible_sentinel_for_, _Sentinel, _It);
# endif // _CCCL_STD_VER <= 2017
# else // _CCCL_STD_VER >= 2017 && !_CCCL_COMPILER_MSVC_2017
# else // ^^^ _CCCL_SPAN_USES_RANGES ^^^ / vvv !_CCCL_SPAN_USES_RANGES vvv

template <class _Tp, class _ElementType, class = void>
template <class _Container, class _ElementType, class = void>
_CCCL_INLINE_VAR constexpr bool __is_span_compatible_container = false;

template <class _Tp, class _ElementType>
template <class _Container, class _ElementType>
_CCCL_INLINE_VAR constexpr bool __is_span_compatible_container<
_Tp,
_Container,
_ElementType,
void_t<
// is not a specialization of span
enable_if_t<!__is_std_span<_Tp>, nullptr_t>,
enable_if_t<!__is_std_span<_Container>, nullptr_t>,
// is not a specialization of array
enable_if_t<!__is_std_array<_Tp>, nullptr_t>,
enable_if_t<!__is_std_array<_Container>, nullptr_t>,
// is_array_v<Container> is false,
enable_if_t<!_CCCL_TRAIT(is_array, _Tp), nullptr_t>,
enable_if_t<!_CCCL_TRAIT(is_array, _Container), nullptr_t>,
// data(cont) and size(cont) are well formed
decltype(data(declval<_Tp>())),
decltype(size(declval<_Tp>())),
decltype(_CUDA_VSTD::data(_CUDA_VSTD::declval<_Container&>())),
decltype(_CUDA_VSTD::size(_CUDA_VSTD::declval<_Container&>())),
Comment on lines +269 to +270
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That is an actual fix, because we want to avoid pulling in anything via ADL

// remove_pointer_t<decltype(data(cont))>(*)[] is convertible to ElementType(*)[]
enable_if_t<is_convertible<remove_pointer_t<decltype(data(declval<_Tp&>()))> (*)[], _ElementType (*)[]>::value,
enable_if_t<is_convertible<remove_pointer_t<decltype(_CUDA_VSTD::data(declval<_Container&>()))> (*)[],
_ElementType (*)[]>::value,
nullptr_t>>> = true;
# endif // _CCCL_STD_VER <= 2014 || _CCCL_COMPILER_MSVC_2017
# endif // !_CCCL_SPAN_USES_RANGES

# if _CCCL_STD_VER >= 2020

Expand Down Expand Up @@ -327,7 +333,7 @@ public:
_CCCL_HIDE_FROM_ABI span(const span&) noexcept = default;
_CCCL_HIDE_FROM_ABI span& operator=(const span&) noexcept = default;

# if _CCCL_STD_VER >= 2017 && !defined(_CCCL_COMPILER_MSVC_2017)
# if defined(_CCCL_SPAN_USES_RANGES)
_LIBCUDACXX_TEMPLATE(class _It)
_LIBCUDACXX_REQUIRES(__span_compatible_iterator<_It, element_type>)
_LIBCUDACXX_HIDE_FROM_ABI constexpr explicit span(_It __first, size_type __count)
Expand All @@ -348,7 +354,7 @@ public:
_CCCL_ASSERT(__last - __first == _Extent,
"invalid range in span's constructor (iterator, sentinel): last - first != extent");
}
# else // ^^^ C++17 ^^^ / vvv C++14 vvv
# else // ^^^ _CCCL_SPAN_USES_RANGES ^^^ / vvv !_CCCL_SPAN_USES_RANGES vvv
_LIBCUDACXX_HIDE_FROM_ABI constexpr span(pointer __ptr, size_type __count)
: __data_{__ptr}
{
Expand All @@ -361,7 +367,7 @@ public:
(void) __l;
_CCCL_ASSERT(_Extent == distance(__f, __l), "size mismatch in span's constructor (ptr, ptr)");
}
# endif // _CCCL_STD_VER <= 2014 || _CCCL_COMPILER_MSVC_2017
# endif // !_CCCL_SPAN_USES_RANGES

# if defined(_CCCL_COMPILER_NVRTC) || defined(_CCCL_COMPILER_MSVC_2017)
template <size_t _Sz = _Extent, enable_if_t<_Sz != 0, int> = 0>
Expand All @@ -386,15 +392,15 @@ public:
: __data_{__arr.data()}
{}

# if _CCCL_STD_VER >= 2017 && !defined(_CCCL_COMPILER_MSVC_2017)
# if defined(_CCCL_SPAN_USES_RANGES)
_LIBCUDACXX_TEMPLATE(class _Range)
_LIBCUDACXX_REQUIRES(__span_compatible_range<_Range, element_type>)
_LIBCUDACXX_HIDE_FROM_ABI constexpr explicit span(_Range&& __r)
: __data_{_CUDA_VRANGES::data(__r)}
{
_CCCL_ASSERT(_CUDA_VRANGES::size(__r) == _Extent, "size mismatch in span's constructor (range)");
}
# else // ^^^ C++17 ^^^ / vvv C++14 vvv
# else // ^^^ _CCCL_SPAN_USES_RANGES ^^^ / vvv !_CCCL_SPAN_USES_RANGES vvv
_LIBCUDACXX_TEMPLATE(class _Container)
_LIBCUDACXX_REQUIRES(__is_span_compatible_container<_Container, _Tp>)
_LIBCUDACXX_HIDE_FROM_ABI constexpr span(_Container& __c) noexcept(noexcept(_CUDA_VSTD::data(__c)))
Expand All @@ -404,13 +410,13 @@ public:
}

_LIBCUDACXX_TEMPLATE(class _Container)
_LIBCUDACXX_REQUIRES(__is_span_compatible_container<_Container, _Tp>)
_LIBCUDACXX_REQUIRES(__is_span_compatible_container<_Container, const _Tp>)
_LIBCUDACXX_HIDE_FROM_ABI constexpr span(const _Container& __c) noexcept(noexcept(_CUDA_VSTD::data(__c)))
: __data_{_CUDA_VSTD::data(__c)}
{
_CCCL_ASSERT(_Extent == _CUDA_VSTD::size(__c), "size mismatch in span's constructor (other span)");
}
# endif // _CCCL_STD_VER <= 2014 || _CCCL_COMPILER_MSVC_2017
# endif // !_CCCL_SPAN_USES_RANGES

_LIBCUDACXX_TEMPLATE(class _OtherElementType, size_t _Extent2 = _Extent)
_LIBCUDACXX_REQUIRES((_Extent2 != dynamic_extent)
Expand Down Expand Up @@ -575,7 +581,8 @@ public:

_CCCL_HIDE_FROM_ABI span(const span&) noexcept = default;
_CCCL_HIDE_FROM_ABI span& operator=(const span&) noexcept = default;
# if _CCCL_STD_VER >= 2017 && !defined(_CCCL_COMPILER_MSVC_2017)

# if defined(_CCCL_SPAN_USES_RANGES)
_LIBCUDACXX_TEMPLATE(class _It)
_LIBCUDACXX_REQUIRES(__span_compatible_iterator<_It, element_type>)
_LIBCUDACXX_HIDE_FROM_ABI constexpr span(_It __first, size_type __count)
Expand All @@ -593,7 +600,7 @@ public:
_CCCL_ASSERT(__last - __first >= 0, "invalid range in span's constructor (iterator, sentinel)");
}

# else // ^^^ C++17 ^^^ / vvv C++14 vvv
# else // ^^^ _CCCL_SPAN_USES_RANGES ^^^ / vvv !_CCCL_SPAN_USES_RANGES vvv
_LIBCUDACXX_HIDE_FROM_ABI constexpr span(pointer __ptr, size_type __count)
: __data_{__ptr}
, __size_{__count}
Expand All @@ -602,7 +609,7 @@ public:
: __data_{__f}
, __size_{static_cast<size_t>(__l - __f)}
{}
# endif // _CCCL_STD_VER <= 2014 || _CCCL_COMPILER_MSVC_2017
# endif // !_CCCL_SPAN_USES_RANGES

template <size_t _Sz>
_LIBCUDACXX_HIDE_FROM_ABI constexpr span(type_identity_t<element_type> (&__arr)[_Sz]) noexcept
Expand All @@ -624,14 +631,14 @@ public:
, __size_{_Sz}
{}

# if _CCCL_STD_VER >= 2017 && !defined(_CCCL_COMPILER_MSVC_2017)
# if defined(_CCCL_SPAN_USES_RANGES)
_LIBCUDACXX_TEMPLATE(class _Range)
_LIBCUDACXX_REQUIRES(__span_compatible_range<_Range, element_type>)
_LIBCUDACXX_HIDE_FROM_ABI constexpr span(_Range&& __r)
: __data_(_CUDA_VRANGES::data(__r))
, __size_{_CUDA_VRANGES::size(__r)}
{}
# else // ^^^ C++17 ^^^ / vvv C++14 vvv
# else // ^^^ _CCCL_SPAN_USES_RANGES ^^^ / vvv !_CCCL_SPAN_USES_RANGES vvv
_LIBCUDACXX_TEMPLATE(class _Container)
_LIBCUDACXX_REQUIRES(__is_span_compatible_container<_Container, _Tp>)
_LIBCUDACXX_HIDE_FROM_ABI constexpr span(_Container& __c)
Expand All @@ -640,12 +647,12 @@ public:
{}

_LIBCUDACXX_TEMPLATE(class _Container)
_LIBCUDACXX_REQUIRES(__is_span_compatible_container<_Container, _Tp>)
_LIBCUDACXX_REQUIRES(__is_span_compatible_container<_Container, const _Tp>)
_LIBCUDACXX_HIDE_FROM_ABI constexpr span(const _Container& __c)
: __data_{_CUDA_VSTD::data(__c)}
, __size_{(size_type) _CUDA_VSTD::size(__c)}
{}
# endif // _CCCL_STD_VER <= 2014 || _CCCL_COMPILER_MSVC_2017
# endif // !_CCCL_SPAN_USES_RANGES

_LIBCUDACXX_TEMPLATE(class _OtherElementType, size_t _OtherExtent)
_LIBCUDACXX_REQUIRES(__span_array_convertible<_OtherElementType, element_type>)
Expand Down Expand Up @@ -807,13 +814,7 @@ _CCCL_HOST_DEVICE span(array<_Tp, _Sz>&) -> span<_Tp, _Sz>;
template <class _Tp, size_t _Sz>
_CCCL_HOST_DEVICE span(const array<_Tp, _Sz>&) -> span<const _Tp, _Sz>;

# if defined(_CCCL_COMPILER_MSVC_2017)
template <class _Container>
_CCCL_HOST_DEVICE span(_Container&) -> span<typename _Container::value_type>;

template <class _Container>
_CCCL_HOST_DEVICE span(const _Container&) -> span<const typename _Container::value_type>;
# else // ^^^ _CCCL_COMPILER_MSVC_2017 ^^^ / vvv !_CCCL_COMPILER_MSVC_2017 vvv
# if defined(_CCCL_SPAN_USES_RANGES)

_LIBCUDACXX_TEMPLATE(class _It, class _EndOrSize)
_LIBCUDACXX_REQUIRES(contiguous_iterator<_It>)
Expand All @@ -823,7 +824,18 @@ _CCCL_HOST_DEVICE span(_It,
_LIBCUDACXX_TEMPLATE(class _Range)
_LIBCUDACXX_REQUIRES(_CUDA_VRANGES::contiguous_range<_Range>)
_CCCL_HOST_DEVICE span(_Range&&) -> span<remove_reference_t<_CUDA_VRANGES::range_reference_t<_Range>>>;
# endif // !_CCCL_COMPILER_MSVC_2017

# else // ^^^ _CCCL_SPAN_USES_RANGES ^^^ / vvv !_CCCL_SPAN_USES_RANGES vvv

_LIBCUDACXX_TEMPLATE(class _Container)
_LIBCUDACXX_REQUIRES(__is_span_compatible_container<_Container, typename _Container::value_type>)
_CCCL_HOST_DEVICE span(_Container&) -> span<typename _Container::value_type>;

_LIBCUDACXX_TEMPLATE(class _Container)
_LIBCUDACXX_REQUIRES(__is_span_compatible_container<_Container, const typename _Container::value_type>)
_CCCL_HOST_DEVICE span(const _Container&) -> span<const typename _Container::value_type>;

# endif // !_CCCL_SPAN_USES_RANGES

#endif // _CCCL_STD_VER >= 2017

Expand Down
4 changes: 2 additions & 2 deletions libcudacxx/test/libcudacxx/std/containers/views/views.span/span.cons/deduct.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,15 +52,15 @@ __host__ __device__ void test_iterator_sentinel()
assert(s.data() == cuda::std::data(arr));
}

#if !defined(TEST_COMPILER_MSVC)
#if defined(_CCCL_SPAN_USES_RANGES)
// P3029R1: deduction from `integral_constant`
{
cuda::std::span s{cuda::std::begin(arr), cuda::std::integral_constant<size_t, 3>{}};
ASSERT_SAME_TYPE(decltype(s), cuda::std::span<int, 3>);
assert(s.size() == cuda::std::size(arr));
assert(s.data() == cuda::std::data(arr));
}
#endif // !TEST_COMPILER_MSVC
#endif // _CCCL_SPAN_USES_RANGES
}

__host__ __device__ void test_c_array()
Expand Down
21 changes: 21 additions & 0 deletions libcudacxx/test/libcudacxx/std/containers/views/views.span/span.cons/range.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@

#include "test_macros.h"

#if !defined(TEST_COMPILER_NVRTC)
# include <vector>
#endif // !TEST_COMPILER_NVRTC

// Look ma - I'm a container!
template <typename T>
struct IsAContainer
Expand Down Expand Up @@ -136,6 +140,19 @@ __host__ __device__ void testRuntimeSpanStatic()
assert(s2.data() == cVal.getV() && s2.size() == 1);
}

#if !defined(TEST_COMPILER_NVRTC)
template <typename T>
void testContainers()
{
::std::vector<T> val(1);
const ::std::vector<T> cVal(1);
cuda::std::span<T> s1{val};
cuda::std::span<const T> s2{cVal};
assert(s1.data() == val.data() && s1.size() == 1);
assert(s2.data() == cVal.data() && s2.size() == 1);
}
#endif // !TEST_COMPILER_NVRTC

struct A
{};

Expand Down Expand Up @@ -163,5 +180,9 @@ int main(int, char**)

checkCV();

#if !defined(TEST_COMPILER_NVRTC)
NV_IF_TARGET(NV_IS_HOST, (testContainers<int>(); testContainers<A>();))
#endif // !TEST_COMPILER_NVRTC

return 0;
}
Loading