Skip to content

Fix const qualifier when using host_span<bitmask_type const*> #11220

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

Merged
rapids-bot merged 3 commits into from
Jul 8, 2022
Merged

Fix const qualifier when using host_span<bitmask_type const*> #11220

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0a6b858
Fix span data type
ttnghia Jul 7, 2022
7ca5594
Merge branch 'branch-22.08' into fix_span_data_type
ttnghia Jul 7, 2022
be15428
Fix space
ttnghia Jul 7, 2022
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 cpp/include/cudf/detail/null_mask.cuh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ namespace detail {
template <int block_size, typename Binop>
__global__ void offset_bitmask_binop(Binop op,
device_span<bitmask_type> destination,
device_span<bitmask_type const*> source,
device_span<bitmask_type const* const> source,
device_span<size_type const> source_begin_bits,
size_type source_size_bits,
size_type* count_ptr)
Expand Down Expand Up @@ -107,15 +107,15 @@ __global__ void offset_bitmask_binop(Binop op,
}

/**
* @copydoc bitmask_binop(Binop op, host_span<bitmask_type const *> const, host_span<size_type>
* @copydoc bitmask_binop(Binop op, host_span<bitmask_type const* const>, host_span<size_type>
* const, size_type, rmm::mr::device_memory_resource *)
*
* @param stream CUDA stream used for device memory operations and kernel launches
*/
template <typename Binop>
std::pair<rmm::device_buffer, size_type> bitmask_binop(
Binop op,
host_span<bitmask_type const*> masks,
host_span<bitmask_type const* const> masks,
host_span<size_type const> masks_begin_bits,
size_type mask_size_bits,
rmm::cuda_stream_view stream,
Expand Down Expand Up @@ -150,7 +150,7 @@ std::pair<rmm::device_buffer, size_type> bitmask_binop(
template <typename Binop>
size_type inplace_bitmask_binop(Binop op,
device_span<bitmask_type> dest_mask,
host_span<bitmask_type const*> masks,
host_span<bitmask_type const* const> masks,
host_span<size_type const> masks_begin_bits,
size_type mask_size_bits,
rmm::cuda_stream_view stream)
Expand Down
6 changes: 3 additions & 3 deletions cpp/include/cudf/detail/null_mask.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,13 +227,13 @@ rmm::device_buffer copy_bitmask(
rmm::mr::device_memory_resource* mr = rmm::mr::get_current_device_resource());

/**
* @copydoc bitmask_and(host_span<bitmask_type const *> const, host_span<size_type> const,
* @copydoc bitmask_and(host_span<bitmask_type const* const>, host_span<size_type> const,
* size_type, rmm::mr::device_memory_resource *)
*
* @param stream CUDA stream used for device memory operations and kernel launches
*/
std::pair<rmm::device_buffer, size_type> bitmask_and(
host_span<bitmask_type const*> masks,
host_span<bitmask_type const* const> masks,
host_span<size_type const> masks_begin_bits,
size_type mask_size_bits,
rmm::cuda_stream_view stream,
Expand Down Expand Up @@ -271,7 +271,7 @@ std::pair<rmm::device_buffer, size_type> bitmask_or(
* @return Count of set bits
*/
cudf::size_type inplace_bitmask_and(device_span<bitmask_type> dest_mask,
host_span<bitmask_type const*> masks,
host_span<bitmask_type const* const> masks,
host_span<size_type const> masks_begin_bits,
size_type mask_size_bits,
rmm::cuda_stream_view stream);
Expand Down
4 changes: 2 additions & 2 deletions cpp/src/bitmask/null_mask.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -406,7 +406,7 @@ std::vector<size_type> segmented_null_count(const bitmask_type* bitmask,

// Inplace Bitwise AND of the masks
cudf::size_type inplace_bitmask_and(device_span<bitmask_type> dest_mask,
host_span<bitmask_type const*> masks,
host_span<bitmask_type const* const> masks,
host_span<size_type const> begin_bits,
size_type mask_size,
rmm::cuda_stream_view stream)
Expand All @@ -421,7 +421,7 @@ cudf::size_type inplace_bitmask_and(device_span<bitmask_type> dest_mask,
}

// Bitwise AND of the masks
std::pair<rmm::device_buffer, size_type> bitmask_and(host_span<bitmask_type const*> masks,
std::pair<rmm::device_buffer, size_type> bitmask_and(host_span<bitmask_type const* const> masks,
host_span<size_type const> begin_bits,
size_type mask_size,
rmm::cuda_stream_view stream,
Expand Down