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

Jump to bottom

Widen histogram agent constructor to more types #2380

Merged
merged 1 commit into from
Sep 6, 2024
Merged

Widen histogram agent constructor to more types #2380

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 12 additions & 12 deletions cub/cub/agent/agent_histogram.cuh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,22 +287,22 @@ struct AgentHistogram
SampleT* d_native_samples;

/// The number of output bins for each channel
int (&num_output_bins)[NUM_ACTIVE_CHANNELS];
int* num_output_bins;

/// The number of privatized bins for each channel
int (&num_privatized_bins)[NUM_ACTIVE_CHANNELS];
int* num_privatized_bins;

/// Reference to gmem privatized histograms for each channel
/// Copy of gmem privatized histograms for each channel
CounterT* d_privatized_histograms[NUM_ACTIVE_CHANNELS];

/// Reference to final output histograms (gmem)
CounterT* (&d_output_histograms)[NUM_ACTIVE_CHANNELS];
CounterT** d_output_histograms;

/// The transform operator for determining output bin-ids from privatized counter indices, one for each channel
OutputDecodeOpT (&output_decode_op)[NUM_ACTIVE_CHANNELS];
OutputDecodeOpT* output_decode_op;

/// The transform operator for determining privatized counter indices from samples, one for each channel
PrivatizedDecodeOpT (&privatized_decode_op)[NUM_ACTIVE_CHANNELS];
PrivatizedDecodeOpT* privatized_decode_op;

/// Whether to prefer privatized smem counters vs privatized global counters
bool prefer_smem;
Expand Down Expand Up @@ -810,12 +810,12 @@ struct AgentHistogram
_CCCL_DEVICE _CCCL_FORCEINLINE AgentHistogram(
TempStorage& temp_storage,
SampleIteratorT d_samples,
int (&num_output_bins)[NUM_ACTIVE_CHANNELS],
int (&num_privatized_bins)[NUM_ACTIVE_CHANNELS],
CounterT* (&d_output_histograms)[NUM_ACTIVE_CHANNELS],
CounterT* (&d_privatized_histograms)[NUM_ACTIVE_CHANNELS],
OutputDecodeOpT (&output_decode_op)[NUM_ACTIVE_CHANNELS],
PrivatizedDecodeOpT (&privatized_decode_op)[NUM_ACTIVE_CHANNELS])
int* num_output_bins,
int* num_privatized_bins,
CounterT** d_output_histograms,
CounterT** d_privatized_histograms,
OutputDecodeOpT* output_decode_op,
PrivatizedDecodeOpT* privatized_decode_op)
: temp_storage(temp_storage.Alias())
, d_wrapped_samples(d_samples)
, d_native_samples(NativePointer(d_wrapped_samples))
Expand Down
12 changes: 6 additions & 6 deletions cub/cub/device/dispatch/dispatch_histogram.cuh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,12 +238,12 @@ __launch_bounds__(int(ChainedPolicyT::ActivePolicy::AgentHistogramPolicyT::BLOCK
AgentHistogramT agent(
temp_storage,
d_samples,
num_output_bins_wrapper.__elems_,
num_privatized_bins_wrapper.__elems_,
d_output_histograms_wrapper.__elems_,
d_privatized_histograms_wrapper.__elems_,
output_decode_op_wrapper.__elems_,
privatized_decode_op_wrapper.__elems_);
num_output_bins_wrapper.data(),
num_privatized_bins_wrapper.data(),
d_output_histograms_wrapper.data(),
d_privatized_histograms_wrapper.data(),
output_decode_op_wrapper.data(),
privatized_decode_op_wrapper.data());

// Initialize counters
agent.InitBinCounters();
Expand Down
Loading