Merge branch 'release/26.10' into codex/cuvs-bench-prefetch-async-rmm

Author: tarang-jain

.github/workflows/pr.yaml

@@ -162,6 +162,8 @@ jobs:
           - '!ci/test_wheel_cuvs.sh'
           - '!ci/validate_wheel.sh'
           - '!docs/**'
+          - '!examples/go/**'
+          - '!examples/java/**'
           - '!fern/**'
           - '!go/**'
           - '!img/**'
@@ -214,7 +216,15 @@ jobs:
           - '!conda/recipes/cuvs-bench/**'
           - '!conda/recipes/cuvs-bench-cpu/**'
           - '!docs/**'
-          - '!examples/**'
+          - '!examples/.clang-format'
+          - '!examples/.clang-tidy'
+          - '!examples/.clangd'
+          - '!examples/README.md'
+          - '!examples/build.sh'
+          - '!examples/c/**'
+          - '!examples/cmake/**'
+          - '!examples/cpp/**'
+          - '!examples/go/**'
           - '!fern/**'
           - '!go/**'
           - '!img/**'
@@ -268,6 +278,7 @@ jobs:
           - '!README.md'
           - '!SECURITY.md'
           - '!docs/**'
+          - '!examples/**'
           - '!fern/**'
           - '!go/**'
           - '!img/**'
@@ -325,6 +336,7 @@ jobs:
           - '!cpp/.clang-tidy'
           - '!cpp/doxygen/**'
           - '!docs/**'
+          - '!examples/**'
           - '!fern/**'
           - '!java/**'
           - '!go/**'
@@ -377,6 +389,7 @@ jobs:
           - '!ci/test_wheel_cuvs.sh'
           - '!ci/validate_wheel.sh'
           - '!docs/**'
+          - '!examples/**'
           - '!fern/**'
           - '!go/**'
           - '!img/**'
@@ -430,6 +443,15 @@ jobs:
           - '!ci/test_wheel_cuvs.sh'
           - '!ci/validate_wheel.sh'
           - '!docs/**'
+          - '!examples/.clang-format'
+          - '!examples/.clang-tidy'
+          - '!examples/.clangd'
+          - '!examples/README.md'
+          - '!examples/build.sh'
+          - '!examples/c/**'
+          - '!examples/cmake/**'
+          - '!examples/cpp/**'
+          - '!examples/java/**'
           - '!fern/**'
           - '!img/**'
           - '!java/**'

.pre-commit-config.yaml

@@ -121,7 +121,7 @@ repos:
         name: spotless-fmt
         entry: ci/checks/run_spotless.sh
         pass_filenames: false
-        files: ^java/(cuvs-java|cuvs-lucene)/([^/]+/)?src/.*\.java$
+        files: ^(java|examples/java)/(cuvs-java|cuvs-lucene)/([^/]+/)?src/.*\.java$
         exclude: .*/panama/.*
         language: script
         verbose: true

build.sh

@@ -19,7 +19,7 @@ ARGS=$*
 # scripts, and that this script resides in the repo dir!
 REPODIR=$(cd "$(dirname "$0")"; pwd)
 
-VALIDARGS="clean libcuvs python rust go java lucene docs tests bench-ann examples --uninstall  -v -g -n --allgpuarch --no-mg --mnmg-tests --no-cpu --cpu-only --no-shared-libs --no-nvtx --show_depr_warn --incl-cache-stats --time -h --run-java-tests"
+VALIDARGS="clean libcuvs python rust go java lucene docs tests bench-ann examples --uninstall  -v -g -n --allgpuarch --no-mg --mnmg-tests --no-cpu --cpu-only --no-shared-libs --no-nvtx --show_depr_warn --incl-cache-stats --time -h --run-java-tests --build-java-examples"
 HELP="$0 [<target> ...] [<flag> ...] [--cmake-args=\"<args>\"] [--cache-tool=<tool>] [--limit-tests=<targets>] [--limit-bench-ann=<targets>] [--build-metrics=<filename>]
  where <target> is:
    clean            - remove all existing build artifacts and configuration (start over)
@@ -57,6 +57,8 @@ HELP="$0 [<target> ...] [<flag> ...] [--cmake-args=\"<args>\"] [--cache-tool=<to
    --no-shared-libs            - build without shared libraries
    --show_depr_warn            - show cmake deprecation warnings
    --run-java-tests            - run Java tests after building
