[faiss] update to 1.8.0 (#41161)

This commit is contained in:
Jia Yue Hua 2024-10-29 17:27:05 +08:00 committed by GitHub
parent 3bf6fd4baa
commit f854929402
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 19 additions and 9 deletions

View File

@ -11,29 +11,34 @@ index 43ea9d4..437a7f8 100644
+find_dependency(LAPACK REQUIRED)
include("${CMAKE_CURRENT_LIST_DIR}/faiss-targets.cmake")
diff --git a/faiss/CMakeLists.txt b/faiss/CMakeLists.txt
index 30d573f..9af8baf 100644
index a890a46..5a67a92 100644
--- a/faiss/CMakeLists.txt
+++ b/faiss/CMakeLists.txt
@@ -212,17 +212,17 @@ target_link_libraries(faiss PRIVATE OpenMP::OpenMP_CXX)
target_link_libraries(faiss_avx2 PRIVATE OpenMP::OpenMP_CXX)
@@ -300,20 +300,20 @@ target_link_libraries(faiss_avx2 PRIVATE OpenMP::OpenMP_CXX)
target_link_libraries(faiss_avx512 PRIVATE OpenMP::OpenMP_CXX)
find_package(MKL)
-if(MKL_FOUND)
+if(0)
target_link_libraries(faiss PRIVATE ${MKL_LIBRARIES})
target_link_libraries(faiss_avx2 PRIVATE ${MKL_LIBRARIES})
target_link_libraries(faiss_avx512 PRIVATE ${MKL_LIBRARIES})
else()
find_package(BLAS REQUIRED)
- target_link_libraries(faiss PRIVATE ${BLAS_LIBRARIES})
- target_link_libraries(faiss_avx2 PRIVATE ${BLAS_LIBRARIES})
- target_link_libraries(faiss_avx512 PRIVATE ${BLAS_LIBRARIES})
+ target_link_libraries(faiss PRIVATE BLAS::BLAS)
+ target_link_libraries(faiss_avx2 PRIVATE BLAS::BLAS)
+ target_link_libraries(faiss_avx512 PRIVATE BLAS::BLAS)
find_package(LAPACK REQUIRED)
- target_link_libraries(faiss PRIVATE ${LAPACK_LIBRARIES})
- target_link_libraries(faiss_avx2 PRIVATE ${LAPACK_LIBRARIES})
- target_link_libraries(faiss_avx512 PRIVATE ${LAPACK_LIBRARIES})
+ target_link_libraries(faiss PRIVATE LAPACK::LAPACK)
+ target_link_libraries(faiss_avx2 PRIVATE LAPACK::LAPACK)
+ target_link_libraries(faiss_avx512 PRIVATE LAPACK::LAPACK)
endif()
install(TARGETS faiss

View File

@ -1,8 +1,8 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO facebookresearch/faiss
REF v1.7.4
SHA512 9622fb989cb2e1879450c2ad257cb55d0c0c639f54f0815e4781f4e4b2ae2f01779f5c8c0738ae9a29fde7e418587e6a92e91240d36c1ca051a6228bfb777638
REF "v${VERSION}"
SHA512 38d4215e3e019915d8b367ff0e8d14901b1495f6f45b835e9248276567a422b0370baab6bd887045442dd1e268b7fe7c347107162e66bb3ec6b1a53be4b2e441
HEAD_REF master
PATCHES
fix-dependencies.patch

View File

@ -1,7 +1,6 @@
{
"name": "faiss",
"version": "1.7.4",
"port-version": 1,
"version": "1.8.0",
"description": "Faiss is a library for efficient similarity search and clustering of dense vectors.",
"homepage": "https://github.com/facebookresearch/faiss",
"license": "MIT",
@ -21,6 +20,7 @@
"features": {
"gpu": {
"description": "Whether to enable GPU support",
"supports": "!uwp & !osx & !x86 & !windows",
"dependencies": [
"cuda"
]

View File

@ -2641,8 +2641,8 @@
"port-version": 2
},
"faiss": {
"baseline": "1.7.4",
"port-version": 1
"baseline": "1.8.0",
"port-version": 0
},
"fakeit": {
"baseline": "2.4.1",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "e711ba8ab9d73c53bfe501023ae42a46b0de7f03",
"version": "1.8.0",
"port-version": 0
},
{
"git-tree": "bc836dd883cc277c5b11a98e8155f53503ef37f9",
"version": "1.7.4",