diff --git a/thrust/testing/async_copy.cu b/thrust/testing/async_copy.cu index cd18d83a782..ce3451dc829 100644 --- a/thrust/testing/async_copy.cu +++ b/thrust/testing/async_copy.cu @@ -10,6 +10,8 @@ # include # include +_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 index a4ca2771b72..f939fe85c7e 100644 --- a/thrust/testing/async_for_each.cu +++ b/thrust/testing/async_for_each.cu @@ -8,6 +8,8 @@ # include +_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 index 85fcb3ef395..8ee48856c97 100644 --- a/thrust/testing/async_reduce.cu +++ b/thrust/testing/async_reduce.cu @@ -12,6 +12,8 @@ # include # include +_CCCL_SUPPRESS_DEPRECATED_PUSH + template struct custom_plus { diff --git a/thrust/testing/async_reduce_into.cu b/thrust/testing/async_reduce_into.cu index e757ac3a708..3cde0e68f6d 100644 --- a/thrust/testing/async_reduce_into.cu +++ b/thrust/testing/async_reduce_into.cu @@ -13,6 +13,8 @@ # include # include +_CCCL_SUPPRESS_DEPRECATED_PUSH + template struct custom_plus { diff --git a/thrust/testing/async_sort.cu b/thrust/testing/async_sort.cu index 77144779814..b7de68fceca 100644 --- a/thrust/testing/async_sort.cu +++ b/thrust/testing/async_sort.cu @@ -15,6 +15,8 @@ # include +_CCCL_SUPPRESS_DEPRECATED_PUSH + enum wait_policy { wait_for_futures, diff --git a/thrust/testing/async_transform.cu b/thrust/testing/async_transform.cu index bfb30006ff2..4f7c02bba4c 100644 --- a/thrust/testing/async_transform.cu +++ b/thrust/testing/async_transform.cu @@ -10,6 +10,8 @@ # include # include +_CCCL_SUPPRESS_DEPRECATED_PUSH + template struct divide_by_2 { diff --git a/thrust/thrust/async/copy.h b/thrust/thrust/async/copy.h index 1adc90c3dff..c3a64137c0e 100644 --- a/thrust/thrust/async/copy.h +++ b/thrust/thrust/async/copy.h @@ -50,7 +50,7 @@ namespace unimplemented { template -_CCCL_HOST event async_copy( +CCCL_DEPRECATED _CCCL_HOST event async_copy( thrust::execution_policy& from_exec, thrust::execution_policy& 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 index 6128b6a7625..d2110128584 100644 --- a/thrust/thrust/async/for_each.h +++ b/thrust/thrust/async/for_each.h @@ -50,7 +50,7 @@ namespace unimplemented { template -_CCCL_HOST event +CCCL_DEPRECATED _CCCL_HOST event async_for_each(thrust::execution_policy&, ForwardIt, Sentinel, UnaryFunction) { THRUST_STATIC_ASSERT_MSG((thrust::detail::depend_on_instantiation::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 index a6cea12b5ab..2d3cb8159dc 100644 --- a/thrust/thrust/async/reduce.h +++ b/thrust/thrust/async/reduce.h @@ -52,7 +52,7 @@ namespace unimplemented { template -_CCCL_HOST future +CCCL_DEPRECATED _CCCL_HOST future async_reduce(thrust::execution_policy&, ForwardIt, Sentinel, T, BinaryOp) { THRUST_STATIC_ASSERT_MSG((thrust::detail::depend_on_instantiation::value), @@ -159,7 +159,7 @@ 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{}; /////////////////////////////////////////////////////////////////////////////// @@ -167,7 +167,7 @@ namespace unimplemented { template -_CCCL_HOST event +CCCL_DEPRECATED _CCCL_HOST event async_reduce_into(thrust::execution_policy&, ForwardIt, Sentinel, OutputIt, T, BinaryOp) { THRUST_STATIC_ASSERT_MSG((thrust::detail::depend_on_instantiation::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 index 4963d17225e..ba62e41bb8a 100644 --- a/thrust/thrust/async/scan.h +++ b/thrust/thrust/async/scan.h @@ -51,7 +51,7 @@ namespace unimplemented { template -event +CCCL_DEPRECATED event async_inclusive_scan(thrust::execution_policy&, ForwardIt, Sentinel, OutputIt, BinaryOp) { THRUST_STATIC_ASSERT_MSG((thrust::detail::depend_on_instantiation::value), @@ -65,7 +65,7 @@ template -event async_exclusive_scan( +CCCL_DEPRECATED event async_exclusive_scan( thrust::execution_policy&, ForwardIt, Sentinel, OutputIt, InitialValueType, BinaryOp) { THRUST_STATIC_ASSERT_MSG((thrust::detail::depend_on_instantiation::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 index ae37abb5d61..b37436eb2e0 100644 --- a/thrust/thrust/async/sort.h +++ b/thrust/thrust/async/sort.h @@ -52,7 +52,7 @@ namespace unimplemented { template -_CCCL_HOST event +CCCL_DEPRECATED _CCCL_HOST event async_stable_sort(thrust::execution_policy&, ForwardIt, Sentinel, StrictWeakOrdering) { THRUST_STATIC_ASSERT_MSG((thrust::detail::depend_on_instantiation::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 -_CCCL_HOST event +CCCL_DEPRECATED _CCCL_HOST event async_sort(thrust::execution_policy& 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 index 0862141ee0d..f8b55835073 100644 --- a/thrust/thrust/async/transform.h +++ b/thrust/thrust/async/transform.h @@ -50,7 +50,7 @@ namespace unimplemented { template -_CCCL_HOST event async_transform( +CCCL_DEPRECATED _CCCL_HOST event async_transform( thrust::execution_policy& exec, ForwardIt first, Sentinel last, OutputIt output, UnaryOperation op) { THRUST_STATIC_ASSERT_MSG((thrust::detail::depend_on_instantiation::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 */