+   --build-java-examples       - also build the examples/java/cuvs-java and examples/java/cuvs-lucene
+                                 projects against the jars just built (with the 'java'/'lucene' targets)
    --build-metrics             - filename for generating build metrics report for libcuvs
    --incl-cache-stats          - include cache statistics in build metrics report
    --cmake-args=\\\"<args>\\\" - pass arbitrary list of CMake configuration options (escape all quotes in argument)
@@ -560,11 +562,14 @@ if (( NUMARGS == 0 )) || hasArg java; then
         echo "Please add 'libcuvs' to this script's arguments (ex. './build.sh libcuvs java') if libcuvs libraries are not already built"
     fi
     cd "${REPODIR}"/java
+    JAVA_BUILD_ARGS=()
     if hasArg --run-java-tests; then
-        ./build.sh --run-java-tests
-    else
-        ./build.sh
+        JAVA_BUILD_ARGS+=("--run-java-tests")
     fi
+    if hasArg --build-java-examples; then
+        JAVA_BUILD_ARGS+=("--build-java-examples")
+    fi
+    ./build.sh "${JAVA_BUILD_ARGS[@]}"
 fi
 
 # Build the cuvs-lucene codecs
@@ -573,11 +578,14 @@ if (( NUMARGS == 0 )) || hasArg lucene; then
         echo "Please add 'java' to this script's arguments (ex. './build.sh libcuvs java lucene') if the cuvs Java bindings are not already built"
     fi
     cd "${REPODIR}"/java/cuvs-lucene
+    LUCENE_BUILD_ARGS=()
     if hasArg --run-java-tests; then
-        ./build.sh --run-java-tests
-    else
-        ./build.sh
+        LUCENE_BUILD_ARGS+=("--run-java-tests")
+    fi
+    if hasArg --build-java-examples; then
+        LUCENE_BUILD_ARGS+=("--build-java-examples")
     fi
+    ./build.sh "${LUCENE_BUILD_ARGS[@]}"
 fi
 
 RAPIDS_VERSION="$(sed -E -e 's/^([0-9]{2})\.([0-9]{2})\.([0-9]{2}).*$/\1.\2.\3/' "${REPODIR}/VERSION")"

c/src/core/c_api.cpp

@@ -144,7 +144,7 @@ extern "C" cuvsError_t cuvsStreamGet(cuvsResources_t res, cudaStream_t* stream)
 {
   return cuvs::core::translate_exceptions([=] {
     auto res_ptr = reinterpret_cast<raft::resources*>(res);
-    *stream      = raft::resource::get_cuda_stream(*res_ptr);
+    *stream      = raft::resource::get_cuda_stream(*res_ptr).get();
   });
 }
 

c/src/neighbors/nn_descent.cpp

@@ -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
  */
 
