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

Use get_offset_value utility in strings shift function #14743

Merged
merged 7 commits into from
Jan 23, 2024
Merged

Use get_offset_value utility in strings shift function #14743

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9ef98b7
Use get_offset_value utility in strings shift function
davidwendt Jan 11, 2024
ce876c9
Merge branch 'branch-24.02' into shift-offsetalator
davidwendt Jan 11, 2024
6e929c9
Merge branch 'branch-24.02' into shift-offsetalator
davidwendt Jan 11, 2024
34ed767
Merge branch 'branch-24.02' into shift-offsetalator
davidwendt Jan 16, 2024
228ea3f
Merge branch 'branch-24.02' into shift-offsetalator
davidwendt Jan 18, 2024
4424e26
fix merge conflict
davidwendt Jan 19, 2024
4c4228f
Merge branch 'branch-24.04' into shift-offsetalator
davidwendt Jan 22, 2024
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
10 changes: 5 additions & 5 deletions cpp/src/strings/copying/shift.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,9 @@ struct output_sizes_fn {
struct shift_chars_fn {
column_device_view const d_column; // input strings column
string_view const d_filler;
size_type const offset;
int64_t const offset;

__device__ char operator()(size_type idx)
__device__ char operator()(int64_t idx)
{
if (offset < 0) {
auto const last_index = -offset;
Expand Down Expand Up @@ -110,7 +110,7 @@ std::unique_ptr<column> shift(strings_column_view const& input,
// compute the shift-offset for the output characters child column
auto const shift_offset = [&] {
auto const index = (offset < 0) ? input.size() + offset : offset;
return (offset < 0 ? -1 : 1) * cudf::detail::get_value<size_type>(offsets_view, index, stream);
return (offset < 0 ? -1 : 1) * get_offset_value(offsets_view, index, stream);
}();

// create output chars child column
Expand All @@ -119,8 +119,8 @@ std::unique_ptr<column> shift(strings_column_view const& input,

// run kernel to shift all the characters
thrust::transform(rmm::exec_policy(stream),
thrust::counting_iterator<size_type>(0),
thrust::counting_iterator<size_type>(total_bytes),
thrust::counting_iterator<int64_t>(0),
thrust::counting_iterator<int64_t>(total_bytes),
d_chars,
shift_chars_fn{*d_input, d_fill_str, shift_offset});

Expand Down