Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Backport branch/2.8.x] Internalize cub::KernelConfig #3688

Merged
merged 6 commits into from
Feb 5, 2025
Merged

[Backport branch/2.8.x] Internalize cub::KernelConfig #3688

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e27b310
Internalize cub::KernelConfig (#3683)
fbusato Feb 5, 2025
d6c93f6
Merge branch 'branch/2.8.x' into backport-3683-to-branch/2.8.x
miscco Feb 5, 2025
a826d5f
Use plain old void cast to suppress unused warnings
miscco Feb 5, 2025
3ac06ad
Merge branch 'branch/2.8.x' into backport-3683-to-branch/2.8.x
bernhardmgruber Feb 5, 2025
14a670a
Suppress unused variable warning for nvcc 11.1
bernhardmgruber Feb 5, 2025
ece20dc
Merge branch 'branch/2.8.x' into backport-3683-to-branch/2.8.x
miscco Feb 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions cub/cub/device/dispatch/dispatch_radix_sort.cuh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1184,11 +1184,11 @@ struct DispatchRadixSort
struct PassConfig
{
UpsweepKernelT upsweep_kernel;
KernelConfig upsweep_config;
detail::KernelConfig upsweep_config;
ScanKernelT scan_kernel;
KernelConfig scan_config;
detail::KernelConfig scan_config;
DownsweepKernelT downsweep_kernel;
KernelConfig downsweep_config;
detail::KernelConfig downsweep_config;
int radix_bits;
int radix_digits;
int max_downsweep_grid_size;
Expand Down Expand Up @@ -2135,7 +2135,7 @@ struct DispatchSegmentedRadixSort
struct PassConfig
{
SegmentedKernelT segmented_kernel;
KernelConfig segmented_config;
detail::KernelConfig segmented_config;
int radix_bits;
int radix_digits;

Expand Down
6 changes: 4 additions & 2 deletions cub/cub/device/dispatch/dispatch_reduce.cuh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -474,7 +474,8 @@ struct DispatchReduce
}

// Init regular kernel configuration
KernelConfig reduce_config;
detail::KernelConfig reduce_config;
(void) reduce_config;
error = CubDebug(reduce_config.Init(reduce_kernel, active_policy.Reduce(), launcher_factory));
if (cudaSuccess != error)
{
Expand Down Expand Up @@ -949,7 +950,8 @@ struct DispatchSegmentedReduce
}

// Init kernel configuration
KernelConfig segmented_reduce_config;
detail::KernelConfig segmented_reduce_config;
(void) &segmented_reduce_config;
error =
CubDebug(segmented_reduce_config.Init<typename ActivePolicyT::SegmentedReducePolicy>(segmented_reduce_kernel));
if (cudaSuccess != error)
Expand Down
21 changes: 9 additions & 12 deletions cub/cub/util_device.cuh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -656,25 +656,18 @@ CUB_RUNTIME_FUNCTION detail::PolicyWrapper<PolicyT> MakePolicyWrapper(PolicyT po

namespace detail
{

struct TripleChevronFactory;
}

/**
* Kernel dispatch configuration
*/
struct KernelConfig
{
int block_threads;
int items_per_thread;
int tile_size;
int sm_occupancy;

CUB_RUNTIME_FUNCTION _CCCL_FORCEINLINE KernelConfig()
: block_threads(0)
, items_per_thread(0)
, tile_size(0)
, sm_occupancy(0)
{}
int block_threads{0};
int items_per_thread{0};
int tile_size{0};
int sm_occupancy{0};

template <typename AgentPolicyT, typename KernelPtrT, typename LauncherFactory = detail::TripleChevronFactory>
CUB_RUNTIME_FUNCTION _CCCL_VISIBILITY_HIDDEN _CCCL_FORCEINLINE cudaError_t
Expand All @@ -687,6 +680,10 @@ struct KernelConfig
}
};

} // namespace detail

using KernelConfig CCCL_DEPRECATED_BECAUSE("This class is considered an implementation detail") = detail::KernelConfig;

/// Helper for dispatching into a policy chain
template <int PolicyPtxVersion, typename PolicyT, typename PrevPolicyT>
struct ChainedPolicy
Expand Down