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

Change strings_column_view::char_size to return int64 #15197

Merged
merged 2 commits into from
Mar 5, 2024
Merged

Change strings_column_view::char_size to return int64 #15197

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ca48a52
Change strings_column_view::char_size to return int64
davidwendt Feb 29, 2024
db8c7c9
Merge branch 'branch-24.04' into chars-size-int64
davidwendt Feb 29, 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
4 changes: 3 additions & 1 deletion cpp/benchmarks/string/case.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,9 @@ void bench_case(nvbench::state& state)
cudf::type_id::INT8, distribution_id::UNIFORM, 32, 126); // nice ASCII range
auto input = cudf::strings_column_view(col_view);
auto ascii_column = create_random_column(
cudf::type_id::INT8, row_count{input.chars_size(cudf::get_default_stream())}, ascii_profile);
cudf::type_id::INT8,
row_count{static_cast<cudf::size_type>(input.chars_size(cudf::get_default_stream()))},
ascii_profile);
auto ascii_data = ascii_column->view();

col_view = cudf::column_view(col_view.type(),
Expand Down
2 changes: 1 addition & 1 deletion cpp/include/cudf/strings/strings_column_view.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ class strings_column_view : private column_view {
* @param stream CUDA stream used for device memory operations and kernel launches
* @return Number of bytes in the chars child column
*/
[[nodiscard]] size_type chars_size(rmm::cuda_stream_view stream) const noexcept;
[[nodiscard]] int64_t chars_size(rmm::cuda_stream_view stream) const noexcept;

/**
* @brief Return an iterator for the chars child column.
Expand Down
8 changes: 4 additions & 4 deletions cpp/src/strings/strings_column_view.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

#include <cudf/detail/get_value.cuh>
#include <cudf/strings/detail/utilities.hpp>
#include <cudf/strings/strings_column_view.hpp>
#include <cudf/utilities/error.hpp>

Expand Down Expand Up @@ -45,10 +45,10 @@ strings_column_view::offset_iterator strings_column_view::offsets_end() const
return offsets_begin() + size() + 1;
}

size_type strings_column_view::chars_size(rmm::cuda_stream_view stream) const noexcept
int64_t strings_column_view::chars_size(rmm::cuda_stream_view stream) const noexcept
{
if (size() == 0) return 0;
return detail::get_value<size_type>(offsets(), offsets().size() - 1, stream);
if (size() == 0) { return 0L; }
return cudf::strings::detail::get_offset_value(offsets(), offsets().size() - 1, stream);
}

strings_column_view::chars_iterator strings_column_view::chars_begin(rmm::cuda_stream_view) const
Expand Down
Loading