Migrate stream APIs from rmm::cuda_stream_view to cuda::stream_ref

cpp/include/cudf/detail/utilities/default_stream.hpp

@@ -7,7 +7,7 @@
 
 #include <cudf/utilities/export.hpp>
 
-#include <cuda/stream_ref>
+#include <cuda/stream>
 
 namespace CUDF_EXPORT cudf {
 

cpp/include/cudf/join/streaming_hash_join.hpp

@@ -14,7 +14,7 @@
 
 #include <rmm/device_uvector.hpp>
 
-#include <cuda/stream_ref>
+#include <cuda/stream>
 
 #include <memory>
 #include <optional>

cpp/include/cudf/utilities/default_stream.hpp

@@ -7,7 +7,7 @@
 
 #include <cudf/utilities/export.hpp>
 
-#include <cuda/stream_ref>
+#include <cuda/stream>
 
 /**
  * @file

cpp/libcudf_streaming/src/bloom_filter.cpp

@@ -118,7 +118,7 @@ rapidsmpf::streaming::Actor bloom_filter::apply(
   auto storage = (co_await bloom_filter->receive()).release<rmm::device_buffer>();
   RAPIDSMPF_EXPECTS((co_await bloom_filter->receive()).empty(),
                     "Bloom filter channel contained more than one message");
-  auto stream = cuda::stream_ref{storage.stream().value()};
+  auto stream = storage.stream();
   rapidsmpf::CudaEvent event;
   auto filter = cudf_streaming::detail::device_bloom_filter(filter_size_, seed_, storage.data());
   auto meta   = co_await ch_in->receive_metadata();

cpp/src/io/parquet/reader_impl_dict_transcode.cu

@@ -194,7 +194,7 @@ void remap_dict_indices_by_chunk(cudf::device_span<int32_t> indices,
                                  cudf::device_span<size_type const> row_offsets,
                                  cudf::device_span<size_type const> key_counts_prefix,
                                  cudf::device_span<int32_t const> stacked_to_unique,
-                                 rmm::cuda_stream_view stream)
+                                 cuda::stream_ref stream)
 {
   thrust::for_each(
     rmm::exec_policy_nosync(stream, get_current_device_resource_ref()),

cpp/src/io/parquet/synthetic_column_helpers.hpp

@@ -12,7 +12,7 @@
 #include <cudf/column/column_view.hpp>
 #include <cudf/utilities/memory_resource.hpp>
 
-#include <cuda/stream_ref>
+#include <cuda/stream>
 
 #include <cstddef>
 #include <memory>

cpp/src/join/streaming_hash_join.cu

@@ -32,7 +32,7 @@
 #include <cuda/iterator>
 #include <cuda/std/functional>
 #include <cuda/std/tuple>
-#include <cuda/stream_ref>
+#include <cuda/stream>
 
 #include <algorithm>
 #include <atomic>

cpp/src/utilities/host_memory.cpp

@@ -15,7 +15,7 @@
 #include <rmm/mr/pool_memory_resource.hpp>
 #include <rmm/resource_ref.hpp>
 
-#include <cuda/stream_ref>
+#include <cuda/stream>
 
 #include <algorithm>
 #include <atomic>

cpp/tests/join/streaming_hash_join_tests.cpp

@@ -28,7 +28,7 @@
 #include <rmm/cuda_stream.hpp>
 #include <rmm/mr/statistics_resource_adaptor.hpp>
 
-#include <cuda/stream_ref>
+#include <cuda/stream>
 
 #include <algorithm>
 #include <atomic>

cpp/tests/scalar/scalar_test.cpp

@@ -138,7 +138,7 @@ TEST_F(ScalarTest, AsyncStringConstructionOwnsHostSource)
       auto* ptr = upstream.allocate(stream, bytes, cuda::mr::default_cuda_malloc_alignment);
       if (allocations++ == 1) {
         CUDF_CUDA_TRY(cudaLaunchHostFunc(
-          stream.value(), [](void* data) { static_cast<host_func_gate*>(data)->wait(); }, &gate));
+          stream.get(), [](void* data) { static_cast<host_func_gate*>(data)->wait(); }, &gate));
       }
       return ptr;
     },

java/src/main/native/include/maps_column_view.hpp

@@ -10,7 +10,7 @@
 #include <cudf/utilities/default_stream.hpp>
 #include <cudf/utilities/memory_resource.hpp>
 
-#include <cuda/stream_ref>
+#include <cuda/stream>
 
 namespace cudf {
 

java/src/main/native/src/ColumnViewJni.hpp

@@ -9,7 +9,7 @@
 #include <cudf/lists/lists_column_view.hpp>
 #include <cudf/utilities/default_stream.hpp>
 
-#include <cuda/stream_ref>
+#include <cuda/stream>
 
 namespace cudf::jni {
 

java/src/main/native/src/RmmJni.cpp

@@ -27,7 +27,7 @@
 #include <rmm/resource_ref.hpp>
 
 #include <cuda/memory_resource>
-#include <cuda/stream_ref>
+#include <cuda/stream>
 #include <cuda_runtime_api.h>
 
 #include <sys/mman.h>

java/src/main/native/src/aggregation128_utils.hpp

@@ -9,7 +9,7 @@
 #include <cudf/table/table.hpp>
 #include <cudf/utilities/default_stream.hpp>
 
-#include <cuda/stream_ref>
+#include <cuda/stream>
 
 #include <memory>
 

java/src/main/native/src/check_nvcomp_output_sizes.hpp

@@ -7,7 +7,7 @@
 
 #include <rmm/exec_policy.hpp>
 
-#include <cuda/stream_ref>
+#include <cuda/stream>
 
 namespace cudf {
 namespace java {

python/cudf_streaming/cudf_streaming/partition_utils.pyx

@@ -119,7 +119,7 @@ cpdef size_t partition_and_pack_cost(
     --------
     cudf_streaming.partition_utils.partition_and_pack
     """
-    cdef stream_ref _stream = stream_ref(stream.view().value())
+    cdef stream_ref _stream = stream.view()
     cdef cpp_BufferResource* _br = br.ptr()
     cdef table_view tbl = table.view()
     cdef size_t ret
@@ -177,7 +177,7 @@ cpdef object partition_and_pack(
     pylibcudf.contiguous_split.pack
     cudf_streaming.partition_utils.split_and_pack
     """
-    cdef stream_ref _stream = stream_ref(stream.view().value())
+    cdef stream_ref _stream = stream.view()
     cdef cpp_BufferResource* _br = br.ptr()
     cdef vector[size_type] _columns_to_hash = tuple(columns_to_hash)
     cdef unordered_map[uint32_t, cpp_PackedData] _ret
@@ -244,7 +244,7 @@ cpdef size_t split_and_pack_cost(
     --------
     cudf_streaming.partition_utils.split_and_pack
     """
-    cdef stream_ref _stream = stream_ref(stream.view().value())
+    cdef stream_ref _stream = stream.view()
     cdef cpp_BufferResource* _br = br.ptr()
     cdef table_view tbl = table.view()
     cdef size_t ret
@@ -299,7 +299,7 @@ cpdef object split_and_pack(
     pylibcudf.copying.split
     cudf_streaming.partition_utils.partition_and_pack
     """
-    cdef stream_ref _stream = stream_ref(stream.view().value())
+    cdef stream_ref _stream = stream.view()
     cdef cpp_BufferResource* _br = br.ptr()
     cdef vector[size_type] _splits = tuple(splits)
     cdef unordered_map[uint32_t, cpp_PackedData] _ret
@@ -463,7 +463,7 @@ cpdef object unpack_and_concat(
     cudf_streaming.partition_utils.unpack_and_concat_cost
     cudf_streaming.partition_utils.partition_and_pack
     """
-    cdef stream_ref _stream = stream_ref(stream.view().value())
+    cdef stream_ref _stream = stream.view()
     cdef cpp_BufferResource* _br = br.ptr()
     cdef vector[cpp_PackedData] _partitions = _partitions_py_to_cpp(partitions)
     cdef unique_ptr[cpp_table] _ret
@@ -550,7 +550,7 @@ cpdef object packed_data_from_cudf_packed_columns(
     """
     if packed_columns is None or stream is None or br is None:
         raise TypeError("Arguments must not be None")
-    cdef stream_ref _stream = stream_ref(stream.view().value())
+    cdef stream_ref _stream = stream.view()
     cdef cpp_BufferResource* _br = br.ptr()
     cdef PackedData ret = PackedData.__new__(PackedData)
     with nogil:

python/cudf_streaming/cudf_streaming/table_chunk.pyx

@@ -183,7 +183,7 @@ cdef class TableChunk:
         persists even when the chunk is transferred through Channels.
 
         """
-        cdef stream_ref _stream = stream_ref(stream.view().value())
+        cdef stream_ref _stream = stream.view()
         cdef cpp_table_view view = table.view()
         return TableChunk.from_handle(
             cpp_from_table_view_with_owner(

python/pylibcudf/pylibcudf/binaryop.pyx

@@ -68,7 +68,7 @@ cpdef Column binary_operation(
     """
     cdef unique_ptr[column] result
     cdef Stream _stream = _get_stream(stream)
-    cdef cudaStream_t _cs = _stream.view().value()
+    cdef cudaStream_t _cs = _stream.view().get()
     cdef column_view c_lhs_column
     cdef column_view c_rhs_column
 

python/pylibcudf/pylibcudf/column.pyx

@@ -119,7 +119,7 @@ cdef class _OwnerWithCAI:
             # Cast to Python integers before multiplying to avoid overflow.
             size = int(cv.size()) * int(cpp_size_of(cv.type()))
         elif cv.type().id() == type_id.STRING:
-            size = strings_column_view(cv).chars_size((<Stream>stream).view().value())
+            size = strings_column_view(cv).chars_size((<Stream>stream).view().get())
 
         obj.cai = {
             "shape": (size,),
@@ -474,7 +474,7 @@ cdef class Column:
         cdef unique_ptr[arrow_column] c_result
 
         cdef Stream _stream = _get_stream(stream)
-        cdef cudaStream_t _cs = _stream.view().value()
+        cdef cudaStream_t _cs = _stream.view().get()
         mr = _get_memory_resource(mr)
 
         if hasattr(obj, "__arrow_c_device_array__"):
@@ -855,7 +855,7 @@ cdef class Column:
         cdef const cpp_scalar* c_scalar = slr.get()
         cdef unique_ptr[cpp_column] c_result
         cdef Stream _stream = _get_stream(stream)
-        cdef cudaStream_t _cs = _stream.view().value()
+        cdef cudaStream_t _cs = _stream.view().get()
         mr = _get_memory_resource(mr)
         with nogil:
             c_result = make_column_from_scalar(
@@ -890,7 +890,7 @@ cdef class Column:
         cdef column_view cv = self.view()
         cdef unique_ptr[cpp_scalar] result
         cdef Stream _stream = _get_stream(stream)
-        cdef cudaStream_t _cs = _stream.view().value()
+        cdef cudaStream_t _cs = _stream.view().get()
         mr = _get_memory_resource(mr)
 
         with nogil:
@@ -922,7 +922,7 @@ cdef class Column:
             An all-null column of `size` rows and type matching `like`.
         """
         cdef Stream _stream = _get_stream(stream)
-        cdef cudaStream_t _cs = _stream.view().value()
+        cdef cudaStream_t _cs = _stream.view().get()
         mr = _get_memory_resource(mr)
         cdef Scalar slr = Scalar.empty_like(like, _stream, mr)
         cdef unique_ptr[cpp_column] c_result
@@ -1306,7 +1306,7 @@ cdef class Column:
             and self.child(0).type().id() == type_id.INT64
         )
         cdef Stream _stream = _get_stream(None)
-        cdef cudaStream_t _cs = _stream.view().value()
+        cdef cudaStream_t _cs = _stream.view().get()
         cdef ArrowArray* raw_host_array_ptr = NULL
         c_self = self.view()
         with nogil:
@@ -1436,7 +1436,7 @@ cdef class Column:
         """Create a copy of the column."""
         cdef unique_ptr[cpp_column] c_result
         cdef Stream _stream = _get_stream(stream)
-        cdef cudaStream_t _cs = _stream.view().value()
+        cdef cudaStream_t _cs = _stream.view().get()
 
         mr = _get_memory_resource(mr)
         cdef column_view c_self = self.view()
@@ -1497,7 +1497,7 @@ cdef class Column:
     def _to_host_array(self, object stream: CudaStreamLike):
         cdef ArrowArray* raw_host_array_ptr
         cdef Stream _stream = _get_stream(stream)
-        cdef cudaStream_t _cs = _stream.view().value()
+        cdef cudaStream_t _cs = _stream.view().get()
 
         cdef column_view c_self = self.view()
         with nogil:
@@ -1581,7 +1581,7 @@ cdef class ListsColumnView:
         """
         cdef Stream _stream = _get_stream(stream)
 
-        cdef column_view c_child = self.view().get_sliced_child(_stream.view().value())
+        cdef column_view c_child = self.view().get_sliced_child(_stream.view().get())
         return Column.from_column_view(c_child, self._column.child(1))
 
 
@@ -1621,7 +1621,7 @@ cdef class StructsColumnView:
         """
         cdef Stream _stream = _get_stream(stream)
 
-        cdef cudaStream_t _cs = _stream.view().value()
+        cdef cudaStream_t _cs = _stream.view().get()
         cdef column_view c_child = self.view().get_sliced_child(index, _cs)
         return Column.from_column_view(c_child, self._column.child(index))
 

python/pylibcudf/pylibcudf/column_factories.pyx

@@ -108,7 +108,7 @@ cpdef Column make_numeric_column(
     else:
         raise TypeError("Invalid mask argument")
     cdef Stream _stream = _get_stream(stream)
-    cdef cudaStream_t _cs = _stream.view().value()
+    cdef cudaStream_t _cs = _stream.view().get()
     mr = _get_memory_resource(mr)
 
     with nogil:
@@ -143,7 +143,7 @@ cpdef Column make_fixed_point_column(
     else:
         raise TypeError("Invalid mask argument")
     cdef Stream _stream = _get_stream(stream)
-    cdef cudaStream_t _cs = _stream.view().value()
+    cdef cudaStream_t _cs = _stream.view().get()
     mr = _get_memory_resource(mr)
 
     with nogil:
@@ -179,7 +179,7 @@ cpdef Column make_timestamp_column(
     else:
         raise TypeError("Invalid mask argument")
     cdef Stream _stream = _get_stream(stream)
-    cdef cudaStream_t _cs = _stream.view().value()
+    cdef cudaStream_t _cs = _stream.view().get()
     mr = _get_memory_resource(mr)
 
     with nogil:
@@ -215,7 +215,7 @@ cpdef Column make_duration_column(
     else:
         raise TypeError("Invalid mask argument")
     cdef Stream _stream = _get_stream(stream)
-    cdef cudaStream_t _cs = _stream.view().value()
+    cdef cudaStream_t _cs = _stream.view().get()
     mr = _get_memory_resource(mr)
 
     with nogil:
@@ -251,7 +251,7 @@ cpdef Column make_fixed_width_column(
     else:
         raise TypeError("Invalid mask argument")
     cdef Stream _stream = _get_stream(stream)
-    cdef cudaStream_t _cs = _stream.view().value()
+    cdef cudaStream_t _cs = _stream.view().get()
     mr = _get_memory_resource(mr)
 
     with nogil:

python/pylibcudf/pylibcudf/concatenate.pyx

@@ -52,7 +52,7 @@ cpdef concatenate(
     cdef vector[column_view] c_columns
     cdef vector[table_view] c_tables
     cdef Stream _stream = _get_stream(stream)
-    cdef cudaStream_t _cs = _stream.view().value()
+    cdef cudaStream_t _cs = _stream.view().get()
     mr = _get_memory_resource(mr)
 
     cdef unique_ptr[column] c_col_result

python/pylibcudf/pylibcudf/contiguous_split.pyx

@@ -193,7 +193,7 @@ cdef class ChunkedPack:
         cdef Stream _stream = _get_stream(stream)
         temp_mr = _get_memory_resource(temp_mr)
         cdef unique_ptr[chunked_pack] obj = chunked_pack.create(
-            input.view(), user_buffer_size, _stream.view().value(), temp_mr.get_mr()
+            input.view(), user_buffer_size, _stream.view().get(), temp_mr.get_mr()
         )
 
         cdef ChunkedPack out = ChunkedPack.__new__(ChunkedPack)
@@ -299,7 +299,7 @@ cdef class ChunkedPack:
             )
         )
         cdef Stream py_stream = self.stream
-        cdef cudaStream_t stream = py_stream.view().value()
+        cdef cudaStream_t stream = py_stream.view().get()
         with nogil:
             while dereference(self.c_obj).has_next():
                 size = dereference(self.c_obj).next(d_span)
@@ -354,7 +354,7 @@ cpdef PackedColumns pack(Table input, object stream: CudaStreamLike | None = Non
     """
     cdef unique_ptr[packed_columns] pack
     cdef Stream _stream = _get_stream(stream)
-    cdef cudaStream_t _cs = _stream.view().value()
+    cdef cudaStream_t _cs = _stream.view().get()
 
     mr = _get_memory_resource(mr)
     cdef table_view c_input = input.view()