Merge branch 'branch-25.08' into vivek/enforce-java-code-format-maven

narangvivek10 · web-flow · commit 308e9ffb816a · 2025-06-30T12:22:38.000-04:00
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -64,7 +64,7 @@ jobs:
   java-build:
     needs: cpp-build
     secrets: inherit
-    uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-25.06
+    uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-25.08
     with:
       build_type: ${{ inputs.build_type || 'branch' }}
       branch: ${{ inputs.branch }}
diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
@@ -155,7 +155,7 @@ jobs:
   conda-java-tests:
     needs: [conda-cpp-build, changed-files]
     secrets: inherit
-    uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-25.06
+    uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-25.08
     if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_java
     with:
       build_type: pull-request
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -47,7 +47,7 @@ jobs:
       sha: ${{ inputs.sha }}
   conda-java-tests:
     secrets: inherit
-    uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-25.06
+    uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-25.08
     with:
       build_type: ${{ inputs.build_type }}
       branch: ${{ inputs.branch }}
diff --git a/ci/release/update-version.sh b/ci/release/update-version.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright (c) 2020-2024, NVIDIA CORPORATION.
+# Copyright (c) 2020-2025, NVIDIA CORPORATION.
 ########################
 # CUVS Version Updater #
 ########################
@@ -108,8 +108,3 @@ done
 sed_runner "s| CuVS [[:digit:]]\{2\}\.[[:digit:]]\{2\} | CuVS ${NEXT_SHORT_TAG} |g" java/README.md
 sed_runner "s|-[[:digit:]]\{2\}\.[[:digit:]]\{2\}\.[[:digit:]]\{1,2\}\.jar|-${NEXT_FULL_JAVA_TAG}\.jar|g" java/examples/README.md
 sed_runner "s|/[[:digit:]]\{2\}\.[[:digit:]]\{2\}\.[[:digit:]]\{1,2\}/|/${NEXT_FULL_JAVA_TAG}/|g" java/examples/README.md
