Skip to content

Commit 03171f2

Browse files
bernhardmgruberbernhardmgruber
committed
Prefix CUB kernel headers with kernel_
This makes the filenames more consistent with the rest of CUB
1 parent 9384f40 commit 03171f2

33 files changed

+36
-36
lines changed

‎c/parallel/src/for/for_op_helper.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ std::string get_for_kernel(cccl_op_t user_op, cccl_iterator_t iter)
129129
R"XXX(
130130
#include <cuda/std/iterator>
131131
#include <cub/agent/agent_for.cuh>
132-
#include <cub/device/dispatch/kernels/for_each.cuh>
132+
#include <cub/device/dispatch/kernels/kernel_for_each.cuh>
133133
134134
struct __align__({2}) storage_t {{
135135
char data[{3}];

‎c/parallel/src/histogram.cu‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ CUresult cccl_device_histogram_build_ex(
212212
constexpr std::string_view src_template = R"XXX(
213213
#include <cub/agent/agent_histogram.cuh>
214214
#include <cub/block/block_load.cuh>
215-
#include <cub/device/dispatch/kernels/histogram.cuh>
215+
#include <cub/device/dispatch/kernels/kernel_histogram.cuh>
216216
217217
struct __align__({1}) storage_t {{
218218
char data[{0}];

‎c/parallel/src/merge_sort.cu‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ CUresult cccl_device_merge_sort_build_ex(
286286
std::string final_src = std::format(
287287
R"XXX(
288288
#include <cub/device/dispatch/tuning/tuning_merge_sort.cuh>
289-
#include <cub/device/dispatch/kernels/merge_sort.cuh>
289+
#include <cub/device/dispatch/kernels/kernel_merge_sort.cuh>
290290
#include <cub/util_type.cuh> // needed for cub::NullType
291291
struct __align__({1}) storage_t {{
292292
char data[{0}];

‎c/parallel/src/radix_sort.cu‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@ CUresult cccl_device_radix_sort_build_ex(
311311
const std::string final_src = std::format(
312312
R"XXX(
313313
#include <cub/device/dispatch/tuning/tuning_radix_sort.cuh>
314-
#include <cub/device/dispatch/kernels/radix_sort.cuh>
314+
#include <cub/device/dispatch/kernels/kernel_radix_sort.cuh>
315315
#include <cub/agent/single_pass_scan_operators.cuh>
316316
317317
struct __align__({1}) storage_t {{

‎c/parallel/src/reduce.cu‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ CUresult cccl_device_reduce_build_ex(
198198
std::string final_src = std::format(
199199
R"XXX(
200200
#include <cub/device/dispatch/tuning/tuning_reduce.cuh>
201-
#include <cub/device/dispatch/kernels/reduce.cuh>
201+
#include <cub/device/dispatch/kernels/kernel_reduce.cuh>
202202
{0}
203203
struct __align__({2}) storage_t {{
204204
char data[{1}];

‎c/parallel/src/scan.cu‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ CUresult cccl_device_scan_build_ex(
260260
R"XXX(
261261
#include <cub/device/dispatch/tuning/tuning_scan.cuh>
262262
#include <cub/block/block_scan.cuh>
263-
#include <cub/device/dispatch/kernels/scan.cuh>
263+
#include <cub/device/dispatch/kernels/kernel_scan.cuh>
264264
#include <cub/agent/single_pass_scan_operators.cuh>
265265
struct __align__({1}) storage_t {{
266266
char data[{0}];

‎c/parallel/src/segmented_reduce.cu‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ CUresult cccl_device_segmented_reduce_build_ex(
187187
R"XXX(
188188
#include <cub/block/block_reduce.cuh>
189189
#include <cub/device/dispatch/tuning/tuning_reduce.cuh>
190-
#include <cub/device/dispatch/kernels/segmented_reduce.cuh>
190+
#include <cub/device/dispatch/kernels/kernel_segmented_reduce.cuh>
191191
{0}
192192
struct __align__({2}) storage_t {{
193193
char data[{1}];

‎c/parallel/src/three_way_partition.cu‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#include <cub/detail/launcher/cuda_driver.cuh> // cub::detail::CudaDriverLauncherFactory
1313
#include <cub/detail/ptx-json-parser.h>
1414
#include <cub/device/dispatch/dispatch_three_way_partition.cuh> // cub::DispatchThreeWayPartitionIf
15-
#include <cub/device/dispatch/kernels/three_way_partition.cuh> // DeviceThreeWayPartition kernels
15+
#include <cub/device/dispatch/kernels/kernel_three_way_partition.cuh> // DeviceThreeWayPartition kernels
1616
#include <cub/device/dispatch/tuning/tuning_three_way_partition.cuh> // policy_hub
1717

1818
#include <exception>
@@ -195,7 +195,7 @@ CUresult cccl_device_three_way_partition_build_ex(
195195
std::string final_src = std::format(
196196
R"XXX(
197197
#include <cub/device/dispatch/tuning/tuning_three_way_partition.cuh>
198-
#include <cub/device/dispatch/kernels/three_way_partition.cuh>
198+
#include <cub/device/dispatch/kernels/kernel_three_way_partition.cuh>
199199
{0}
200200
struct __align__({2}) storage_t {{
201201
char data[{1}];

‎c/parallel/src/transform.cu‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -507,7 +507,7 @@ CUresult cccl_device_binary_transform_build_ex(
507507

508508
std::string final_src = std::format(
509509
R"XXX(
510-
#include <cub/device/dispatch/kernels/transform.cuh>
510+
#include <cub/device/dispatch/kernels/kernel_transform.cuh>
511511
struct __align__({1}) input1_storage_t {{
512512
char data[{0}];
513513
}};

‎c/parallel/src/unique_by_key.cu‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -259,8 +259,8 @@ CUresult cccl_device_unique_by_key_build_ex(
259259
std::string final_src = std::format(
260260
R"XXX(
261261
#include <cub/device/dispatch/tuning/tuning_unique_by_key.cuh>
262-
#include <cub/device/dispatch/kernels/scan.cuh>
263-
#include <cub/device/dispatch/kernels/unique_by_key.cuh>
262+
#include <cub/device/dispatch/kernels/kernel_scan.cuh>
263+
#include <cub/device/dispatch/kernels/kernel_unique_by_key.cuh>
264264
#include <cub/agent/single_pass_scan_operators.cuh>
265265
struct __align__({1}) storage_t {{
266266
char data[{0}];

0 commit comments

Comments
 (0)