From b0a28417f616b302fcb3c7612c94aec2c2318a84 Mon Sep 17 00:00:00 2001 From: Elias Stehle <3958403+elstehle@users.noreply.github.com> Date: Thu, 6 Feb 2025 06:54:38 -0800 Subject: [PATCH] drops deprecated agents in public ns --- cub/cub/agent/agent_adjacent_difference.cuh | 18 ---------- cub/cub/agent/agent_histogram.cuh | 22 ------------ cub/cub/agent/agent_merge_sort.cuh | 38 -------------------- cub/cub/agent/agent_radix_sort_downsweep.cuh | 11 ------ cub/cub/agent/agent_radix_sort_histogram.cuh | 10 ------ cub/cub/agent/agent_radix_sort_onesweep.cuh | 11 ------ cub/cub/agent/agent_radix_sort_upsweep.cuh | 8 ----- cub/cub/agent/agent_reduce.cuh | 11 ------ cub/cub/agent/agent_reduce_by_key.cuh | 24 ------------- cub/cub/agent/agent_rle.cuh | 10 ------ cub/cub/agent/agent_scan.cuh | 12 ------- cub/cub/agent/agent_scan_by_key.cuh | 22 ------------ cub/cub/agent/agent_segmented_radix_sort.cuh | 11 ------ cub/cub/agent/agent_sub_warp_merge_sort.cuh | 5 --- cub/cub/agent/agent_unique_by_key.cuh | 18 ---------- 15 files changed, 231 deletions(-) diff --git a/cub/cub/agent/agent_adjacent_difference.cuh b/cub/cub/agent/agent_adjacent_difference.cuh index 8617c78193b..cf002749cdb 100644 --- a/cub/cub/agent/agent_adjacent_difference.cuh +++ b/cub/cub/agent/agent_adjacent_difference.cuh @@ -258,22 +258,4 @@ struct AgentDifferenceInit } // namespace adjacent_difference } // namespace detail -template -using AgentDifference CCCL_DEPRECATED_BECAUSE("This class is considered an implementation detail and the public " - "interface will be removed.") = detail::adjacent_difference:: - AgentDifference; - -template -using AgentDifferenceInit CCCL_DEPRECATED_BECAUSE("This class is considered an implementation detail and the public " - "interface will be removed.") = - detail::adjacent_difference::AgentDifferenceInit; - CUB_NAMESPACE_END diff --git a/cub/cub/agent/agent_histogram.cuh b/cub/cub/agent/agent_histogram.cuh index d486e618c51..bb7851335e3 100644 --- a/cub/cub/agent/agent_histogram.cuh +++ b/cub/cub/agent/agent_histogram.cuh @@ -918,26 +918,4 @@ struct AgentHistogram } // namespace histogram } // namespace detail -template -using AgentHistogram CCCL_DEPRECATED_BECAUSE("This class is considered an implementation detail and the public " - "interface will be removed.") = - detail::histogram::AgentHistogram< - AgentHistogramPolicyT, - PRIVATIZED_SMEM_BINS, - NUM_CHANNELS, - NUM_ACTIVE_CHANNELS, - SampleIteratorT, - CounterT, - PrivatizedDecodeOpT, - OutputDecodeOpT, - OffsetT>; - CUB_NAMESPACE_END diff --git a/cub/cub/agent/agent_merge_sort.cuh b/cub/cub/agent/agent_merge_sort.cuh index 6c88407b43b..d35621e0d67 100644 --- a/cub/cub/agent/agent_merge_sort.cuh +++ b/cub/cub/agent/agent_merge_sort.cuh @@ -750,42 +750,4 @@ struct AgentMerge } // namespace merge_sort } // namespace detail -template -using AgentBlockSort CCCL_DEPRECATED_BECAUSE("This class is considered an implementation detail and the public " - "interface will be removed.") = - detail::merge_sort::AgentBlockSort< - Policy, - KeyInputIteratorT, - ValueInputIteratorT, - KeyIteratorT, - ValueIteratorT, - OffsetT, - CompareOpT, - KeyT, - ValueT>; - -template -using AgentPartition CCCL_DEPRECATED_BECAUSE( - "This class is considered an implementation detail and the public interface will be " - "removed.") = detail::merge_sort::AgentPartition; - -template -using AgentMerge CCCL_DEPRECATED_BECAUSE("This class is considered an implementation detail and the public interface " - "will be removed.") = - detail::merge_sort::AgentMerge; - CUB_NAMESPACE_END diff --git a/cub/cub/agent/agent_radix_sort_downsweep.cuh b/cub/cub/agent/agent_radix_sort_downsweep.cuh index 8816d7c406d..9249c5a7bd7 100644 --- a/cub/cub/agent/agent_radix_sort_downsweep.cuh +++ b/cub/cub/agent/agent_radix_sort_downsweep.cuh @@ -765,15 +765,4 @@ struct AgentRadixSortDownsweep } // namespace radix_sort } // namespace detail -template -using AgentRadixSortDownsweep CCCL_DEPRECATED_BECAUSE( - "This class is considered an implementation detail and the public " - "interface will be removed.") = detail::radix_sort:: - AgentRadixSortDownsweep; - CUB_NAMESPACE_END diff --git a/cub/cub/agent/agent_radix_sort_histogram.cuh b/cub/cub/agent/agent_radix_sort_histogram.cuh index 29580897764..fe2e1974a06 100644 --- a/cub/cub/agent/agent_radix_sort_histogram.cuh +++ b/cub/cub/agent/agent_radix_sort_histogram.cuh @@ -283,14 +283,4 @@ struct AgentRadixSortHistogram } // namespace radix_sort } // namespace detail -template -using AgentRadixSortHistogram CCCL_DEPRECATED_BECAUSE( - "This class is considered an implementation detail and the public " - "interface will be removed.") = - detail::radix_sort::AgentRadixSortHistogram; - CUB_NAMESPACE_END diff --git a/cub/cub/agent/agent_radix_sort_onesweep.cuh b/cub/cub/agent/agent_radix_sort_onesweep.cuh index aaf40f77f83..0aed1a09f53 100644 --- a/cub/cub/agent/agent_radix_sort_onesweep.cuh +++ b/cub/cub/agent/agent_radix_sort_onesweep.cuh @@ -696,15 +696,4 @@ struct AgentRadixSortOnesweep } // namespace radix_sort } // namespace detail -template -using AgentRadixSortOnesweep CCCL_DEPRECATED_BECAUSE("This class is considered an implementation detail and the public " - "interface will be removed.") = detail::radix_sort:: - AgentRadixSortOnesweep; - CUB_NAMESPACE_END diff --git a/cub/cub/agent/agent_radix_sort_upsweep.cuh b/cub/cub/agent/agent_radix_sort_upsweep.cuh index c0f35814b6e..e30a07fcdb9 100644 --- a/cub/cub/agent/agent_radix_sort_upsweep.cuh +++ b/cub/cub/agent/agent_radix_sort_upsweep.cuh @@ -553,12 +553,4 @@ struct AgentRadixSortUpsweep } // namespace radix_sort } // namespace detail -template -using AgentRadixSortUpsweep CCCL_DEPRECATED_BECAUSE("This class is considered an implementation detail and the public " - "interface will be removed.") = - detail::radix_sort::AgentRadixSortUpsweep; - CUB_NAMESPACE_END diff --git a/cub/cub/agent/agent_reduce.cuh b/cub/cub/agent/agent_reduce.cuh index b0bf37949fd..1f327fe282b 100644 --- a/cub/cub/agent/agent_reduce.cuh +++ b/cub/cub/agent/agent_reduce.cuh @@ -457,15 +457,4 @@ private: } // namespace reduce } // namespace detail -template -using AgentReduce CCCL_DEPRECATED_BECAUSE("This class is considered an implementation detail and the public interface " - "will be removed.") = detail::reduce:: - AgentReduce; - CUB_NAMESPACE_END diff --git a/cub/cub/agent/agent_reduce_by_key.cuh b/cub/cub/agent/agent_reduce_by_key.cuh index 4838f4d8d52..1bbd5901d74 100644 --- a/cub/cub/agent/agent_reduce_by_key.cuh +++ b/cub/cub/agent/agent_reduce_by_key.cuh @@ -701,28 +701,4 @@ struct AgentReduceByKey } // namespace reduce } // namespace detail -template -using AgentReduceByKey CCCL_DEPRECATED_BECAUSE("This class is considered an implementation detail and the public " - "interface will be removed.") = - detail::reduce::AgentReduceByKey< - AgentReduceByKeyPolicyT, - KeysInputIteratorT, - UniqueOutputIteratorT, - ValuesInputIteratorT, - AggregatesOutputIteratorT, - NumRunsOutputIteratorT, - EqualityOpT, - ReductionOpT, - OffsetT, - AccumT>; - CUB_NAMESPACE_END diff --git a/cub/cub/agent/agent_rle.cuh b/cub/cub/agent/agent_rle.cuh index 1bd5830aec9..fcb18fbc1c6 100644 --- a/cub/cub/agent/agent_rle.cuh +++ b/cub/cub/agent/agent_rle.cuh @@ -997,14 +997,4 @@ struct AgentRle } // namespace rle } // namespace detail -template -using AgentRle CCCL_DEPRECATED_BECAUSE("This class is considered an implementation detail and the public interface " - "will be removed.") = detail::rle:: - AgentRle; - CUB_NAMESPACE_END diff --git a/cub/cub/agent/agent_scan.cuh b/cub/cub/agent/agent_scan.cuh index 097d0024182..ba9d4744f45 100644 --- a/cub/cub/agent/agent_scan.cuh +++ b/cub/cub/agent/agent_scan.cuh @@ -597,16 +597,4 @@ struct AgentScan } // namespace scan } // namespace detail -template -using AgentScan CCCL_DEPRECATED_BECAUSE("This class is considered an implementation detail and the public interface " - "will be removed.") = detail::scan:: - AgentScan; - CUB_NAMESPACE_END diff --git a/cub/cub/agent/agent_scan_by_key.cuh b/cub/cub/agent/agent_scan_by_key.cuh index 0bb724f0c51..99834b78df5 100644 --- a/cub/cub/agent/agent_scan_by_key.cuh +++ b/cub/cub/agent/agent_scan_by_key.cuh @@ -472,26 +472,4 @@ struct AgentScanByKey } // namespace scan_by_key } // namespace detail -template -using AgentScanByKey CCCL_DEPRECATED_BECAUSE("This class is considered an implementation detail and the public " - "interface will be removed.") = - detail::scan_by_key::AgentScanByKey< - AgentScanByKeyPolicyT, - KeysInputIteratorT, - ValuesInputIteratorT, - ValuesOutputIteratorT, - EqualityOp, - ScanOpT, - InitValueT, - OffsetT, - AccumT>; - CUB_NAMESPACE_END diff --git a/cub/cub/agent/agent_segmented_radix_sort.cuh b/cub/cub/agent/agent_segmented_radix_sort.cuh index 15d11473e73..26bd5e655af 100644 --- a/cub/cub/agent/agent_segmented_radix_sort.cuh +++ b/cub/cub/agent/agent_segmented_radix_sort.cuh @@ -289,15 +289,4 @@ struct AgentSegmentedRadixSort } // namespace radix_sort } // namespace detail -template -using AgentSegmentedRadixSort CCCL_DEPRECATED_BECAUSE( - "This class is considered an implementation detail and the public " - "interface will be removed.") = - detail::radix_sort::AgentSegmentedRadixSort; - CUB_NAMESPACE_END diff --git a/cub/cub/agent/agent_sub_warp_merge_sort.cuh b/cub/cub/agent/agent_sub_warp_merge_sort.cuh index 44ad2f6901b..aaaa16ac64e 100644 --- a/cub/cub/agent/agent_sub_warp_merge_sort.cuh +++ b/cub/cub/agent/agent_sub_warp_merge_sort.cuh @@ -339,9 +339,4 @@ private: } // namespace sub_warp_merge_sort } // namespace detail -template -using AgentSubWarpSort CCCL_DEPRECATED_BECAUSE("This class is considered an implementation detail and the public " - "interface will be removed.") = - detail::sub_warp_merge_sort::AgentSubWarpSort; - CUB_NAMESPACE_END diff --git a/cub/cub/agent/agent_unique_by_key.cuh b/cub/cub/agent/agent_unique_by_key.cuh index 52ca1d9b3a2..9a19c097dc8 100644 --- a/cub/cub/agent/agent_unique_by_key.cuh +++ b/cub/cub/agent/agent_unique_by_key.cuh @@ -613,22 +613,4 @@ struct AgentUniqueByKey } // namespace unique_by_key } // namespace detail -template -using AgentUniqueByKey CCCL_DEPRECATED_BECAUSE("This class is considered an implementation detail and the public " - "interface will be removed.") = - detail::unique_by_key::AgentUniqueByKey< - AgentUniqueByKeyPolicyT, - KeyInputIteratorT, - ValueInputIteratorT, - KeyOutputIteratorT, - ValueOutputIteratorT, - EqualityOpT, - OffsetT>; - CUB_NAMESPACE_END