Merge branch 'release/25.12' into fix-nnd-recall-fp32

Author: jinsolp

c/include/cuvs/core/c_api.h

@@ -7,7 +7,6 @@
 
 #include <cuda_runtime.h>
 #include <dlpack/dlpack.h>
-#include <rapids_logger/log_levels.h>
 #include <stdbool.h>
 #include <stdint.h>
 
@@ -48,13 +47,13 @@ void cuvsSetLastErrorText(const char* error);
  *
  */
 typedef enum {
-  CUVS_LOG_LEVEL_TRACE    = RAPIDS_LOGGER_LOG_LEVEL_TRACE,
-  CUVS_LOG_LEVEL_DEBUG    = RAPIDS_LOGGER_LOG_LEVEL_DEBUG,
-  CUVS_LOG_LEVEL_INFO     = RAPIDS_LOGGER_LOG_LEVEL_INFO,
-  CUVS_LOG_LEVEL_WARN     = RAPIDS_LOGGER_LOG_LEVEL_WARN,
-  CUVS_LOG_LEVEL_ERROR    = RAPIDS_LOGGER_LOG_LEVEL_ERROR,
-  CUVS_LOG_LEVEL_CRITICAL = RAPIDS_LOGGER_LOG_LEVEL_CRITICAL,
-  CUVS_LOG_LEVEL_OFF      = RAPIDS_LOGGER_LOG_LEVEL_OFF
+  CUVS_LOG_LEVEL_TRACE    = 0,
+  CUVS_LOG_LEVEL_DEBUG    = 1,
+  CUVS_LOG_LEVEL_INFO     = 2,
+  CUVS_LOG_LEVEL_WARN     = 3,
+  CUVS_LOG_LEVEL_ERROR    = 4,
+  CUVS_LOG_LEVEL_CRITICAL = 5,
+  CUVS_LOG_LEVEL_OFF      = 6
 } cuvsLogLevel_t;
 
 /** @brief Returns the current log level

c/src/core/c_api.cpp

@@ -214,7 +214,32 @@ extern "C" const char* cuvsGetLastErrorText()
 
 extern "C" void cuvsSetLogLevel(cuvsLogLevel_t verbosity)
 {
-  raft::default_logger().set_level(static_cast<rapids_logger::level_enum>(verbosity));
+  rapids_logger::level_enum level = rapids_logger::level_enum::trace;
+  switch (verbosity) {
+    case CUVS_LOG_LEVEL_TRACE:
+      level = rapids_logger::level_enum::trace;
+      break;
+    case CUVS_LOG_LEVEL_DEBUG:
+      level = rapids_logger::level_enum::debug;
+      break;
+    case CUVS_LOG_LEVEL_INFO:
+      level = rapids_logger::level_enum::info;
+      break;
+    case CUVS_LOG_LEVEL_WARN:
+      level = rapids_logger::level_enum::warn;
+      break;
+    case CUVS_LOG_LEVEL_ERROR:
+      level = rapids_logger::level_enum::error;
+      break;
+    case CUVS_LOG_LEVEL_CRITICAL:
+      level = rapids_logger::level_enum::critical;
+      break;
+    case CUVS_LOG_LEVEL_OFF:
+      level = rapids_logger::level_enum::off;
+      break;
+    default: RAFT_FAIL("Unsupported cuvsLogLevel_t value provided");
+  }
+  raft::default_logger().set_level(level);
 }
 
 extern "C" cuvsLogLevel_t cuvsGetLogLevel()

java/panama-bindings/generate-bindings.sh

@@ -20,15 +20,6 @@ else
   exit 1
 fi
 
-if [ -n "${RAPIDS_LOGGER_INCLUDE_DIR:-}" ]; then
-  echo "Using user-defined RAPIDS_LOGGER_INCLUDE_DIR"
-elif [ -n "${CONDA_PREFIX:-}" ]; then
-  RAPIDS_LOGGER_INCLUDE_DIR="${CONDA_PREFIX}/include"
-else
-  echo "Couldn't find a suitable CUDA include directory."
-  exit 1
-fi
-
 PATH="$(pwd)/jextract-22/bin/:${PATH}"
 export PATH
 
@@ -46,7 +37,6 @@ fi
 jextract \
  --include-dir "${REPODIR}"/java/internal/build/bindings/include/ \
  --include-dir "${CUDA_INCLUDE_DIR}" \
- --include-dir "${RAPIDS_LOGGER_INCLUDE_DIR}" \
  --output "${REPODIR}/java/cuvs-java/src/main/java22/" \
  --target-package ${TARGET_PACKAGE} \
  --library cuvs_c \

python/cuvs/cuvs/tests/test_serialization.py

@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: Copyright (c) 2024, NVIDIA CORPORATION.
+# SPDX-FileCopyrightText: Copyright (c) 2024-2025, NVIDIA CORPORATION.
 # SPDX-License-Identifier: Apache-2.0
 #
 
@@ -7,7 +7,7 @@
 from pylibraft.common import device_ndarray
 
 from cuvs.neighbors import brute_force, cagra, ivf_flat, ivf_pq
-from cuvs.tests.ann_utils import generate_data
+from cuvs.tests.ann_utils import calc_recall, generate_data
 
 
 @pytest.mark.parametrize("dtype", [np.float32, np.int8, np.ubyte])
@@ -77,5 +77,17 @@ def run_save_load(ann_module, dtype):
     neighbors2 = neighbors_dev.copy_to_host()
     dist2 = distance_dev.copy_to_host()
 
-    assert np.all(neighbors == neighbors2)
     assert np.allclose(dist, dist2, rtol=1e-6)
+
+    # Sort the neighbors to avoid ordering issues
+    sorted_neighbors = np.argsort(neighbors, axis=-1)
+    sorted_neighbors2 = np.argsort(neighbors2, axis=-1)
+    neighbors = np.take_along_axis(neighbors, sorted_neighbors, axis=-1)
+    neighbors2 = np.take_along_axis(neighbors2, sorted_neighbors2, axis=-1)
+    all_match = np.all(neighbors == neighbors2)
+    # If the neighbors are not the same, there might be a cutoff between the k
+    # and k+1 neighbors at the same distance.
+    # Calculate that the recall is at least 99.8%
+    if not all_match:
+        recall = calc_recall(neighbors, neighbors2)
+        assert recall >= 0.998