Skip to content

Fix remaining native stream_ref call sites #5067

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

Merged
mythrocks merged 4 commits into from
Sep 2, 2026
Merged

Fix remaining native stream_ref call sites #5067

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
ac1a69c
Fix remaining stream_ref native call sites
vyasr Sep 1, 2026
3530e0e
Update cudf submodule for stream_ref helpers
vyasr Sep 2, 2026
9c4e4a8
Merge remote-tracking branch 'origin/main' into codex/rebase-spark-st…
vyasr Sep 2, 2026
d4af8d2
Update cudf submodule to latest main
vyasr Sep 2, 2026
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
22 changes: 11 additions & 11 deletions src/main/cpp/benchmarks/from_json.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,7 @@ void BM_from_json_to_raw_map(nvbench::state& state)

auto const json_strings = generate_input(size_bytes, make_all_string_column_types(num_keys));

state.set_cuda_stream(nvbench::make_cuda_stream_view(cudf::get_default_stream().value()));
state.set_cuda_stream(nvbench::make_cuda_stream_view(cudf::get_default_stream().get()));
state.add_global_memory_reads<nvbench::int8_t>(input_char_bytes(json_strings->view()));
state.exec(nvbench::exec_tag::sync, [&](nvbench::launch&) {
[[maybe_unused]] auto const output = spark_rapids_jni::from_json_to_raw_map(
Expand All @@ -379,7 +379,7 @@ void BM_from_json_to_raw_map_value_width(nvbench::state& state)
auto const json_strings = generate_input(
size_bytes, make_all_string_column_types(num_keys), {.value_width = value_width});

state.set_cuda_stream(nvbench::make_cuda_stream_view(cudf::get_default_stream().value()));
state.set_cuda_stream(nvbench::make_cuda_stream_view(cudf::get_default_stream().get()));
state.add_global_memory_reads<nvbench::int8_t>(input_char_bytes(json_strings->view()));
state.exec(nvbench::exec_tag::sync, [&](nvbench::launch&) {
[[maybe_unused]] auto const output = spark_rapids_jni::from_json_to_raw_map(
Expand All @@ -397,7 +397,7 @@ void BM_from_json_to_raw_map_null_density(nvbench::state& state)
auto const json_strings =
generate_input(size_bytes, make_all_string_column_types(num_keys), {.null_pct = null_pct});

state.set_cuda_stream(nvbench::make_cuda_stream_view(cudf::get_default_stream().value()));
state.set_cuda_stream(nvbench::make_cuda_stream_view(cudf::get_default_stream().get()));
state.add_global_memory_reads<nvbench::int8_t>(input_char_bytes(json_strings->view()));
state.exec(nvbench::exec_tag::sync, [&](nvbench::launch&) {
[[maybe_unused]] auto const output = spark_rapids_jni::from_json_to_raw_map(
Expand All @@ -413,7 +413,7 @@ void BM_from_json_to_raw_map_micro_size(nvbench::state& state)

auto const json_strings = generate_input(size_bytes, make_all_string_column_types(num_keys));

state.set_cuda_stream(nvbench::make_cuda_stream_view(cudf::get_default_stream().value()));
state.set_cuda_stream(nvbench::make_cuda_stream_view(cudf::get_default_stream().get()));
state.add_global_memory_reads<nvbench::int8_t>(input_char_bytes(json_strings->view()));
state.exec(nvbench::exec_tag::sync, [&](nvbench::launch&) {
[[maybe_unused]] auto const output = spark_rapids_jni::from_json_to_raw_map(
Expand All @@ -438,7 +438,7 @@ void BM_from_json_to_raw_map_row_shape(nvbench::state& state)
auto const json_strings =
generate_input(/*size_bytes=*/0, make_all_string_column_types(num_keys), options);

state.set_cuda_stream(nvbench::make_cuda_stream_view(cudf::get_default_stream().value()));
state.set_cuda_stream(nvbench::make_cuda_stream_view(cudf::get_default_stream().get()));
state.add_global_memory_reads<nvbench::int8_t>(input_char_bytes(json_strings->view()));
state.exec(nvbench::exec_tag::sync, [&](nvbench::launch&) {
[[maybe_unused]] auto const output = spark_rapids_jni::from_json_to_raw_map(
Expand All @@ -456,7 +456,7 @@ void BM_from_json_to_raw_map_key_name_len(nvbench::state& state)
auto const json_strings = generate_input(
size_bytes, make_all_string_column_types(num_keys), {.key_name_len = key_name_len});

state.set_cuda_stream(nvbench::make_cuda_stream_view(cudf::get_default_stream().value()));
state.set_cuda_stream(nvbench::make_cuda_stream_view(cudf::get_default_stream().get()));
state.add_global_memory_reads<nvbench::int8_t>(input_char_bytes(json_strings->view()));
state.exec(nvbench::exec_tag::sync, [&](nvbench::launch&) {
[[maybe_unused]] auto const output = spark_rapids_jni::from_json_to_raw_map(
Expand All @@ -476,7 +476,7 @@ void BM_from_json_to_raw_map_array_values(nvbench::state& state)

auto const json_strings = generate_map_of_array_input(num_rows, keys_per_row, array_len);

state.set_cuda_stream(nvbench::make_cuda_stream_view(cudf::get_default_stream().value()));
state.set_cuda_stream(nvbench::make_cuda_stream_view(cudf::get_default_stream().get()));
state.add_global_memory_reads<nvbench::int8_t>(input_char_bytes(json_strings->view()));
state.exec(nvbench::exec_tag::sync, [&](nvbench::launch&) {
[[maybe_unused]] auto const output = spark_rapids_jni::from_json_to_raw_map_array_values(
Expand All @@ -500,7 +500,7 @@ void BM_from_json_to_raw_map_array_values_null_density(nvbench::state& state)
{.element_null_pct = static_cast<double>(state.get_int64("element_null_pct")) / 100.0,
.value_null_pct = static_cast<double>(state.get_int64("value_null_pct")) / 100.0});

state.set_cuda_stream(nvbench::make_cuda_stream_view(cudf::get_default_stream().value()));
state.set_cuda_stream(nvbench::make_cuda_stream_view(cudf::get_default_stream().get()));
state.add_global_memory_reads<nvbench::int8_t>(input_char_bytes(json_strings->view()));
state.exec(nvbench::exec_tag::sync, [&](nvbench::launch&) {
[[maybe_unused]] auto const output = spark_rapids_jni::from_json_to_raw_map_array_values(
Expand All @@ -517,7 +517,7 @@ void BM_from_json_to_raw_map_array_values_keys_per_row(nvbench::state& state)

auto const json_strings = generate_map_of_array_input(num_rows, keys_per_row, array_len);

state.set_cuda_stream(nvbench::make_cuda_stream_view(cudf::get_default_stream().value()));
state.set_cuda_stream(nvbench::make_cuda_stream_view(cudf::get_default_stream().get()));
state.add_global_memory_reads<nvbench::int8_t>(input_char_bytes(json_strings->view()));
state.exec(nvbench::exec_tag::sync, [&](nvbench::launch&) {
[[maybe_unused]] auto const output = spark_rapids_jni::from_json_to_raw_map_array_values(
Expand All @@ -538,7 +538,7 @@ void BM_from_json_to_raw_map_array_values_key_name_len(nvbench::state& state)
array_len,
{.key_name_len = static_cast<int>(state.get_int64("key_name_len"))});

state.set_cuda_stream(nvbench::make_cuda_stream_view(cudf::get_default_stream().value()));
state.set_cuda_stream(nvbench::make_cuda_stream_view(cudf::get_default_stream().get()));
state.add_global_memory_reads<nvbench::int8_t>(input_char_bytes(json_strings->view()));
state.exec(nvbench::exec_tag::sync, [&](nvbench::launch&) {
[[maybe_unused]] auto const output = spark_rapids_jni::from_json_to_raw_map_array_values(
Expand All @@ -562,7 +562,7 @@ void BM_from_json_to_raw_map_array_values_type_mismatch(nvbench::state& state)
array_len,
{.mismatch_pct = static_cast<double>(state.get_int64("mismatch_pct")) / 100.0});

state.set_cuda_stream(nvbench::make_cuda_stream_view(cudf::get_default_stream().value()));
state.set_cuda_stream(nvbench::make_cuda_stream_view(cudf::get_default_stream().get()));
state.add_global_memory_reads<nvbench::int8_t>(input_char_bytes(json_strings->view()));
state.exec(nvbench::exec_tag::sync, [&](nvbench::launch&) {
[[maybe_unused]] auto const output = spark_rapids_jni::from_json_to_raw_map_array_values(
Expand Down
2 changes: 1 addition & 1 deletion src/main/cpp/benchmarks/from_json_to_structs.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ void BM_from_json_to_structs(nvbench::state& state)
auto const scales = nested_schema_scales();
auto const precisions = nested_schema_precisions();

state.set_cuda_stream(nvbench::make_cuda_stream_view(cudf::get_default_stream().value()));
state.set_cuda_stream(nvbench::make_cuda_stream_view(cudf::get_default_stream().get()));
state.exec(nvbench::exec_tag::sync, [&](nvbench::launch&) {
[[maybe_unused]] auto const output =
spark_rapids_jni::from_json_to_structs(cudf::strings_column_view{input->view()},
Expand Down
2 changes: 1 addition & 1 deletion src/main/cpp/benchmarks/get_json_object.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ void BM_get_json_object(nvbench::state& state)
instructions.emplace_back(path_instruction_type::NAMED, "0", -1);
}

state.set_cuda_stream(nvbench::make_cuda_stream_view(cudf::get_default_stream().value()));
state.set_cuda_stream(nvbench::make_cuda_stream_view(cudf::get_default_stream().get()));
state.exec(nvbench::exec_tag::sync, [&](nvbench::launch& launch) {
// Can also verify at https://jsonpath.com/.
[[maybe_unused]] auto const output = spark_rapids_jni::get_json_object(
Expand Down
4 changes: 2 additions & 2 deletions src/main/cpp/src/like.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ struct invalid_like_pattern_fn {
void validate_patterns(cudf::strings_column_view const& input,
cudf::strings_column_view const& patterns,
cudf::string_scalar const& escape_character,
rmm::cuda_stream_view stream)
cuda::stream_ref stream)
{
if (input.is_empty()) { return; }

Expand Down Expand Up @@ -91,7 +91,7 @@ void validate_patterns(cudf::strings_column_view const& input,
std::unique_ptr<cudf::column> like(cudf::strings_column_view const& input,
cudf::strings_column_view const& patterns,
cudf::string_scalar const& escape_character,
rmm::cuda_stream_view stream,
cuda::stream_ref stream,
rmm::device_async_resource_ref mr)
{
SRJ_FUNC_RANGE();
Expand Down
4 changes: 3 additions & 1 deletion src/main/cpp/src/like.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@
#include <cudf/utilities/default_stream.hpp>
#include <cudf/utilities/memory_resource.hpp>

#include <cuda/stream>

#include <memory>

namespace spark_rapids_jni {
Expand All @@ -35,7 +37,7 @@ std::unique_ptr<cudf::column> like(
cudf::strings_column_view const& input,
cudf::strings_column_view const& patterns,
cudf::string_scalar const& escape_character,
rmm::cuda_stream_view stream = cudf::get_default_stream(),
cuda::stream_ref stream = cudf::get_default_stream(),
rmm::device_async_resource_ref mr = cudf::get_current_device_resource_ref());

} // namespace spark_rapids_jni
2 changes: 1 addition & 1 deletion thirdparty/cudf
Open in desktop
Submodule cudf updated 13 files
+3 −0 ci/narwhals_cudf_polars_test_plugin.py
+1 −1 cpp/benchmarks/dictionary/concatenate.cpp
+5 −0 cpp/src/io/parquet/delta_binary.cuh
+18 −3 cpp/src/io/parquet/page_delta_decode.cu
+1 −0 cpp/src/io/parquet/reader_impl_chunking_utils.cu
+32 −7 cpp/src/io/parquet/reader_impl_chunking_utils.cuh
+19 −5 cpp/src/io/parquet/reader_impl_preprocess.cu
+8 −3 cpp/src/io/parquet/reader_impl_preprocess_utils.cuh
+109 −0 cpp/tests/io/parquet_chunked_reader_test.cu
+5 −0 python/cudf_polars/cudf_polars/containers/dataframe.py
+4 −4 python/cudf_polars/cudf_polars/dsl/tracing.py
+8 −18 python/cudf_polars/cudf_polars/streaming/actor_graph/tracing.py
+11 −0 python/cudf_polars/tests/containers/test_dataframe.py