Skip to content

Drop thrust::null_type #3508

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

Merged
bernhardmgruber merged 1 commit into from
Jan 24, 2025
Merged

Drop thrust::null_type #3508

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
100 changes: 0 additions & 100 deletions thrust/testing/tuple.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -527,103 +527,3 @@ void TestTupleCTAD(void)
}
DECLARE_UNITTEST(TestTupleCTAD);
#endif // _CCCL_STD_VER >= 2017

// Ensure that we are backwards compatible with the old thrust::tuple implementation
_CCCL_SUPPRESS_DEPRECATED_PUSH
static_assert(
thrust::tuple_size<thrust::tuple<thrust::null_type,
thrust::null_type,
thrust::null_type,
thrust::null_type,
thrust::null_type,
thrust::null_type,
thrust::null_type,
thrust::null_type,
thrust::null_type,
thrust::null_type>>::value
== 0,
"");
static_assert(
thrust::tuple_size<thrust::tuple<int,
thrust::null_type,
thrust::null_type,
thrust::null_type,
thrust::null_type,
thrust::null_type,
thrust::null_type,
thrust::null_type,
thrust::null_type,
thrust::null_type>>::value
== 1,
"");
static_assert(
thrust::tuple_size<thrust::tuple<int,
int,
thrust::null_type,
thrust::null_type,
thrust::null_type,
thrust::null_type,
thrust::null_type,
thrust::null_type,
thrust::null_type,
thrust::null_type>>::value
== 2,
"");
static_assert(
thrust::tuple_size<thrust::tuple<int,
int,
int,
thrust::null_type,
thrust::null_type,
thrust::null_type,
thrust::null_type,
thrust::null_type,
thrust::null_type,
thrust::null_type>>::value
== 3,
"");
static_assert(
thrust::tuple_size<thrust::tuple<int,
int,
int,
int,
thrust::null_type,
thrust::null_type,
thrust::null_type,
thrust::null_type,
thrust::null_type,
thrust::null_type>>::value
== 4,
"");
static_assert(
thrust::tuple_size<thrust::tuple<int,
int,
int,
int,
int,
thrust::null_type,
thrust::null_type,
thrust::null_type,
thrust::null_type,
thrust::null_type>>::value
== 5,
"");
static_assert(
thrust::tuple_size<
thrust::
tuple<int, int, int, int, int, int, thrust::null_type, thrust::null_type, thrust::null_type, thrust::null_type>>::value
== 6,
"");
static_assert(
thrust::tuple_size<
thrust::tuple<int, int, int, int, int, int, int, thrust::null_type, thrust::null_type, thrust::null_type>>::value
== 7,
"");
static_assert(
thrust::tuple_size<thrust::tuple<int, int, int, int, int, int, int, int, thrust::null_type, thrust::null_type>>::value
== 8,
"");
static_assert(
thrust::tuple_size<thrust::tuple<int, int, int, int, int, int, int, int, int, thrust::null_type>>::value == 9, "");
static_assert(thrust::tuple_size<thrust::tuple<int, int, int, int, int, int, int, int, int, int>>::value == 10, "");
_CCCL_SUPPRESS_DEPRECATED_POP
151 changes: 0 additions & 151 deletions thrust/thrust/tuple.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,44 +43,6 @@

THRUST_NAMESPACE_BEGIN

// define null_type for backwards compatibility
struct CCCL_DEPRECATED_BECAUSE("Please remove null_type from parameters to tuple<...>") null_type
{};

_CCCL_SUPPRESS_DEPRECATED_PUSH

_CCCL_HOST_DEVICE inline bool operator==(const null_type&, const null_type&)
{
return true;
}

_CCCL_HOST_DEVICE inline bool operator>=(const null_type&, const null_type&)
{
return true;
}

_CCCL_HOST_DEVICE inline bool operator<=(const null_type&, const null_type&)
{
return true;
}

_CCCL_HOST_DEVICE inline bool operator!=(const null_type&, const null_type&)
{
return false;
}

_CCCL_HOST_DEVICE inline bool operator<(const null_type&, const null_type&)
{
return false;
}

_CCCL_HOST_DEVICE inline bool operator>(const null_type&, const null_type&)
{
return false;
}

_CCCL_SUPPRESS_DEPRECATED_POP

/*! \addtogroup utility
* \{
*/
Expand Down Expand Up @@ -178,116 +140,3 @@ using _CUDA_VSTD::tie;
*/

THRUST_NAMESPACE_END

_LIBCUDACXX_BEGIN_NAMESPACE_STD
_CCCL_SUPPRESS_DEPRECATED_PUSH