@@ -107,7 +107,7 @@ void _get_distances(cuvsResources_t res, cuvsNNDescentIndex_t index, DLManagedTe
                     src->data_handle(),
                     dst.extent(0) * dst.extent(1) * sizeof(float),
                     cudaMemcpyDefault,
-                    raft::resource::get_cuda_stream(*res_ptr));
+                    raft::resource::get_cuda_stream(*res_ptr).get());
 
   } else {
     RAFT_FAIL("Unsupported nn-descent index dtype: %d and bits: %d", dtype.code, dtype.bits);

c/tests/neighbors/ann_ivf_sq_c.cu

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: Copyright (c) 2026, NVIDIA CORPORATION.
+ * SPDX-FileCopyrightText: Copyright (c) 2026, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -108,7 +108,7 @@ TEST(IvfSqC, BuildSearch)
 
   cuvsResources_t res;
   cuvsResourcesCreate(&res);
-  cuvsStreamSet(res, stream);
+  cuvsStreamSet(res, stream.get());
 
   run_ivf_sq(res,
              n_rows,

c/tests/neighbors/ann_mg_c.cu

@@ -1,10 +1,12 @@
 /*
- * SPDX-FileCopyrightText: Copyright (c) 2025-2026, NVIDIA CORPORATION.
+ * SPDX-FileCopyrightText: Copyright (c) 2025-2026, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
 #include <cuda.h>
 #include <gtest/gtest.h>
+#include <cuda/stream>
+
 #include <raft/core/device_mdarray.hpp>
 #include <raft/core/handle.hpp>
 #include <raft/random/rng.cuh>
@@ -158,12 +160,12 @@ class MgCTest : public ::testing::TestWithParam<mg_test_params> {
 
  protected:
   mg_test_params params;
-  rmm::device_uvector<float> index_data{0, rmm::cuda_stream_default};
-  rmm::device_uvector<float> query_data{0, rmm::cuda_stream_default};
-  rmm::device_uvector<int64_t> neighbors_data{0, rmm::cuda_stream_default};
-  rmm::device_uvector<float> distances_data{0, rmm::cuda_stream_default};
-  rmm::device_uvector<int64_t> ref_neighbors_data{0, rmm::cuda_stream_default};
-  rmm::device_uvector<float> ref_distances_data{0, rmm::cuda_stream_default};
+  rmm::device_uvector<float> index_data{0, cuda::stream_ref{cudaStream_t{cudaStreamDefault}}};
+  rmm::device_uvector<float> query_data{0, cuda::stream_ref{cudaStream_t{cudaStreamDefault}}};
+  rmm::device_uvector<int64_t> neighbors_data{0, cuda::stream_ref{cudaStream_t{cudaStreamDefault}}};
+  rmm::device_uvector<float> distances_data{0, cuda::stream_ref{cudaStream_t{cudaStreamDefault}}};
+  rmm::device_uvector<int64_t> ref_neighbors_data{0, cuda::stream_ref{cudaStream_t{cudaStreamDefault}}};
+  rmm::device_uvector<float> ref_distances_data{0, cuda::stream_ref{cudaStream_t{cudaStreamDefault}}};
 
   // Host memory for multi-GPU tests
   std::vector<float> index_data_host;

ci/build_java.sh

@@ -13,7 +13,7 @@ export SCCACHE_S3_USE_PREPROCESSOR_CACHE_MODE=true
 # TODO: Remove this argument-handling when build and test workflows are separated,
 #       and test_java.sh no longer calls build_java.sh
 #       ref: https://github.com/nvidia/cuvs/issues/868
-EXTRA_BUILD_ARGS=()
+EXTRA_BUILD_ARGS=("--build-java-examples")
 if [[ "${1:-}" == "--run-java-tests" ]]; then
   EXTRA_BUILD_ARGS+=("--run-java-tests")
 fi

ci/build_lucene.sh

@@ -9,7 +9,7 @@ set -euo pipefail
 # TODO: Remove the flag handling when build and test workflows are separated,
 #       and test_lucene.sh no longer calls build_lucene.sh
 #       ref: https://github.com/rapidsai/cuvs/issues/868
-EXTRA_BUILD_ARGS=()
+EXTRA_BUILD_ARGS=("--build-java-examples")
 CUVS_JAVA_ARTIFACT=""
 for arg in "$@"; do
   case "${arg}" in

ci/checks/run_spotless.sh

@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 # pre-commit hook wrapper that runs 'spotless:apply' to format the Java sources of every Maven
-# project under java/.
+# project under java/ and examples/java/.
 #
 # Most cuvs contributors do not work on the Java client and do not have Maven installed. For them,
 # running 'pre-commit run --all-files' matches every Java source file in the repo regardless of
@@ -15,11 +15,11 @@ set -euo pipefail
 
 # Keep these in sync with the spotless-fmt hook's 'files'/'exclude' entries in
 # .pre-commit-config.yaml.
-JAVA_SRC_PATTERN='^java/(cuvs-java|cuvs-lucene)/([^/]+/)?src/.*\.java$'
+JAVA_SRC_PATTERN='^(java|examples/java)/(cuvs-java|cuvs-lucene)/([^/]+/)?src/.*\.java$'
 JAVA_SRC_EXCLUDE='.*/panama/.*'
 
 java_sources_modified() {
-  git status --porcelain --untracked-files=all -- java/cuvs-java java/cuvs-lucene |
+  git status --porcelain --untracked-files=all -- java/cuvs-java java/cuvs-lucene examples/java |
     cut -c4- |
     grep -Ev "${JAVA_SRC_EXCLUDE}" |
     grep -Eq "${JAVA_SRC_PATTERN}"
@@ -42,7 +42,8 @@ POMS=(
   java/cuvs-java/pom.xml
   java/cuvs-lucene/pom.xml
   java/cuvs-lucene/bench/pom.xml
-  java/cuvs-lucene/examples/pom.xml
+  examples/java/cuvs-java/pom.xml
+  examples/java/cuvs-lucene/pom.xml
 )
 
 for pom in "${POMS[@]}"; do