Skip to content

Commit 4de514e

Browse files
Rename block_scan_algorithm to scan_algorithm
This member of three_way_partition_policy was the only tuning policy member of for a BlockScanAlgorithm that was not spelled scan_algorithm. Renaming for consistency.
1 parent b336700 commit 4de514e

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

cub/cub/device/dispatch/kernels/kernel_three_way_partition.cuh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ __launch_bounds__(current_policy<PolicySelector>().threads_per_block)
137137
active_policy.items_per_thread,
138138
active_policy.load_algorithm,
139139
active_policy.load_modifier,
140-
active_policy.block_scan_algorithm,
140+
active_policy.scan_algorithm,
141141
delay_constructor_t<active_policy.delay_constructor.kind,
142142
active_policy.delay_constructor.delay,
143143
active_policy.delay_constructor.l2_write_latency>>;

cub/cub/device/dispatch/tuning/tuning_three_way_partition.cuh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -422,15 +422,15 @@ struct three_way_partition_policy
422422
int items_per_thread;
423423
BlockLoadAlgorithm load_algorithm;
424424
CacheLoadModifier load_modifier;
425-
BlockScanAlgorithm block_scan_algorithm;
425+
BlockScanAlgorithm scan_algorithm;
426426
delay_constructor_policy delay_constructor;
427427

428428
[[nodiscard]] _CCCL_HOST_DEVICE_API constexpr friend bool
429429
operator==(const three_way_partition_policy& lhs, const three_way_partition_policy& rhs)
430430
{
431431
return lhs.threads_per_block == rhs.threads_per_block && lhs.items_per_thread == rhs.items_per_thread
432432
&& lhs.load_algorithm == rhs.load_algorithm && lhs.load_modifier == rhs.load_modifier
433-
&& lhs.block_scan_algorithm == rhs.block_scan_algorithm && lhs.delay_constructor == rhs.delay_constructor;
433+
&& lhs.scan_algorithm == rhs.block_scan_algorithm && lhs.delay_constructor == rhs.delay_constructor;
434434
}
435435

436436
[[nodiscard]] _CCCL_HOST_DEVICE_API constexpr friend bool
@@ -445,7 +445,7 @@ struct three_way_partition_policy
445445
return os
446446
<< "three_way_partition_policy { .threads_per_block = " << policy.threads_per_block
447447
<< ", .items_per_thread = " << policy.items_per_thread << ", .load_algorithm = " << policy.load_algorithm
448-
<< ", .load_modifier = " << policy.load_modifier << ", .block_scan_algorithm = " << policy.block_scan_algorithm
448+
<< ", .load_modifier = " << policy.load_modifier << ", .scan_algorithm = " << policy.block_scan_algorithm
449449
<< ", .delay_constructor = " << policy.delay_constructor << " }";
450450
}
451451
#endif // _CCCL_HOSTED()

0 commit comments

Comments
 (0)