template <>
struct tuple_size<tuple<THRUST_NS_QUALIFIER::null_type,
THRUST_NS_QUALIFIER::null_type,
THRUST_NS_QUALIFIER::null_type,
THRUST_NS_QUALIFIER::null_type,
THRUST_NS_QUALIFIER::null_type,
THRUST_NS_QUALIFIER::null_type,
THRUST_NS_QUALIFIER::null_type,
THRUST_NS_QUALIFIER::null_type,
THRUST_NS_QUALIFIER::null_type,
THRUST_NS_QUALIFIER::null_type>> : tuple_size<tuple<>>
{};

template <class T0>
struct tuple_size<tuple<T0,
THRUST_NS_QUALIFIER::null_type,
THRUST_NS_QUALIFIER::null_type,
THRUST_NS_QUALIFIER::null_type,
THRUST_NS_QUALIFIER::null_type,
THRUST_NS_QUALIFIER::null_type,
THRUST_NS_QUALIFIER::null_type,
THRUST_NS_QUALIFIER::null_type,
THRUST_NS_QUALIFIER::null_type,
THRUST_NS_QUALIFIER::null_type>> : tuple_size<tuple<T0>>
{};

template <class T0, class T1>
struct tuple_size<tuple<T0,
T1,
THRUST_NS_QUALIFIER::null_type,
THRUST_NS_QUALIFIER::null_type,
THRUST_NS_QUALIFIER::null_type,
THRUST_NS_QUALIFIER::null_type,
THRUST_NS_QUALIFIER::null_type,
THRUST_NS_QUALIFIER::null_type,
THRUST_NS_QUALIFIER::null_type,
THRUST_NS_QUALIFIER::null_type>> : tuple_size<tuple<T0, T1>>
{};

template <class T0, class T1, class T2>
struct tuple_size<tuple<T0,
T1,
T2,
THRUST_NS_QUALIFIER::null_type,
THRUST_NS_QUALIFIER::null_type,
THRUST_NS_QUALIFIER::null_type,
THRUST_NS_QUALIFIER::null_type,
THRUST_NS_QUALIFIER::null_type,
THRUST_NS_QUALIFIER::null_type,
THRUST_NS_QUALIFIER::null_type>> : tuple_size<tuple<T0, T1, T2>>
{};

template <class T0, class T1, class T2, class T3>
struct tuple_size<tuple<T0,
T1,
T2,
T3,
THRUST_NS_QUALIFIER::null_type,
THRUST_NS_QUALIFIER::null_type,
THRUST_NS_QUALIFIER::null_type,
THRUST_NS_QUALIFIER::null_type,
THRUST_NS_QUALIFIER::null_type,
THRUST_NS_QUALIFIER::null_type>> : tuple_size<tuple<T0, T1, T2, T3>>
{};

template <class T0, class T1, class T2, class T3, class T4>
struct tuple_size<tuple<T0,
T1,
T2,
T3,
T4,
THRUST_NS_QUALIFIER::null_type,
THRUST_NS_QUALIFIER::null_type,
THRUST_NS_QUALIFIER::null_type,
THRUST_NS_QUALIFIER::null_type,
THRUST_NS_QUALIFIER::null_type>> : tuple_size<tuple<T0, T1, T2, T3, T4>>
{};

template <class T0, class T1, class T2, class T3, class T4, class T5>
struct tuple_size<tuple<T0,
T1,
T2,
T3,
T4,
T5,
THRUST_NS_QUALIFIER::null_type,
THRUST_NS_QUALIFIER::null_type,
THRUST_NS_QUALIFIER::null_type,
THRUST_NS_QUALIFIER::null_type>> : tuple_size<tuple<T0, T1, T2, T3, T4, T5>>
{};

template <class T0, class T1, class T2, class T3, class T4, class T5, class T6>
struct tuple_size<
tuple<T0, T1, T2, T3, T4, T5, T6, THRUST_NS_QUALIFIER::null_type, THRUST_NS_QUALIFIER::null_type, THRUST_NS_QUALIFIER::null_type>>
: tuple_size<tuple<T0, T1, T2, T3, T4, T5, T6>>
{};

template <class T0, class T1, class T2, class T3, class T4, class T5, class T6, class T7>
struct tuple_size<tuple<T0, T1, T2, T3, T4, T5, T6, T7, THRUST_NS_QUALIFIER::null_type, THRUST_NS_QUALIFIER::null_type>>
: tuple_size<tuple<T0, T1, T2, T3, T4, T5, T6, T7>>
{};

template <class T0, class T1, class T2, class T3, class T4, class T5, class T6, class T7, class T8>
struct tuple_size<tuple<T0, T1, T2, T3, T4, T5, T6, T7, T8, THRUST_NS_QUALIFIER::null_type>>
: tuple_size<tuple<T0, T1, T2, T3, T4, T5, T6, T7, T8>>
{};

_CCCL_SUPPRESS_DEPRECATED_POP
_LIBCUDACXX_END_NAMESPACE_STD