Skip to content

Commit cc79883

Browse files
Fix radix_sort tuning namespace (#6755)
1 parent a824522 commit cc79883

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

c/parallel/src/radix_sort.cu

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,7 @@ CUresult cccl_device_radix_sort_build_ex(
306306
check(cccl_type_name_from_nvrtc<OffsetT>(&offset_t));
307307

308308
const auto policy_hub_expr =
309-
std::format("cub::detail::radix::policy_hub<{}, {}, {}>", key_cpp, value_cpp, offset_t);
309+
std::format("cub::detail::radix_sort::policy_hub<{}, {}, {}>", key_cpp, value_cpp, offset_t);
310310

311311
const std::string final_src = std::format(
312312
R"XXX(
@@ -326,7 +326,7 @@ using {5} = {6}::MaxPolicy;
326326
#include <cub/detail/ptx-json/json.cuh>
327327
__device__ consteval auto& policy_generator() {{
328328
return ptx_json::id<ptx_json::string("device_radix_sort_policy")>()
329-
= cub::detail::radix::RadixSortPolicyWrapper<{5}::ActivePolicy>::EncodedPolicy();
329+
= cub::detail::radix_sort::RadixSortPolicyWrapper<{5}::ActivePolicy>::EncodedPolicy();
330330
}}
331331
)XXX",
332332
input_keys_it.value_type.size, // 0

cub/cub/device/dispatch/dispatch_radix_sort.cuh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ template <SortOrder Order,
115115
typename ValueT,
116116
typename OffsetT,
117117
typename DecomposerT = detail::identity_decomposer_t,
118-
typename PolicyHub = detail::radix::policy_hub<KeyT, ValueT, OffsetT>,
118+
typename PolicyHub = detail::radix_sort::policy_hub<KeyT, ValueT, OffsetT>,
119119
typename KernelSource = detail::radix_sort::
120120
DeviceRadixSortKernelSource<typename PolicyHub::MaxPolicy, Order, KeyT, ValueT, OffsetT, DecomposerT>,
121121
typename KernelLauncherFactory = CUB_DETAIL_DEFAULT_KERNEL_LAUNCHER_FACTORY>
@@ -925,7 +925,7 @@ struct DispatchRadixSort
925925
template <typename ActivePolicyT>
926926
CUB_RUNTIME_FUNCTION _CCCL_FORCEINLINE cudaError_t Invoke(ActivePolicyT policy = {})
927927
{
928-
auto wrapped_policy = detail::radix::MakeRadixSortPolicyWrapper(policy);
928+
auto wrapped_policy = detail::radix_sort::MakeRadixSortPolicyWrapper(policy);
929929

930930
// Return if empty problem, or if no bits to sort and double-buffering is used
931931
if (num_items == 0 || (begin_bit == end_bit && is_overwrite_okay))

cub/cub/device/dispatch/dispatch_segmented_radix_sort.cuh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ template <SortOrder Order,
124124
typename BeginOffsetIteratorT,
125125
typename EndOffsetIteratorT,
126126
typename SegmentSizeT,
127-
typename PolicyHub = detail::radix::policy_hub<KeyT, ValueT, SegmentSizeT>,
127+
typename PolicyHub = detail::radix_sort::policy_hub<KeyT, ValueT, SegmentSizeT>,
128128
typename DecomposerT = detail::identity_decomposer_t,
129129
typename KernelSource = detail::radix_sort::DeviceSegmentedRadixSortKernelSource<
130130
typename PolicyHub::MaxPolicy,
@@ -517,7 +517,7 @@ struct DispatchSegmentedRadixSort
517517
// Force kernel code-generation in all compiler passes
518518
return InvokePasses(kernel_source.SegmentedRadixSortKernel(),
519519
kernel_source.AltSegmentedRadixSortKernel(),
520-
detail::radix::MakeRadixSortPolicyWrapper(policy));
520+
detail::radix_sort::MakeRadixSortPolicyWrapper(policy));
521521
}
522522

523523
//------------------------------------------------------------------------------

cub/cub/device/dispatch/tuning/tuning_radix_sort.cuh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
CUB_NAMESPACE_BEGIN
2424

25-
namespace detail::radix
25+
namespace detail::radix_sort
2626
{
2727
// sm90 default
2828
template <size_t KeySize, size_t ValueSize, size_t OffsetSize>
@@ -1040,6 +1040,6 @@ struct policy_hub
10401040

10411041
using MaxPolicy = Policy1000;
10421042
};
1043-
} // namespace detail::radix
1043+
} // namespace detail::radix_sort
10441044

10451045
CUB_NAMESPACE_END

0 commit comments

Comments
 (0)