Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix build error #979

Merged
merged 1 commit into from
Dec 10, 2024
Merged

Fix build error #979

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions cmake/libs/libfaiss.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,13 @@ if(APPLE)
endif()

if(CMAKE_SYSTEM_NAME STREQUAL "Android" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64")
find_package(OpenBLAS REQUIRED)
set(BLAS_LIBRARIES OpenBLAS::OpenBLAS)
find_package(OpenBLAS REQUIRED)
set(BLAS_LIBRARIES OpenBLAS::OpenBLAS)
else()
find_package(BLAS REQUIRED)
find_package(LAPACK REQUIRED)
find_package(BLAS REQUIRED)
endif()

if(__X86_64)
list(REMOVE_ITEM FAISS_SRCS ${FAISS_AVX2_SRCS})

Expand Down Expand Up @@ -113,7 +115,7 @@ if(__X86_64)
-Wno-unused-function
-Wno-strict-aliasing>)
target_link_libraries(
faiss PUBLIC OpenMP::OpenMP_CXX ${BLAS_LIBRARIES}
faiss PUBLIC OpenMP::OpenMP_CXX ${BLAS_LIBRARIES} ${LAPACK_LIBRARIES}
faiss_avx2 faiss_avx512 knowhere_utils)
target_compile_definitions(faiss PRIVATE FINTEGER=int)
endif()
Expand All @@ -135,7 +137,7 @@ if(__AARCH64)
-Wno-strict-aliasing>)

add_dependencies(faiss knowhere_utils)
target_link_libraries(faiss PUBLIC OpenMP::OpenMP_CXX ${BLAS_LIBRARIES}
target_link_libraries(faiss PUBLIC OpenMP::OpenMP_CXX ${BLAS_LIBRARIES} ${LAPACK_LIBRARIES}
knowhere_utils)
target_compile_definitions(faiss PRIVATE FINTEGER=int)
endif()
Expand All @@ -162,7 +164,7 @@ if(__PPC64)
-Wno-strict-aliasing>)

add_dependencies(faiss knowhere_utils)
target_link_libraries(faiss PUBLIC OpenMP::OpenMP_CXX ${BLAS_LIBRARIES}
target_link_libraries(faiss PUBLIC OpenMP::OpenMP_CXX ${BLAS_LIBRARIES} ${LAPACK_LIBRARIES}
knowhere_utils)
target_compile_definitions(faiss PRIVATE FINTEGER=int)
endif()
Loading