Deprecate thrust::async

Fixes: #100
NVIDIA · Jan 10, 2025 · 80832ae · 80832ae
1 parent 6c3cbb6
commit 80832ae
Show file tree

Hide file tree

Showing 12 changed files with 30 additions and 19 deletions.
diff --git a/thrust/testing/async_copy.cu b/thrust/testing/async_copy.cu
@@ -10,6 +10,8 @@
 #  include <unittest/unittest.h>
 #  include <unittest/util_async.h>
 
+_CCCL_SUPPRESS_DEPRECATED_PUSH
+
 #  define DEFINE_ASYNC_COPY_CALLABLE(name, ...)                                               \
     struct THRUST_PP_CAT2(name, _fn)                                                          \
     {                                                                                         \

diff --git a/thrust/testing/async_for_each.cu b/thrust/testing/async_for_each.cu
@@ -8,6 +8,8 @@
 
 #  include <unittest/unittest.h>
 
+_CCCL_SUPPRESS_DEPRECATED_PUSH
+
 #  define DEFINE_ASYNC_FOR_EACH_CALLABLE(name, ...)                                           \
     struct THRUST_PP_CAT2(name, _fn)                                                          \
     {                                                                                         \
@@ -21,7 +23,6 @@
     /**/
 
 DEFINE_ASYNC_FOR_EACH_CALLABLE(invoke_async_for_each);
-
 DEFINE_ASYNC_FOR_EACH_CALLABLE(invoke_async_for_each_device, thrust::device);
 
 #  undef DEFINE_ASYNC_FOR_EACH_CALLABLE

diff --git a/thrust/testing/async_reduce.cu b/thrust/testing/async_reduce.cu
@@ -12,6 +12,8 @@
 #  include <unittest/unittest.h>
 #  include <unittest/util_async.h>
 
+_CCCL_SUPPRESS_DEPRECATED_PUSH
+
 template <typename T>
 struct custom_plus
 {

diff --git a/thrust/testing/async_reduce_into.cu b/thrust/testing/async_reduce_into.cu
@@ -13,6 +13,8 @@
 #  include <unittest/unittest.h>
 #  include <unittest/util_async.h>
 
+_CCCL_SUPPRESS_DEPRECATED_PUSH
+
 template <typename T>
 struct custom_plus
 {

diff --git a/thrust/testing/async_sort.cu b/thrust/testing/async_sort.cu
@@ -15,6 +15,8 @@
 
 #  include <unittest/unittest.h>
 
+_CCCL_SUPPRESS_DEPRECATED_PUSH
+
 enum wait_policy
 {
   wait_for_futures,

diff --git a/thrust/testing/async_transform.cu b/thrust/testing/async_transform.cu
@@ -10,6 +10,8 @@
 #  include <unittest/unittest.h>
 #  include <unittest/util_async.h>
 
+_CCCL_SUPPRESS_DEPRECATED_PUSH
+
 template <typename T>
 struct divide_by_2
 {

diff --git a/thrust/thrust/async/copy.h b/thrust/thrust/async/copy.h
@@ -50,7 +50,7 @@ namespace unimplemented
 {
 
 template <typename FromPolicy, typename ToPolicy, typename ForwardIt, typename Sentinel, typename OutputIt>
-_CCCL_HOST event<FromPolicy> async_copy(
+CCCL_DEPRECATED _CCCL_HOST event<FromPolicy> async_copy(
   thrust::execution_policy<FromPolicy>& from_exec,
   thrust::execution_policy<ToPolicy>& to_exec,
   ForwardIt first,
@@ -116,7 +116,7 @@ struct copy_fn final
 
 } // namespace copy_detail
 
-_CCCL_GLOBAL_CONSTANT copy_detail::copy_fn copy{};
+CCCL_DEPRECATED _CCCL_GLOBAL_CONSTANT copy_detail::copy_fn copy{};
 
 /*! \endcond
  */

diff --git a/thrust/thrust/async/for_each.h b/thrust/thrust/async/for_each.h
@@ -50,7 +50,7 @@ namespace unimplemented
 {
 
 template <typename DerivedPolicy, typename ForwardIt, typename Sentinel, typename UnaryFunction>
-_CCCL_HOST event<DerivedPolicy>
+CCCL_DEPRECATED _CCCL_HOST event<DerivedPolicy>
 async_for_each(thrust::execution_policy<DerivedPolicy>&, ForwardIt, Sentinel, UnaryFunction)
 {
   THRUST_STATIC_ASSERT_MSG((thrust::detail::depend_on_instantiation<ForwardIt, false>::value),
@@ -93,7 +93,7 @@ struct for_each_fn final
 
 } // namespace for_each_detail
 
-_CCCL_GLOBAL_CONSTANT for_each_detail::for_each_fn for_each{};
+CCCL_DEPRECATED _CCCL_GLOBAL_CONSTANT for_each_detail::for_each_fn for_each{};
 
 /*! \endcond
  */

diff --git a/thrust/thrust/async/reduce.h b/thrust/thrust/async/reduce.h
@@ -52,7 +52,7 @@ namespace unimplemented
 {
 
 template <typename DerivedPolicy, typename ForwardIt, typename Sentinel, typename T, typename BinaryOp>
-_CCCL_HOST future<DerivedPolicy, T>
+CCCL_DEPRECATED _CCCL_HOST future<DerivedPolicy, T>
 async_reduce(thrust::execution_policy<DerivedPolicy>&, ForwardIt, Sentinel, T, BinaryOp)
 {
   THRUST_STATIC_ASSERT_MSG((thrust::detail::depend_on_instantiation<ForwardIt, false>::value),
@@ -159,15 +159,15 @@ struct reduce_fn final
 
 } // namespace reduce_detail
 
-_CCCL_GLOBAL_CONSTANT reduce_detail::reduce_fn reduce{};
+CCCL_DEPRECATED _CCCL_GLOBAL_CONSTANT reduce_detail::reduce_fn reduce{};
 
 ///////////////////////////////////////////////////////////////////////////////
 
 namespace unimplemented
 {
 
 template <typename DerivedPolicy, typename ForwardIt, typename Sentinel, typename OutputIt, typename T, typename BinaryOp>
-_CCCL_HOST event<DerivedPolicy>
+CCCL_DEPRECATED _CCCL_HOST event<DerivedPolicy>
 async_reduce_into(thrust::execution_policy<DerivedPolicy>&, ForwardIt, Sentinel, OutputIt, T, BinaryOp)
 {
   THRUST_STATIC_ASSERT_MSG((thrust::detail::depend_on_instantiation<ForwardIt, false>::value),
@@ -295,7 +295,7 @@ struct reduce_into_fn final
 
 } // namespace reduce_into_detail
 
-_CCCL_GLOBAL_CONSTANT reduce_into_detail::reduce_into_fn reduce_into{};
+CCCL_DEPRECATED _CCCL_GLOBAL_CONSTANT reduce_into_detail::reduce_into_fn reduce_into{};
 
 /*! \endcond
  */

diff --git a/thrust/thrust/async/scan.h b/thrust/thrust/async/scan.h
@@ -51,7 +51,7 @@ namespace unimplemented
 {
 
 template <typename DerivedPolicy, typename ForwardIt, typename Sentinel, typename OutputIt, typename BinaryOp>
-event<DerivedPolicy>
+CCCL_DEPRECATED event<DerivedPolicy>
 async_inclusive_scan(thrust::execution_policy<DerivedPolicy>&, ForwardIt, Sentinel, OutputIt, BinaryOp)
 {
   THRUST_STATIC_ASSERT_MSG((thrust::detail::depend_on_instantiation<ForwardIt, false>::value),
@@ -65,7 +65,7 @@ template <typename DerivedPolicy,
           typename OutputIt,
           typename InitialValueType,
           typename BinaryOp>
-event<DerivedPolicy> async_exclusive_scan(
+CCCL_DEPRECATED event<DerivedPolicy> async_exclusive_scan(
   thrust::execution_policy<DerivedPolicy>&, ForwardIt, Sentinel, OutputIt, InitialValueType, BinaryOp)
 {
   THRUST_STATIC_ASSERT_MSG((thrust::detail::depend_on_instantiation<ForwardIt, false>::value),
@@ -178,7 +178,7 @@ struct inclusive_scan_fn final
 
 } // namespace inclusive_scan_detail
 
-_CCCL_GLOBAL_CONSTANT inclusive_scan_detail::inclusive_scan_fn inclusive_scan{};
+CCCL_DEPRECATED _CCCL_GLOBAL_CONSTANT inclusive_scan_detail::inclusive_scan_fn inclusive_scan{};
 
 namespace exclusive_scan_detail
 {
@@ -287,7 +287,7 @@ struct exclusive_scan_fn final
 
 } // namespace exclusive_scan_detail
 
-_CCCL_GLOBAL_CONSTANT exclusive_scan_detail::exclusive_scan_fn exclusive_scan{};
+CCCL_DEPRECATED _CCCL_GLOBAL_CONSTANT exclusive_scan_detail::exclusive_scan_fn exclusive_scan{};
 
 } // namespace async
 

diff --git a/thrust/thrust/async/sort.h b/thrust/thrust/async/sort.h
@@ -52,7 +52,7 @@ namespace unimplemented
 {
 
 template <typename DerivedPolicy, typename ForwardIt, typename Sentinel, typename StrictWeakOrdering>
-_CCCL_HOST event<DerivedPolicy>
+CCCL_DEPRECATED _CCCL_HOST event<DerivedPolicy>
 async_stable_sort(thrust::execution_policy<DerivedPolicy>&, ForwardIt, Sentinel, StrictWeakOrdering)
 {
   THRUST_STATIC_ASSERT_MSG((thrust::detail::depend_on_instantiation<ForwardIt, false>::value),
@@ -145,13 +145,13 @@ struct stable_sort_fn final
 
 } // namespace stable_sort_detail
 
-_CCCL_GLOBAL_CONSTANT stable_sort_detail::stable_sort_fn stable_sort{};
+CCCL_DEPRECATED _CCCL_GLOBAL_CONSTANT stable_sort_detail::stable_sort_fn stable_sort{};
 
 namespace fallback
 {
 
 template <typename DerivedPolicy, typename ForwardIt, typename Sentinel, typename StrictWeakOrdering>
-_CCCL_HOST event<DerivedPolicy>
+CCCL_DEPRECATED _CCCL_HOST event<DerivedPolicy>
 async_sort(thrust::execution_policy<DerivedPolicy>& exec, ForwardIt&& first, Sentinel&& last, StrictWeakOrdering&& comp)
 {
   return async_stable_sort(thrust::detail::derived_cast(exec), THRUST_FWD(first), THRUST_FWD(last), THRUST_FWD(comp));
@@ -258,7 +258,7 @@ struct sort_fn final
 
 } // namespace sort_detail
 
-_CCCL_GLOBAL_CONSTANT sort_detail::sort_fn sort{};
+CCCL_DEPRECATED _CCCL_GLOBAL_CONSTANT sort_detail::sort_fn sort{};
 
 /*! \endcond
  */

diff --git a/thrust/thrust/async/transform.h b/thrust/thrust/async/transform.h
@@ -50,7 +50,7 @@ namespace unimplemented
 {
 
 template <typename DerivedPolicy, typename ForwardIt, typename Sentinel, typename OutputIt, typename UnaryOperation>
-_CCCL_HOST event<DerivedPolicy> async_transform(
+CCCL_DEPRECATED _CCCL_HOST event<DerivedPolicy> async_transform(
   thrust::execution_policy<DerivedPolicy>& exec, ForwardIt first, Sentinel last, OutputIt output, UnaryOperation op)
 {
   THRUST_STATIC_ASSERT_MSG((thrust::detail::depend_on_instantiation<ForwardIt, false>::value),
@@ -124,7 +124,7 @@ struct transform_fn final
 
 } // namespace transform_detail
 
-_CCCL_GLOBAL_CONSTANT transform_detail::transform_fn transform{};
+CCCL_DEPRECATED _CCCL_GLOBAL_CONSTANT transform_detail::transform_fn transform{};
 
 /*! \endcond
  */