-
-# Update C API version.
-sed_runner "s|CUVS_VERSION_MAJOR = [0-9][0-9]|CUVS_VERSION_MAJOR = ${NEXT_MAJOR}|g" cpp/include/cuvs/core/c_api.h
-sed_runner "s|CUVS_VERSION_MINOR = [0-9][0-9]|CUVS_VERSION_MINOR = ${NEXT_MINOR}|g" cpp/include/cuvs/core/c_api.h
-sed_runner "s|CUVS_VERSION_PATCH = [0-9][0-9]|CUVS_VERSION_PATCH = ${NEXT_PATCH}|g" cpp/include/cuvs/core/c_api.h
diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
@@ -37,7 +37,7 @@ project(
 set(CMAKE_INSTALL_MESSAGE LAZY)
 
 # Write the version header
-rapids_cmake_write_version_file(include/cuvs/version_config.hpp)
+rapids_cmake_write_version_file(include/cuvs/version_config.h)
 
 # ##################################################################################################
 # * build type ---------------------------------------------------------------
@@ -746,6 +746,7 @@ target_compile_definitions(cuvs::cuvs INTERFACE $<$<BOOL:${CUVS_NVTX}>:NVTX_ENAB
     target_include_directories(
       cuvs_c
       PUBLIC "$<BUILD_INTERFACE:${DLPACK_INCLUDE_DIR}>"
+             "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>"
       INTERFACE "$<INSTALL_INTERFACE:include>"
     )
 
@@ -793,7 +794,7 @@ target_compile_definitions(cuvs::cuvs INTERFACE $<$<BOOL:${CUVS_NVTX}>:NVTX_ENAB
   endif()
 
   install(
-    FILES ${CMAKE_CURRENT_BINARY_DIR}/include/cuvs/version_config.hpp
+    FILES ${CMAKE_CURRENT_BINARY_DIR}/include/cuvs/version_config.h
     COMPONENT cuvs
     DESTINATION include/cuvs
   )
diff --git a/cpp/include/cuvs/core/c_api.h b/cpp/include/cuvs/core/c_api.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, NVIDIA CORPORATION.
+ * Copyright (c) 2024-2025, NVIDIA CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,10 +20,6 @@
 #include <stdbool.h>
 #include <stdint.h>
 
-static const uint16_t CUVS_VERSION_MAJOR = 25;
-static const uint16_t CUVS_VERSION_MINOR = 06;
-static const uint16_t CUVS_VERSION_PATCH = 00;
-
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/cpp/include/cuvs/neighbors/all_neighbors.hpp b/cpp/include/cuvs/neighbors/all_neighbors.hpp
@@ -23,6 +23,8 @@
 #include <variant>
 
 namespace cuvs::neighbors::all_neighbors {
+// For re-exporting into all_neighbors namespace
+namespace graph_build_params = cuvs::neighbors::graph_build_params;
 /**
  * @defgroup all_neighbors_cpp_params The all-neighbors algorithm parameters.
  * @{
diff --git a/cpp/src/core/c_api.cpp b/cpp/src/core/c_api.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, NVIDIA CORPORATION.
+ * Copyright (c) 2024-2025, NVIDIA CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-#include <cstdint>
 #include <cuvs/core/c_api.h>
 #include <cuvs/core/exceptions.hpp>
-#include <memory>
+#include <cuvs/version_config.h>
+
 #include <raft/core/resource/cuda_stream.hpp>
 #include <raft/core/resources.hpp>
 #include <rmm/cuda_stream_view.hpp>
@@ -27,6 +27,9 @@
 #include <rmm/mr/device/per_device_resource.hpp>
 #include <rmm/mr/device/pool_memory_resource.hpp>
 #include <rmm/mr/host/pinned_memory_resource.hpp>
+
+#include <cstdint>
+#include <memory>
 #include <thread>
 
 extern "C" cuvsError_t cuvsResourcesCreate(cuvsResources_t* res)
diff --git a/cpp/tests/core/c_api.c b/cpp/tests/core/c_api.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, NVIDIA CORPORATION.
+ * Copyright (c) 2024-2025, NVIDIA CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,6 +15,8 @@
  */
 
 #include <cuvs/core/c_api.h>
+#include <cuvs/version_config.h>
+
 #include <stdio.h>
 #include <stdlib.h>
 
diff --git a/java/examples/README.md b/java/examples/README.md
@@ -11,17 +11,17 @@ This maven project contains examples for CAGRA, HNSW, and Bruteforce algorithms.
 ### CAGRA Example
 In the current directory do:
 ```
-mvn package && java --enable-native-access=ALL-UNNAMED -cp target/cuvs-java-examples-25.06.0.jar:$HOME/.m2/repository/com/nvidia/cuvs/cuvs-java/25.06.0/cuvs-java-25.06.0.jar com.nvidia.cuvs.examples.CagraExample
+mvn package && java --enable-native-access=ALL-UNNAMED -cp target/cuvs-java-examples-25.08.0.jar:$HOME/.m2/repository/com/nvidia/cuvs/cuvs-java/25.08.0/cuvs-java-25.08.0.jar com.nvidia.cuvs.examples.CagraExample
 ```
 
 ### HNSW Example
 In the current directory do:
 ```
-mvn package && java --enable-native-access=ALL-UNNAMED -cp target/cuvs-java-examples-25.06.0.jar:$HOME/.m2/repository/com/nvidia/cuvs/cuvs-java/25.06.0/cuvs-java-25.06.0.jar com.nvidia.cuvs.examples.HnswExample
+mvn package && java --enable-native-access=ALL-UNNAMED -cp target/cuvs-java-examples-25.08.0.jar:$HOME/.m2/repository/com/nvidia/cuvs/cuvs-java/25.08.0/cuvs-java-25.08.0.jar com.nvidia.cuvs.examples.HnswExample
 ```
 
 ### Bruteforce Example
 In the current directory do:
 ```
-mvn package && java --enable-native-access=ALL-UNNAMED -cp target/cuvs-java-examples-25.06.0.jar:$HOME/.m2/repository/com/nvidia/cuvs/cuvs-java/25.06.0/cuvs-java-25.06.0.jar com.nvidia.cuvs.examples.BruteForceExample
+mvn package && java --enable-native-access=ALL-UNNAMED -cp target/cuvs-java-examples-25.08.0.jar:$HOME/.m2/repository/com/nvidia/cuvs/cuvs-java/25.08.0/cuvs-java-25.08.0.jar com.nvidia.cuvs.examples.BruteForceExample
 ```
