Merge remote-tracking branch 'upstream/release/26.10' into HH-migrate-merge-dataset-to-take-inputs-concat-buffer-and-offset-26_10

Author: HowardHuang1

c/src/core/c_api.cpp

@@ -15,7 +15,7 @@
 #include <raft/core/resources.hpp>
 #include <raft/util/cudart_utils.hpp>
 #include <rapids_logger/logger.hpp>
-#include <rmm/cuda_stream_view.hpp>
+#include <cuda/stream>
 #include <rmm/mr/cuda_async_memory_resource.hpp>
 #include <rmm/mr/cuda_memory_resource.hpp>
 #include <rmm/mr/managed_memory_resource.hpp>
@@ -136,7 +136,7 @@ extern "C" cuvsError_t cuvsStreamSet(cuvsResources_t res, cudaStream_t stream)
 {
   return cuvs::core::translate_exceptions([=] {
     auto res_ptr = reinterpret_cast<raft::resources*>(res);
-    raft::resource::set_cuda_stream(*res_ptr, static_cast<rmm::cuda_stream_view>(stream));
+    raft::resource::set_cuda_stream(*res_ptr, static_cast<cuda::stream_ref>(stream));
   });
 }
 

cpp/bench/ann/src/common/util.hpp

@@ -171,7 +171,7 @@ inline auto get_stream_from_global_pool() -> cudaStream_t
       detail::global_stream_pool.emplace_back(rmm::cuda_stream::flags::non_blocking);
     }
   }
-  return detail::global_stream_pool[benchmark_thread_id].view();
+  return detail::global_stream_pool[benchmark_thread_id].value();
 #else
   return nullptr;
 #endif

cpp/bench/ann/src/cuvs/cuvs_ann_bench_utils.h

@@ -19,8 +19,8 @@
 #include <raft/core/resource/device_memory_resource.hpp>
 #include <raft/util/cudart_utils.hpp>
 
+#include <cuda/stream>
 #include <rmm/cuda_stream_pool.hpp>
-#include <rmm/cuda_stream_view.hpp>
 #include <rmm/device_uvector.hpp>
 #include <rmm/mr/failure_callback_resource_adaptor.hpp>
 #include <rmm/mr/managed_memory_resource.hpp>
@@ -124,8 +124,8 @@ class configured_raft_resources {
    */
   explicit configured_raft_resources(const std::shared_ptr<shared_raft_resources>& shared_res)
     : shared_res_{shared_res},
-      res_{std::make_unique<raft::device_resources>(
-        rmm::cuda_stream_view(get_stream_from_global_pool()))}
+      res_{
+        std::make_unique<raft::device_resources>(cuda::stream_ref(get_stream_from_global_pool()))}
   {
     raft::resource::set_large_workspace_resource(
       *res_, raft::mr::device_resource{shared_res_->get_large_memory_resource()});

cpp/bench/ann/src/cuvs/cuvs_brute_force_knn.cu

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: Copyright (c) 2024, NVIDIA CORPORATION.
+ * SPDX-FileCopyrightText: Copyright (c) 2024-2026, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 #include <cuvs/distance/distance.hpp>
@@ -72,7 +72,7 @@ template <typename T, typename DistT = T>
 class BruteForceKNNBenchmark {
  public:
   BruteForceKNNBenchmark(const RandomKNNInputs& params, const std::string& type_str)
-    : stream_(raft::resource::get_cuda_stream(handle_)),
+    : stream_(raft::resource::get_cuda_stream(handle_).get()),
       params_(params),
       type_str_(type_str),
       database(params_.num_db_vecs * params_.dim, stream_),

cpp/bench/ann/src/cuvs/cuvs_cagra_hnswlib_wrapper.h

@@ -45,7 +45,7 @@ class cuvs_cagra_hnswlib : public algo<T>, public algo_gpu {
 
   [[nodiscard]] auto get_sync_stream() const noexcept -> cudaStream_t override
   {
-    return handle_.get_sync_stream();
+    return handle_.get_sync_stream().get();
   }
 
   [[nodiscard]] auto uses_stream() const noexcept -> bool override

cpp/bench/ann/src/cuvs/cuvs_cagra_wrapper.h

@@ -205,7 +205,7 @@ class cuvs_cagra : public algo<T>, public algo_gpu {
 
   [[nodiscard]] auto get_sync_stream() const noexcept -> cudaStream_t override
   {
-    return handle_.get_sync_stream();
+    return handle_.get_sync_stream().get();
   }
 
   [[nodiscard]] auto uses_stream() const noexcept -> bool override

cpp/bench/ann/src/cuvs/cuvs_ivf_flat_wrapper.h

@@ -57,7 +57,7 @@ class cuvs_ivf_flat : public algo<T>, public algo_gpu {
 
   [[nodiscard]] auto get_sync_stream() const noexcept -> cudaStream_t override
   {
-    return handle_.get_sync_stream();
+    return handle_.get_sync_stream().get();
   }
 
   // to enable dataset access from GPU memory

cpp/bench/ann/src/cuvs/cuvs_ivf_pq_wrapper.h

@@ -70,7 +70,7 @@ class cuvs_ivf_pq : public algo<T>, public algo_gpu {
 
   [[nodiscard]] auto get_sync_stream() const noexcept -> cudaStream_t override
   {
-    return handle_.get_sync_stream();
+    return handle_.get_sync_stream().get();
   }
 
   // to enable dataset access from GPU memory

cpp/bench/ann/src/cuvs/cuvs_ivf_rabitq_wrapper.h

@@ -55,7 +55,7 @@ class cuvs_ivf_rabitq : public algo<T>, public algo_gpu {
 
   [[nodiscard]] auto get_sync_stream() const noexcept -> cudaStream_t override
   {
-    return handle_.get_sync_stream();
+    return handle_.get_sync_stream().get();
   }
 
   // to enable dataset access from GPU memory

cpp/bench/ann/src/cuvs/cuvs_ivf_sq_wrapper.h

@@ -52,7 +52,7 @@ class cuvs_ivf_sq : public algo<T>, public algo_gpu {
 
   [[nodiscard]] auto get_sync_stream() const noexcept -> cudaStream_t override
   {
-    return handle_.get_sync_stream();
+    return handle_.get_sync_stream().get();
   }
 
   [[nodiscard]] auto get_preference() const -> algo_property override