Skip to content
Open
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
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
12 changes: 5 additions & 7 deletions cpp/include/cudf/column/column_factories.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@
#include <cudf/utilities/span.hpp>
#include <cudf/utilities/traits.hpp>

#include <rmm/cuda_stream_view.hpp>

#include <cuda/std/utility>
#include <cuda/stream>

Expand Down Expand Up @@ -368,7 +366,7 @@ std::unique_ptr<column> make_fixed_width_column(
*/
std::unique_ptr<column> make_strings_column(
cudf::device_span<cuda::std::pair<char const*, size_type> const> strings,
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());

/**
Expand All @@ -388,7 +386,7 @@ std::unique_ptr<column> make_strings_column(
*/
std::vector<std::unique_ptr<column>> make_strings_column_batch(
std::vector<cudf::device_span<cuda::std::pair<char const*, size_type> const>> const& input,
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());

/**
Expand Down Expand Up @@ -420,7 +418,7 @@ std::vector<std::unique_ptr<column>> make_strings_column_batch(
std::unique_ptr<column> make_strings_column(
cudf::device_span<string_view const> string_views,
string_view const null_placeholder,
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());

/**
Expand Down Expand Up @@ -543,7 +541,7 @@ std::unique_ptr<cudf::column> make_structs_column(
std::vector<std::unique_ptr<column>>&& child_columns,
size_type null_count,
rmm::device_buffer&& null_mask,
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());

/**
Expand Down Expand Up @@ -577,7 +575,7 @@ std::unique_ptr<cudf::column> create_structs_hierarchy(
std::vector<std::unique_ptr<column>>&& child_columns,
size_type null_count,
rmm::device_buffer&& null_mask,
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());

/**
Expand Down
19 changes: 10 additions & 9 deletions cpp/include/cudf/detail/structs/utilities.hpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* SPDX-FileCopyrightText: Copyright (c) 2020-2026, NVIDIA CORPORATION.
* SPDX-FileCopyrightText: Copyright (c) 2020-2026, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
* SPDX-License-Identifier: Apache-2.0
*/
#pragma once
Expand All @@ -11,9 +11,10 @@
#include <cudf/utilities/memory_resource.hpp>
#include <cudf/utilities/span.hpp>

#include <rmm/cuda_stream_view.hpp>
#include <rmm/device_buffer.hpp>

#include <cuda/stream>

namespace CUDF_EXPORT cudf {
namespace structs::detail {

Expand Down Expand Up @@ -71,7 +72,7 @@ struct temporary_nullable_data {
* @return New column with concatenated results.
*/
std::vector<std::vector<column_view>> extract_ordered_struct_children(
host_span<column_view const> struct_cols, rmm::cuda_stream_view stream);
host_span<column_view const> struct_cols, cuda::stream_ref stream);

/**
* @brief Check whether the specified column is of type LIST, or any LISTs in its descendent
Expand Down Expand Up @@ -166,7 +167,7 @@ class flattened_table {
std::vector<cudf::order> const& column_order,
std::vector<cudf::null_order> const& null_precedence,
cudf::structs::detail::column_nullability nullability,
rmm::cuda_stream_view stream,
cuda::stream_ref stream,
rmm::device_async_resource_ref mr);

/**
Expand All @@ -188,7 +189,7 @@ class flattened_table {
bitmask_type const* null_mask,
cudf::size_type null_count,
std::unique_ptr<cudf::column>&& input,
rmm::cuda_stream_view stream,
cuda::stream_ref stream,
rmm::device_async_resource_ref mr);

/**
Expand All @@ -211,7 +212,7 @@ class flattened_table {
[[nodiscard]] std::vector<std::unique_ptr<column>> superimpose_and_sanitize_nulls(
host_span<bitmask_type const* const> null_masks,
std::vector<std::unique_ptr<column>> inputs,
rmm::cuda_stream_view stream,
cuda::stream_ref stream,
rmm::device_async_resource_ref mr);

/**
Expand All @@ -232,7 +233,7 @@ class flattened_table {
*/
[[nodiscard]] std::vector<std::unique_ptr<column>> enforce_null_consistency(
std::vector<std::unique_ptr<column>> columns,
rmm::cuda_stream_view stream,
cuda::stream_ref stream,
rmm::device_async_resource_ref mr);

/**
Expand All @@ -258,7 +259,7 @@ class flattened_table {
* to be kept alive.
*/
[[nodiscard]] std::pair<column_view, temporary_nullable_data> push_down_nulls(
column_view const& input, rmm::cuda_stream_view stream, rmm::device_async_resource_ref mr);
column_view const& input, cuda::stream_ref stream, rmm::device_async_resource_ref mr);

/**
* @brief Push down nulls from columns of the input table into their children columns, using
Expand All @@ -285,7 +286,7 @@ class flattened_table {
* to be kept alive.
*/
[[nodiscard]] std::pair<table_view, temporary_nullable_data> push_down_nulls(
table_view const& input, rmm::cuda_stream_view stream, rmm::device_async_resource_ref mr);
table_view const& input, cuda::stream_ref stream, rmm::device_async_resource_ref mr);

/**
* @brief Checks if a column or any of its children is a struct column with structs that are null.
Expand Down
2 changes: 1 addition & 1 deletion cpp/include/cudf/io/avro.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ class avro_reader_options_builder {
*/
table_with_metadata read_avro(
avro_reader_options const& options,
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());

/** @} */ // end of group
Expand Down
4 changes: 2 additions & 2 deletions cpp/include/cudf/io/csv.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -1349,7 +1349,7 @@ class csv_reader_options_builder {
*/
table_with_metadata read_csv(
csv_reader_options options,
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());

/** @} */ // end of group
Expand Down Expand Up @@ -1753,7 +1753,7 @@ class csv_writer_options_builder {
* @param stream CUDA stream used for device memory operations and kernel launches
*/
void write_csv(csv_writer_options const& options,
rmm::cuda_stream_view stream = cudf::get_default_stream());
cuda::stream_ref stream = cudf::get_default_stream());

/// @cond
struct is_supported_csv_write_type_fn {
Expand Down
6 changes: 3 additions & 3 deletions cpp/include/cudf/io/data_sink.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#include <cudf/types.hpp>
#include <cudf/utilities/error.hpp>

#include <rmm/cuda_stream_view.hpp>
#include <cuda/stream>

#include <algorithm>
#include <future>
Expand Down Expand Up @@ -153,7 +153,7 @@ class data_sink {
* @param size Number of bytes to write
* @param stream CUDA stream to use
*/
virtual void device_write(void const* gpu_data, size_t size, rmm::cuda_stream_view stream)
virtual void device_write(void const* gpu_data, size_t size, cuda::stream_ref stream)
{
CUDF_FAIL("data_sink classes that support device_write must override it.");
}
Expand Down Expand Up @@ -182,7 +182,7 @@ class data_sink {
*/
virtual std::future<void> device_write_async(void const* gpu_data,
size_t size,
rmm::cuda_stream_view stream)
cuda::stream_ref stream)
{
CUDF_FAIL("data_sink classes that support device_write_async must override it.");
}
Expand Down
8 changes: 4 additions & 4 deletions cpp/include/cudf/io/datasource.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#include <cudf/utilities/export.hpp>
#include <cudf/utilities/span.hpp>

#include <rmm/cuda_stream_view.hpp>
#include <cuda/stream>

#include <future>
#include <memory>
Expand Down Expand Up @@ -254,7 +254,7 @@ class datasource {
*/
virtual std::unique_ptr<datasource::buffer> device_read(size_t offset,
size_t size,
rmm::cuda_stream_view stream)
cuda::stream_ref stream)
{
CUDF_FAIL("datasource classes that support device_read must override it.");
}
Expand All @@ -276,7 +276,7 @@ class datasource {
*
* @return The number of bytes read (can be smaller than size)
*/
virtual size_t device_read(size_t offset, size_t size, uint8_t* dst, rmm::cuda_stream_view stream)
virtual size_t device_read(size_t offset, size_t size, uint8_t* dst, cuda::stream_ref stream)
{
CUDF_FAIL("datasource classes that support device_read must override it.");
}
Expand Down Expand Up @@ -307,7 +307,7 @@ class datasource {
virtual std::future<size_t> device_read_async(size_t offset,
size_t size,
uint8_t* dst,
rmm::cuda_stream_view stream)
cuda::stream_ref stream)
{
CUDF_FAIL("datasource classes that support device_read_async must override it.");
}
Expand Down
6 changes: 3 additions & 3 deletions cpp/include/cudf/io/detail/avro.hpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* SPDX-FileCopyrightText: Copyright (c) 2020-2026, NVIDIA CORPORATION.
* SPDX-FileCopyrightText: Copyright (c) 2020-2026, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
* SPDX-License-Identifier: Apache-2.0
*/

Expand All @@ -9,7 +9,7 @@
#include <cudf/utilities/default_stream.hpp>
#include <cudf/utilities/memory_resource.hpp>

#include <rmm/cuda_stream_view.hpp>
#include <cuda/stream>

namespace cudf {
namespace io::detail::avro {
Expand All @@ -26,7 +26,7 @@ namespace io::detail::avro {
*/
table_with_metadata read_avro(std::unique_ptr<cudf::io::datasource>&& source,
avro_reader_options const& options,
rmm::cuda_stream_view stream,
cuda::stream_ref stream,
rmm::device_async_resource_ref mr);

} // namespace io::detail::avro
Expand Down
8 changes: 4 additions & 4 deletions cpp/include/cudf/io/detail/codec.hpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* SPDX-FileCopyrightText: Copyright (c) 2025, NVIDIA CORPORATION.
* SPDX-FileCopyrightText: Copyright (c) 2025-2026, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
* SPDX-License-Identifier: Apache-2.0
*/

Expand All @@ -13,7 +13,7 @@
#include <cudf/io/types.hpp>
#include <cudf/utilities/span.hpp>

#include <rmm/cuda_stream_view.hpp>
#include <cuda/stream>

#include <cstdint>
#include <vector>
Expand Down Expand Up @@ -114,7 +114,7 @@ void compress(compression_type compression,
device_span<device_span<uint8_t const> const> inputs,
device_span<device_span<uint8_t> const> outputs,
device_span<codec_exec_result> results,
rmm::cuda_stream_view stream);
cuda::stream_ref stream);

/**
* @brief Decompresses a host memory buffer.
Expand Down Expand Up @@ -155,7 +155,7 @@ void decompress(compression_type compression,
device_span<codec_exec_result> results,
size_t max_uncomp_chunk_size,
size_t max_total_uncomp_size,
rmm::cuda_stream_view stream);
cuda::stream_ref stream);

/** @} */ // end of group
} // namespace io::detail
Expand Down
8 changes: 4 additions & 4 deletions cpp/include/cudf/io/detail/csv.hpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* SPDX-FileCopyrightText: Copyright (c) 2020-2026, NVIDIA CORPORATION.
* SPDX-FileCopyrightText: Copyright (c) 2020-2026, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
* SPDX-License-Identifier: Apache-2.0
*/

Expand All @@ -8,7 +8,7 @@
#include <cudf/io/csv.hpp>
#include <cudf/utilities/memory_resource.hpp>

#include <rmm/cuda_stream_view.hpp>
#include <cuda/stream>

namespace cudf {
namespace io::detail::csv {
Expand All @@ -25,7 +25,7 @@ namespace io::detail::csv {
*/
table_with_metadata read_csv(std::unique_ptr<cudf::io::datasource>&& source,
csv_reader_options const& options,
rmm::cuda_stream_view stream,
cuda::stream_ref stream,
rmm::device_async_resource_ref mr);

/**
Expand All @@ -41,7 +41,7 @@ void write_csv(data_sink* sink,
table_view const& table,
host_span<std::string const> column_names,
csv_writer_options const& options,
rmm::cuda_stream_view stream);
cuda::stream_ref stream);

} // namespace io::detail::csv
} // namespace cudf
14 changes: 7 additions & 7 deletions cpp/include/cudf/io/detail/json.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#include <cudf/utilities/export.hpp>
#include <cudf/utilities/memory_resource.hpp>

#include <rmm/cuda_stream_view.hpp>
#include <cuda/stream>

namespace CUDF_EXPORT cudf {
namespace io::json::detail {
Expand All @@ -27,7 +27,7 @@ namespace io::json::detail {
*/
table_with_metadata read_json(host_span<std::unique_ptr<datasource>> sources,
json_reader_options const& options,
rmm::cuda_stream_view stream,
cuda::stream_ref stream,
rmm::device_async_resource_ref mr);

/**
Expand All @@ -42,7 +42,7 @@ table_with_metadata read_json(host_span<std::unique_ptr<datasource>> sources,
*/
json_reader_result read_json_with_diagnostics(host_span<std::unique_ptr<datasource>> sources,
json_reader_options const& options,
rmm::cuda_stream_view stream,
cuda::stream_ref stream,
rmm::device_async_resource_ref mr);

/**
Expand All @@ -58,7 +58,7 @@ json_reader_result read_json_with_diagnostics(host_span<std::unique_ptr<datasour
json_reader_result_with_row_diagnostics read_json_with_row_diagnostics(
host_span<std::unique_ptr<datasource>> sources,
json_reader_options const& options,
rmm::cuda_stream_view stream,
cuda::stream_ref stream,
rmm::device_async_resource_ref mr);

/**
Expand All @@ -72,7 +72,7 @@ json_reader_result_with_row_diagnostics read_json_with_row_diagnostics(
void write_json(data_sink* sink,
table_view const& table,
json_writer_options const& options,
rmm::cuda_stream_view stream);
cuda::stream_ref stream);

/**
* @brief Normalize single quotes to double quotes using FST
Expand All @@ -84,7 +84,7 @@ void write_json(data_sink* sink,
*/
void normalize_single_quotes(datasource::owning_buffer<rmm::device_buffer>& indata,
char delimiter,
rmm::cuda_stream_view stream,
cuda::stream_ref stream,
rmm::device_async_resource_ref mr);

/**
Expand All @@ -104,7 +104,7 @@ std::
normalize_whitespace(device_span<char const> d_input,
device_span<size_type const> col_offsets,
device_span<size_type const> col_lengths,
rmm::cuda_stream_view stream,
cuda::stream_ref stream,
rmm::device_async_resource_ref mr);

} // namespace io::json::detail
Expand Down
Loading
Loading