Fix faiss simdlib bug (#155)

Signed-off-by: chasingegg <[email protected]>
zilliztech · Oct 18, 2023 · 1dc6e21 · 1dc6e21
1 parent 97549c3
commit 1dc6e21
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 6 deletions.
diff --git a/cmake/libs/libfaiss.cmake b/cmake/libs/libfaiss.cmake
@@ -8,7 +8,9 @@ knowhere_file_glob(GLOB FAISS_AVX512_SRCS
 
 knowhere_file_glob(GLOB FAISS_AVX2_SRCS
                    thirdparty/faiss/faiss/impl/*avx.cpp
+                   thirdparty/faiss/faiss/impl/pq4_fast_scan_search_1.cpp
                    thirdparty/faiss/faiss/impl/pq4_fast_scan_search_qbs.cpp
+                   thirdparty/faiss/faiss/IndexPQFastScan.cpp
                    thirdparty/faiss/faiss/IndexIVFPQFastScan.cpp)
 
 list(REMOVE_ITEM FAISS_SRCS ${FAISS_AVX512_SRCS})

diff --git a/thirdparty/faiss/faiss/impl/ResidualQuantizer.cpp b/thirdparty/faiss/faiss/impl/ResidualQuantizer.cpp
@@ -28,7 +28,6 @@
 #include <faiss/utils/Heap.h>
 #include <faiss/utils/distances.h>
 #include <faiss/utils/hamming.h>
-#include <faiss/utils/simdlib.h>
 #include <faiss/utils/utils.h>
 
 extern "C" {

diff --git a/thirdparty/faiss/faiss/impl/pq4_fast_scan.cpp b/thirdparty/faiss/faiss/impl/pq4_fast_scan.cpp
@@ -7,13 +7,12 @@
 
 #include <faiss/impl/FaissAssert.h>
 #include <faiss/impl/pq4_fast_scan.h>
-#include <faiss/impl/simd_result_handlers.h>
+#include <cstring>
 
 #include <array>
 
 namespace faiss {
 
-using namespace simd_result_handlers;
 
 /***************************************************************
  * Packing functions for codes

diff --git a/thirdparty/faiss/faiss/utils/hamming-inl.h b/thirdparty/faiss/faiss/utils/hamming-inl.h
@@ -6,7 +6,7 @@
  */
 
 #include <faiss/utils/binary_distances.h>
-#include <faiss/utils/simdlib.h>
+
 namespace faiss {
 
 extern const uint8_t hamdis_tab_ham_bytes[256];

diff --git a/thirdparty/faiss/faiss/utils/jaccard-inl.h b/thirdparty/faiss/faiss/utils/jaccard-inl.h
@@ -16,7 +16,7 @@
 #define FAISS_JACCARD_INL_H
 
 #include <faiss/utils/binary_distances.h>
-#include <faiss/utils/simdlib.h>
+
 namespace faiss {
 
 struct JaccardComputer8 {

diff --git a/thirdparty/faiss/faiss/utils/partitioning.cpp b/thirdparty/faiss/faiss/utils/partitioning.cpp
@@ -13,8 +13,9 @@
 #include <faiss/impl/FaissAssert.h>
 #include <faiss/utils/AlignedTable.h>
 #include <faiss/utils/ordered_key_value.h>
+#ifdef __AVX2__
 #include <faiss/utils/simdlib.h>
-
+#endif
 #include <faiss/impl/platform_macros.h>
 
 namespace faiss {
@@ -222,6 +223,7 @@ typename C::T partition_fuzzy_median3(
  * SIMD routines when vals is an aligned array of uint16_t
  ******************************************************************/
 
+#ifdef __AVX2__
 namespace simd_partitioning {
 
 void find_minimax(
@@ -738,6 +740,8 @@ uint16_t simd_partition_with_bounds(
 
 } // namespace simd_partitioning
 
+#endif
+
 /******************************************************************
  * Driver routine
  ******************************************************************/