fix hnsw cpu search ids type

Signed-off-by: yusheng.ma <[email protected]>
milvus-io · Oct 14, 2024 · 1594f91 · 1594f91
1 parent ec12aba
commit 1594f91
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 25 deletions.
diff --git a/cpp/include/raft/neighbors/detail/hnsw.hpp b/cpp/include/raft/neighbors/detail/hnsw.hpp
@@ -32,7 +32,7 @@ template <typename T>
 void get_search_knn_results(hnswlib::HierarchicalNSW<typename hnsw_dist_t<T>::type> const* idx,
                             const T* query,
                             int k,
-                            uint64_t* indices,
+                            int64_t* indices,
                             float* distances)
 {
   auto result = idx->searchKnn(query, k);
@@ -50,14 +50,13 @@ void search(raft::resources const& res,
             const search_params& params,
             const index<T>& idx,
             raft::host_matrix_view<const T, int64_t, row_major> queries,
-            raft::host_matrix_view<uint64_t, int64_t, row_major> neighbors,
+            raft::host_matrix_view<int64_t, int64_t, row_major> neighbors,
             raft::host_matrix_view<float, int64_t, row_major> distances)
 {
   idx.set_ef(params.ef);
   auto const* hnswlib_index =
     reinterpret_cast<hnswlib::HierarchicalNSW<typename hnsw_dist_t<T>::type> const*>(
       idx.get_index());
-
   // when num_threads == 0, automatically maximize parallelism
   if (params.num_threads) {
 #pragma omp parallel for num_threads(params.num_threads)

diff --git a/cpp/include/raft/neighbors/hnsw.hpp b/cpp/include/raft/neighbors/hnsw.hpp
@@ -122,7 +122,7 @@ void search(raft::resources const& res,
             const search_params& params,
             const index<T>& idx,
             raft::host_matrix_view<const T, int64_t, row_major> queries,
-            raft::host_matrix_view<uint64_t, int64_t, row_major> neighbors,
+            raft::host_matrix_view<int64_t, int64_t, row_major> neighbors,
             raft::host_matrix_view<float, int64_t, row_major> distances)
 {
   RAFT_EXPECTS(

diff --git a/cpp/include/raft_runtime/neighbors/hnsw.hpp b/cpp/include/raft_runtime/neighbors/hnsw.hpp
@@ -23,26 +23,26 @@
 
 namespace raft::runtime::neighbors::hnsw {
 
-#define RAFT_INST_HNSW_FUNCS(T, IdxT)                                         \
-  std::unique_ptr<raft::neighbors::hnsw::index<T>> from_cagra(                \
-    raft::resources const& res, raft::neighbors::cagra::index<T, IdxT>);      \
-  void search(raft::resources const& handle,                                  \
-              raft::neighbors::hnsw::search_params const& params,             \
-              raft::neighbors::hnsw::index<T> const& index,                   \
-              raft::host_matrix_view<const T, int64_t, row_major> queries,    \
-              raft::host_matrix_view<uint64_t, int64_t, row_major> neighbors, \
-              raft::host_matrix_view<float, int64_t, row_major> distances);   \
-  template <typename DType>                                                   \
-  std::unique_ptr<raft::neighbors::hnsw::index<DType>> deserialize_file(      \
-    raft::resources const& handle,                                            \
-    const std::string& filename,                                              \
-    int dim,                                                                  \
-    raft::distance::DistanceType metric);                                     \
-  template <>                                                                 \
-  std::unique_ptr<raft::neighbors::hnsw::index<T>> deserialize_file(          \
-    raft::resources const& handle,                                            \
-    const std::string& filename,                                              \
-    int dim,                                                                  \
+#define RAFT_INST_HNSW_FUNCS(T, IdxT)                                        \
+  std::unique_ptr<raft::neighbors::hnsw::index<T>> from_cagra(               \
+    raft::resources const& res, raft::neighbors::cagra::index<T, IdxT>);     \
+  void search(raft::resources const& handle,                                 \
+              raft::neighbors::hnsw::search_params const& params,            \
+              raft::neighbors::hnsw::index<T> const& index,                  \
+              raft::host_matrix_view<const T, int64_t, row_major> queries,   \
+              raft::host_matrix_view<int64_t, int64_t, row_major> neighbors, \
+              raft::host_matrix_view<float, int64_t, row_major> distances);  \
+  template <typename DType>                                                  \
+  std::unique_ptr<raft::neighbors::hnsw::index<DType>> deserialize_file(     \
+    raft::resources const& handle,                                           \
+    const std::string& filename,                                             \
+    int dim,                                                                 \
+    raft::distance::DistanceType metric);                                    \
+  template <>                                                                \
+  std::unique_ptr<raft::neighbors::hnsw::index<T>> deserialize_file(         \
+    raft::resources const& handle,                                           \
+    const std::string& filename,                                             \
+    int dim,                                                                 \
     raft::distance::DistanceType metric);
 
 RAFT_INST_HNSW_FUNCS(float, uint32_t);

diff --git a/cpp/src/raft_runtime/neighbors/hnsw.cpp b/cpp/src/raft_runtime/neighbors/hnsw.cpp
@@ -55,7 +55,7 @@ namespace raft::runtime::neighbors::hnsw {
               raft::neighbors::hnsw::search_params const& params,                           \
               const raft::neighbors::hnsw::index<T>& index,                                 \
               raft::host_matrix_view<const T, int64_t, row_major> queries,                  \
-              raft::host_matrix_view<uint64_t, int64_t, row_major> neighbors,               \
+              raft::host_matrix_view<int64_t, int64_t, row_major> neighbors,                \
               raft::host_matrix_view<float, int64_t, row_major> distances)                  \
   {                                                                                         \
     raft::neighbors::hnsw::search<T>(handle, params, index, queries, neighbors, distances); \