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

Fix calls to copy_bitmask to pass stream parameter #14158

Merged
merged 4 commits into from
Sep 22, 2023
Merged

Fix calls to copy_bitmask to pass stream parameter #14158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6917d9f
Fix calls to copy_bitmask to pass stream parameter
davidwendt Sep 21, 2023
28f6fd5
add detail:: namespace to copy_bitmask calls
davidwendt Sep 21, 2023
4a5ccd5
Merge branch 'branch-23.10' into copy-bitmask-stream
davidwendt Sep 21, 2023
4755442
Merge branch 'branch-23.10' into copy-bitmask-stream
davidwendt Sep 22, 2023
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
12 changes: 6 additions & 6 deletions cpp/src/lists/count_elements.cu
View file
Open in desktop
bdice marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2021-2022, NVIDIA CORPORATION.
* Copyright (c) 2021-2023, NVIDIA CORPORATION.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -36,12 +36,12 @@ namespace cudf {
namespace lists {
namespace detail {
/**
* @brief Returns a numeric column containing lengths of each element.
* @brief Returns a numeric column containing lengths of each element
*
* @param input Input lists column.
* @param stream CUDA stream used for device memory operations and kernel launches.
* @param input Input lists column
* @param stream CUDA stream used for device memory operations and kernel launches
* @param mr Device memory resource used to allocate the returned column's device memory
* @return New INT32 column with lengths.
* @return New size_type column with lengths
*/
std::unique_ptr<column> count_elements(lists_column_view const& input,
rmm::cuda_stream_view stream,
Expand All @@ -52,7 +52,7 @@ std::unique_ptr<column> count_elements(lists_column_view const& input,
// create output column
auto output = make_fixed_width_column(data_type{type_to_id<size_type>()},
input.size(),
copy_bitmask(input.parent()),
cudf::detail::copy_bitmask(input.parent(), stream, mr),
input.null_count(),
stream,
mr);
Expand Down
4 changes: 3 additions & 1 deletion cpp/src/replace/clamp.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,9 @@ std::enable_if_t<cudf::is_fixed_width<T>(), std::unique_ptr<cudf::column>> clamp
auto output =
detail::allocate_like(input, input.size(), mask_allocation_policy::NEVER, stream, mr);
// mask will not change
if (input.nullable()) { output->set_null_mask(copy_bitmask(input), input.null_count()); }
if (input.nullable()) {
output->set_null_mask(cudf::detail::copy_bitmask(input, stream, mr), input.null_count());
}

auto output_device_view =
cudf::mutable_column_device_view::create(output->mutable_view(), stream);
Expand Down