revert hnsw to hnswlib

Signed-off-by: xianliang.li <[email protected]>
zilliztech · Dec 18, 2024 · 10579c2 · 10579c2
1 parent cae8d1f
commit 10579c2
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 14 deletions.
diff --git a/src/index/hnsw/faiss_hnsw.cc b/src/index/hnsw/faiss_hnsw.cc
@@ -2272,21 +2272,21 @@ class BaseFaissRegularIndexHNSWPRQNodeTemplate : public BaseFaissRegularIndexHNS
     }
 };
 
-// MV is only for compatibility
-#ifdef KNOWHERE_WITH_CARDINAL
-KNOWHERE_SIMPLE_REGISTER_DENSE_FLOAT_ALL_GLOBAL(HNSW_DEPRECATED,
-                                                BaseFaissRegularIndexHNSWFlatNodeTemplateWithSearchFallback,
-                                                knowhere::feature::MMAP | knowhere::feature::MV)
-#else
-KNOWHERE_SIMPLE_REGISTER_DENSE_FLOAT_ALL_GLOBAL(HNSW, BaseFaissRegularIndexHNSWFlatNodeTemplateWithSearchFallback,
-                                                knowhere::feature::MMAP | knowhere::feature::MV)
-#endif
+//// MV is only for compatibility
+// #ifdef KNOWHERE_WITH_CARDINAL
+// KNOWHERE_SIMPLE_REGISTER_DENSE_FLOAT_ALL_GLOBAL(HNSW_DEPRECATED,
+//                                                 BaseFaissRegularIndexHNSWFlatNodeTemplateWithSearchFallback,
+//                                                 knowhere::feature::MMAP | knowhere::feature::MV)
+// #else
+// KNOWHERE_SIMPLE_REGISTER_DENSE_FLOAT_ALL_GLOBAL(HNSW, BaseFaissRegularIndexHNSWFlatNodeTemplateWithSearchFallback,
+//                                                 knowhere::feature::MMAP | knowhere::feature::MV)
+// #endif
 
 KNOWHERE_SIMPLE_REGISTER_DENSE_FLOAT_ALL_GLOBAL(HNSW_SQ, BaseFaissRegularIndexHNSWSQNodeTemplate,
-                                                knowhere::feature::MMAP)
+                                                knowhere::feature::NONE)
 KNOWHERE_SIMPLE_REGISTER_DENSE_FLOAT_ALL_GLOBAL(HNSW_PQ, BaseFaissRegularIndexHNSWPQNodeTemplate,
-                                                knowhere::feature::MMAP)
+                                                knowhere::feature::NONE)
 KNOWHERE_SIMPLE_REGISTER_DENSE_FLOAT_ALL_GLOBAL(HNSW_PRQ, BaseFaissRegularIndexHNSWPRQNodeTemplate,
-                                                knowhere::feature::MMAP)
+                                                knowhere::feature::NONE)
 
 }  // namespace knowhere
diff --git a/src/index/hnsw/hnsw.cc b/src/index/hnsw/hnsw.cc
@@ -36,7 +36,11 @@ template class HnswIndexNode<knowhere::fp32, hnswlib::QuantType::None>;
 template class HnswIndexNode<knowhere::fp16, hnswlib::QuantType::None>;
 template class HnswIndexNode<knowhere::bf16, hnswlib::QuantType::None>;
 
-KNOWHERE_SIMPLE_REGISTER_DENSE_ALL_GLOBAL(HNSWLIB_DEPRECATED, HnswIndexNode,
-                                          knowhere::feature::MMAP | knowhere::feature::MV)
+#ifdef KNOWHERE_WITH_CARDINAL
+KNOWHERE_SIMPLE_REGISTER_DENSE_FLOAT_ALL_GLOBAL(HNSW_DEPRECATED, HnswIndexNode,
+                                                knowhere::feature::MMAP | knowhere::feature::MV)
+#else
+KNOWHERE_SIMPLE_REGISTER_DENSE_FLOAT_ALL_GLOBAL(HNSW, HnswIndexNode, knowhere::feature::MMAP | knowhere::feature::MV)
+#endif
 
 }  // namespace knowhere