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.

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

Fix build warnings of chars and make_strings_column #1725

Merged
merged 1 commit into from
Jan 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/main/cpp/benchmarks/common/generate_input.cu
Original file line number Diff line number Diff line change
Expand Up @@ -520,7 +520,7 @@ std::unique_ptr<cudf::column> create_random_utf8_string_column(data_profile cons
return cudf::make_strings_column(
num_rows,
std::move(offsets),
std::move(chars),
std::move(chars->release().data.release()[0]),
profile.get_null_frequency().has_value() ? std::move(result_bitmask) : rmm::device_buffer{},
null_count);
}
Expand Down
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),
std::move(chars->release().data.release()[0]),
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),
std::move(chars->release().data.release()[0]),
floats.null_count(),
cudf::detail::copy_bitmask(floats, stream, mr));
}
Expand Down
6 changes: 3 additions & 3 deletions src/main/cpp/src/cast_string.cu
Original file line number Diff line number Diff line change
Expand Up @@ -624,7 +624,7 @@ void validate_ansi_column(column_view const& col,
dest.resize(string_bounds[1] - string_bounds[0]);

cudaMemcpyAsync(dest.data(),
&source_col.chars().data<char const>()[string_bounds[0]],
&source_col.chars_begin(stream)[string_bounds[0]],
string_bounds[1] - string_bounds[0],
cudaMemcpyDeviceToHost,
stream.value());
Expand Down Expand Up @@ -667,7 +667,7 @@ struct string_to_integer_impl {
detail::string_to_integer_kernel<<<blocks, threads, 0, stream.value()>>>(
data.data(),
null_mask.data(),
string_col.chars().data<char const>(),
string_col.chars_begin(stream),
string_col.offsets().data<size_type>(),
string_col.null_mask(),
string_col.size(),
Expand Down Expand Up @@ -736,7 +736,7 @@ struct string_to_decimal_impl {
detail::string_to_decimal_kernel<<<blocks, threads, 0, stream.value()>>>(
data.data(),
null_mask.data(),
string_col.chars().data<char const>(),
string_col.chars_begin(stream),
string_col.offsets().data<size_type>(),
string_col.null_mask(),
string_col.size(),
Expand Down
2 changes: 1 addition & 1 deletion src/main/cpp/src/format_float.cu
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ struct dispatch_format_float_fn {

return cudf::make_strings_column(strings_count,
std::move(offsets),
std::move(chars),
std::move(chars->release().data.release()[0]),
floats.null_count(),
cudf::detail::copy_bitmask(floats, stream, mr));
}
Expand Down
7 changes: 5 additions & 2 deletions src/main/cpp/src/map_utils.cu
Original file line number Diff line number Diff line change
Expand Up @@ -575,8 +575,11 @@ std::unique_ptr<cudf::column> extract_keys_or_values(

auto children = 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), 0, rmm::device_buffer{});
return cudf::make_strings_column(num_extract,
std::move(children.first),
std::move(children.second->release().data.release()[0]),
0,
rmm::device_buffer{});
}

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