Fix cuvs::neighbors::nn_descent::build

rapidsai · Jan 21, 2025 · 6600a33 · 6600a33
1 parent 238ff18
commit 6600a33
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 8 deletions.
diff --git a/cpp/src/neighbors/nn_descent_float.cu b/cpp/src/neighbors/nn_descent_float.cu
@@ -31,7 +31,8 @@ namespace cuvs::neighbors::nn_descent {
     } else {                                                                                  \
       std::optional<raft::device_matrix_view<float, int64_t, raft::row_major>> distances =    \
         std::nullopt;                                                                         \
-      cuvs::neighbors::nn_descent::index<IdxT> idx{handle, graph.value(), distances};         \
+      cuvs::neighbors::nn_descent::index<IdxT> idx{                                           \
+        handle, graph.value(), distances, params.metric};                                     \
       cuvs::neighbors::nn_descent::build<T, IdxT>(handle, params, dataset, idx);              \
       return idx;                                                                             \
     };                                                                                        \
@@ -47,7 +48,8 @@ namespace cuvs::neighbors::nn_descent {
     } else {                                                                                  \
       std::optional<raft::device_matrix_view<float, int64_t, raft::row_major>> distances =    \
         std::nullopt;                                                                         \
-      cuvs::neighbors::nn_descent::index<IdxT> idx{handle, graph.value(), distances};         \
+      cuvs::neighbors::nn_descent::index<IdxT> idx{                                           \
+        handle, graph.value(), distances, params.metric};                                     \
       cuvs::neighbors::nn_descent::build<T, IdxT>(handle, params, dataset, idx);              \
       return idx;                                                                             \
     }                                                                                         \

diff --git a/cpp/src/neighbors/nn_descent_half.cu b/cpp/src/neighbors/nn_descent_half.cu
@@ -31,7 +31,8 @@ namespace cuvs::neighbors::nn_descent {
     } else {                                                                                  \
       std::optional<raft::device_matrix_view<float, int64_t, raft::row_major>> distances =    \
         std::nullopt;                                                                         \
-      cuvs::neighbors::nn_descent::index<IdxT> idx{handle, graph.value(), distances};         \
+      cuvs::neighbors::nn_descent::index<IdxT> idx{                                           \
+        handle, graph.value(), distances, params.metric};                                     \
       cuvs::neighbors::nn_descent::build<T, IdxT>(handle, params, dataset, idx);              \
       return idx;                                                                             \
     }                                                                                         \
@@ -48,7 +49,8 @@ namespace cuvs::neighbors::nn_descent {
     } else {                                                                                  \
       std::optional<raft::device_matrix_view<float, int64_t, raft::row_major>> distances =    \
         std::nullopt;                                                                         \
-      cuvs::neighbors::nn_descent::index<IdxT> idx{handle, graph.value(), distances};         \
+      cuvs::neighbors::nn_descent::index<IdxT> idx{                                           \
+        handle, graph.value(), distances, params.metric};                                     \
       cuvs::neighbors::nn_descent::build<T, IdxT>(handle, params, dataset, idx);              \
       return idx;                                                                             \
     }                                                                                         \

diff --git a/cpp/src/neighbors/nn_descent_int8.cu b/cpp/src/neighbors/nn_descent_int8.cu
@@ -31,7 +31,8 @@ namespace cuvs::neighbors::nn_descent {
     } else {                                                                                  \
       std::optional<raft::device_matrix_view<float, int64_t, raft::row_major>> distances =    \
         std::nullopt;                                                                         \
-      cuvs::neighbors::nn_descent::index<IdxT> idx{handle, graph.value(), distances};         \
+      cuvs::neighbors::nn_descent::index<IdxT> idx{                                           \
+        handle, graph.value(), distances, params.metric};                                     \
       cuvs::neighbors::nn_descent::build<T, IdxT>(handle, params, dataset, idx);              \
       return idx;                                                                             \
     }                                                                                         \
@@ -48,7 +49,8 @@ namespace cuvs::neighbors::nn_descent {
     } else {                                                                                  \
       std::optional<raft::device_matrix_view<float, int64_t, raft::row_major>> distances =    \
         std::nullopt;                                                                         \
-      cuvs::neighbors::nn_descent::index<IdxT> idx{handle, graph.value(), distances};         \
+      cuvs::neighbors::nn_descent::index<IdxT> idx{                                           \
+        handle, graph.value(), distances, params.metric};                                     \
       cuvs::neighbors::nn_descent::build<T, IdxT>(handle, params, dataset, idx);              \
       return idx;                                                                             \
     }                                                                                         \

diff --git a/cpp/src/neighbors/nn_descent_uint8.cu b/cpp/src/neighbors/nn_descent_uint8.cu
@@ -31,7 +31,8 @@ namespace cuvs::neighbors::nn_descent {
     } else {                                                                                  \
       std::optional<raft::device_matrix_view<float, int64_t, raft::row_major>> distances =    \
         std::nullopt;                                                                         \
-      cuvs::neighbors::nn_descent::index<IdxT> idx{handle, graph.value(), distances};         \
+      cuvs::neighbors::nn_descent::index<IdxT> idx{                                           \
+        handle, graph.value(), distances, params.metric};                                     \
       cuvs::neighbors::nn_descent::build<T, IdxT>(handle, params, dataset, idx);              \
       return idx;                                                                             \
     }                                                                                         \
@@ -48,7 +49,8 @@ namespace cuvs::neighbors::nn_descent {
     } else {                                                                                  \
       std::optional<raft::device_matrix_view<float, int64_t, raft::row_major>> distances =    \
         std::nullopt;                                                                         \
-      cuvs::neighbors::nn_descent::index<IdxT> idx{handle, graph.value(), distances};         \
+      cuvs::neighbors::nn_descent::index<IdxT> idx{                                           \
+        handle, graph.value(), distances, params.metric};                                     \
       cuvs::neighbors::nn_descent::build<T, IdxT>(handle, params, dataset, idx);              \
       return idx;                                                                             \
     }                                                                                         \