Update faiss commit and resolve conflict

Signed-off-by: Heemin Kim <[email protected]>
opensearch-project · Feb 1, 2024 · b14f238 · b14f238
1 parent fe592f5
commit b14f238
Show file tree

Hide file tree

Showing 15 changed files with 964 additions and 1,079 deletions.
diff --git a/jni/CMakeLists.txt b/jni/CMakeLists.txt
@@ -162,17 +162,14 @@ if (${CONFIG_FAISS} STREQUAL ON OR ${CONFIG_ALL} STREQUAL ON OR ${CONFIG_TEST} S
         ${TARGET_LIB_FAISS} SHARED
         ${CMAKE_CURRENT_SOURCE_DIR}/src/org_opensearch_knn_jni_FaissService.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/src/faiss_wrapper.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/knn_extension/faiss/utils/BitSet.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/knn_extension/faiss/MultiVectorResultCollector.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/knn_extension/faiss/MultiVectorResultCollectorFactory.cpp)
+    )
     target_link_libraries(${TARGET_LIB_FAISS} faiss ${TARGET_LIB_COMMON} OpenMP::OpenMP_CXX)
     target_include_directories(${TARGET_LIB_FAISS} PRIVATE
         ${CMAKE_CURRENT_SOURCE_DIR}/include
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/knn_extension/faiss
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/knn_extension/faiss/utils
         $ENV{JAVA_HOME}/include
         $ENV{JAVA_HOME}/include/${JVM_OS_TYPE}
-        ${CMAKE_CURRENT_SOURCE_DIR}/external/faiss)
+        ${CMAKE_CURRENT_SOURCE_DIR}/external/faiss
+    )
     set_target_properties(${TARGET_LIB_FAISS} PROPERTIES SUFFIX ${LIB_EXT})
     set_target_properties(${TARGET_LIB_FAISS} PROPERTIES POSITION_INDEPENDENT_CODE ON)
 
@@ -211,10 +208,6 @@ if ("${WIN32}" STREQUAL "")
                 tests/faiss_wrapper_test.cpp
                 tests/nmslib_wrapper_test.cpp
                 tests/test_util.cpp
-                tests/knn_extension/faiss/utils/BitSetTest.cpp
-                tests/knn_extension/faiss/utils/HeapTest.cpp
-                tests/knn_extension/faiss/MultiVectorResultCollectorTest.cpp
-                tests/knn_extension/faiss/MultiVectorResultCollectorFactoryTest.cpp
                 )
 
         target_link_libraries(

diff --git a/jni/external/faiss b/jni/external/faiss
diff --git a/jni/include/knn_extension/faiss/MultiVectorResultCollector.h b/jni/include/knn_extension/faiss/MultiVectorResultCollector.h
diff --git a/jni/include/knn_extension/faiss/MultiVectorResultCollectorFactory.h b/jni/include/knn_extension/faiss/MultiVectorResultCollectorFactory.h
diff --git a/jni/include/knn_extension/faiss/utils/BitSet.h b/jni/include/knn_extension/faiss/utils/BitSet.h