Skip to content

Commit

Permalink
Update to make_strings_column returning uvector (#1837)
Browse files Browse the repository at this point in the history
* Update to make_strings_column returning uvector

Signed-off-by: Jason Lowe <jlowe@nvidia.com>

* Style fix

---------

Signed-off-by: Jason Lowe <jlowe@nvidia.com>
  • Loading branch information
jlowe authored Mar 5, 2024
1 parent 5fef87b commit 536c696
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 11 deletions.
2 changes: 1 addition & 1 deletion src/main/cpp/src/cast_decimal_to_string.cu
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ struct dispatch_decimal_to_non_ansi_string_fn {

return make_strings_column(input.size(),
std::move(offsets),
std::move(chars->release().data.release()[0]),
chars.release(),
input.null_count(),
cudf::detail::copy_bitmask(input, stream, mr));
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/cpp/src/cast_float_to_string.cu
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ struct dispatch_float_to_string_fn {

return make_strings_column(strings_count,
std::move(offsets),
std::move(chars->release().data.release()[0]),
chars.release(),
floats.null_count(),
cudf::detail::copy_bitmask(floats, stream, mr));
}
Expand Down
4 changes: 2 additions & 2 deletions src/main/cpp/src/format_float.cu
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2023, NVIDIA CORPORATION.
* Copyright (c) 2023-2024, 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 @@ -89,7 +89,7 @@ struct dispatch_format_float_fn {

return cudf::make_strings_column(strings_count,
std::move(offsets),
std::move(chars->release().data.release()[0]),
chars.release(),
floats.null_count(),
cudf::detail::copy_bitmask(floats, stream, mr));
}
Expand Down
9 changes: 3 additions & 6 deletions src/main/cpp/src/map_utils.cu
Original file line number Diff line number Diff line change
Expand Up @@ -572,13 +572,10 @@ std::unique_ptr<cudf::column> extract_keys_or_values(
stream);
auto const num_extract = thrust::distance(extract_ranges.begin(), range_end);

auto children = cudf::strings::detail::make_strings_children(
auto [offsets, chars] = cudf::strings::detail::make_strings_children(
substring_fn{unified_json_buff, extract_ranges}, num_extract, stream, mr);
return cudf::make_strings_column(num_extract,
std::move(children.first),
std::move(children.second->release().data.release()[0]),
0,
rmm::device_buffer{});
return cudf::make_strings_column(
num_extract, std::move(offsets), chars.release(), 0, rmm::device_buffer{});
}

// Compute the offsets for the final lists of Struct<String,String>.
Expand Down

0 comments on commit 536c696

Please sign in to comment.