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

Return count of set bits from inplace_bitmask_and. #9904

Merged
merged 10 commits into from
Jan 12, 2022
Merged

Return count of set bits from inplace_bitmask_and. #9904

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
7fa509d
Return null count from inplace_bitmask_and.
bdice Dec 14, 2021
1c51dd8
Use cudf::size_type.
bdice Dec 15, 2021
6afdc02
Remove type from return docstring for consistency.
bdice Dec 15, 2021
5e097fc
Merge remote-tracking branch 'upstream/branch-22.02' into feature/inp…
bdice Dec 20, 2021
70fac4d
Merge remote-tracking branch 'upstream/branch-22.02' into feature/inp…
bdice Dec 23, 2021
89b2acf
Merge remote-tracking branch 'upstream/branch-22.02' into feature/inp…
bdice Jan 6, 2022
d4bbe12
Merge remote-tracking branch 'upstream/branch-22.02' into feature/inp…
bdice Jan 11, 2022
3584dc9
Merge branch 'branch-22.02' into feature/inplace-bitmask-and-null-count
bdice Jan 12, 2022
33525d9
Fix failing test (test_parquet_reader_struct_sol_table) caused by sup…
bdice Jan 12, 2022
d1b90f9
Use valid count returned by inplace_bitmask_and to compute and assign…
bdice Jan 12, 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
4 changes: 2 additions & 2 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 @@ -268,9 +268,9 @@ std::pair<rmm::device_buffer, size_type> bitmask_or(
* @param mask_size_bits The number of bits to be ANDed in each mask
* @param stream CUDA stream used for device memory operations and kernel launches
* @param mr Device memory resource used to allocate the returned device_buffer
* @return rmm::device_buffer Output bitmask
* @return Count of set bits
*/
void inplace_bitmask_and(
cudf::size_type inplace_bitmask_and(
device_span<bitmask_type> dest_mask,
host_span<bitmask_type const*> masks,
host_span<size_type const> masks_begin_bits,
Expand Down
14 changes: 7 additions & 7 deletions cpp/src/bitmask/null_mask.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,14 +404,14 @@ std::vector<size_type> segmented_null_count(const bitmask_type* bitmask,
}

// Inplace Bitwise AND of the masks
void inplace_bitmask_and(device_span<bitmask_type> dest_mask,
host_span<bitmask_type const*> masks,
host_span<size_type const> begin_bits,
size_type mask_size,
rmm::cuda_stream_view stream,
rmm::mr::device_memory_resource* mr)
cudf::size_type inplace_bitmask_and(device_span<bitmask_type> dest_mask,
host_span<bitmask_type const*> masks,
host_span<size_type const> begin_bits,
size_type mask_size,
rmm::cuda_stream_view stream,
rmm::mr::device_memory_resource* mr)
{
inplace_bitmask_binop(
return inplace_bitmask_binop(
[] __device__(bitmask_type left, bitmask_type right) { return left & right; },
dest_mask,
masks,
Expand Down
2 changes: 1 addition & 1 deletion cpp/src/structs/utilities.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,7 @@ void superimpose_parent_nulls(bitmask_type const* parent_null_mask,
reinterpret_cast<bitmask_type const*>(parent_null_mask),
reinterpret_cast<bitmask_type const*>(current_child_mask)};
std::vector<size_type> begin_bits{0, 0};
cudf::detail::inplace_bitmask_and(
[[maybe_unused]] auto const null_count = cudf::detail::inplace_bitmask_and(
bdice marked this conversation as resolved.
Show resolved Hide resolved
device_span<bitmask_type>(current_child_mask, num_bitmask_words(child.size())),
masks,
begin_bits,
Expand Down