[faiss] update to v1.7.1 (#19752)

* [faiss] update to v1.7.1

* update version

* update vcpkg.json format

* update version

* update patch

* update version

* Remove duplicate variable usage from the patch.

* x-add-version

Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>

5 files changed, 34 insertions, 20 deletions

diff --git a/ports/faiss/fix-dependencies.patch b/ports/faiss/fix-dependencies.patch
index caddb6b57..81b9fd58f 100644
--- a/ports/faiss/fix-dependencies.patch
+++ b/ports/faiss/fix-dependencies.patch
@@ -1,5 +1,5 @@
 diff --git a/cmake/faiss-config.cmake.in b/cmake/faiss-config.cmake.in

-index 43ea9d4c..437a7f81 100644

+index 43ea9d4..437a7f8 100644

 --- a/cmake/faiss-config.cmake.in

 +++ b/cmake/faiss-config.cmake.in

 @@ -4,4 +4,7 @@

@@ -11,24 +11,29 @@ index 43ea9d4c..437a7f81 100644
 +find_dependency(LAPACK REQUIRED)

  include("${CMAKE_CURRENT_LIST_DIR}/faiss-targets.cmake")

 diff --git a/faiss/CMakeLists.txt b/faiss/CMakeLists.txt

-index 51680fd1..691f52c2 100644

+index 30d573f..9af8baf 100644

 --- a/faiss/CMakeLists.txt

 +++ b/faiss/CMakeLists.txt

-@@ -148,14 +148,14 @@ find_package(OpenMP REQUIRED)

- target_link_libraries(faiss PRIVATE OpenMP::OpenMP_CXX)

+@@ -212,17 +212,17 @@ target_link_libraries(faiss PRIVATE OpenMP::OpenMP_CXX)

+ target_link_libraries(faiss_avx2 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})

  else()

    find_package(BLAS REQUIRED)

 -  target_link_libraries(faiss PRIVATE ${BLAS_LIBRARIES})

+-  target_link_libraries(faiss_avx2 PRIVATE ${BLAS_LIBRARIES})

 +  target_link_libraries(faiss PRIVATE BLAS::BLAS)

++  target_link_libraries(faiss_avx2 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 PRIVATE LAPACK::LAPACK)

++  target_link_libraries(faiss_avx2 PRIVATE LAPACK::LAPACK)

  endif()

  

  install(TARGETS faiss

diff --git a/ports/faiss/portfile.cmake b/ports/faiss/portfile.cmake
index 51529558f..f2670da79 100644
--- a/ports/faiss/portfile.cmake
+++ b/ports/faiss/portfile.cmake
@@ -3,8 +3,8 @@ vcpkg_fail_port_install(ON_ARCH "x86" ON_TARGET "uwp" "osx")
 vcpkg_from_github(

     OUT_SOURCE_PATH SOURCE_PATH

     REPO facebookresearch/faiss

-    REF 0fb6c00cfa9487416b5cdf514f5f796476eecb06 # v1.6.4

-    SHA512 c7019615103fd29124c1f4458a47faebc5fe35545eea185c41cf643f2eabe82d134dc558c85f67faea7680c292abd7477ceefde157a7c3969eda78b77a23462b 

+    REF cff072b78ef019998990c6ba02df83dd7d3c8d38 # v1.7.1

+    SHA512 08d4acf30b6a2a0f326cb71035b58e65f05e70817edbf9dda7d5f8b53d4fb722909c2412d42dca4d88d0576a3da528c2db869fb4fd6fb2343b7acad80066051d 

     HEAD_REF master

     PATCHES

         fix-dependencies.patch

@@ -21,23 +21,20 @@ if ("${FAISS_ENABLE_GPU}")
     endif()

 endif()

 

-vcpkg_configure_cmake(

-    SOURCE_PATH ${SOURCE_PATH}

-    PREFER_NINJA

+vcpkg_cmake_configure(

+    SOURCE_PATH "${SOURCE_PATH}"

     OPTIONS

         ${FEATURE_OPTIONS}

         -DFAISS_ENABLE_PYTHON=OFF  # Requires SWIG

+        -DBUILD_TESTING=OFF

 )

 

-vcpkg_install_cmake()

+vcpkg_cmake_install()

 

-vcpkg_fixup_cmake_targets()

+vcpkg_cmake_config_fixup()

 

 vcpkg_copy_pdbs()

 

-file(INSTALL ${SOURCE_PATH}/LICENSE

-     DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}

-     RENAME copyright

-)

+file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

 

 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")

diff --git a/ports/faiss/vcpkg.json b/ports/faiss/vcpkg.json
index 4b9c63691..dfc5e14b1 100644
--- a/ports/faiss/vcpkg.json
+++ b/ports/faiss/vcpkg.json
@@ -1,14 +1,21 @@
 {
   "name": "faiss",
-  "version-semver": "1.6.4",
-  "port-version": 1,
+  "version-semver": "1.7.1",
   "description": "Faiss is a library for efficient similarity search and clustering of dense vectors.",
   "homepage": "https://github.com/facebookresearch/faiss",
   "license": "MIT",
   "supports": "!uwp & !osx & !x86",
   "dependencies": [
     "lapack",
-    "openblas"
+    "openblas",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
   ],
   "features": {
     "gpu": {
diff --git a/versions/baseline.json b/versions/baseline.json
index 4cd592e04..4c514787f 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -1953,8 +1953,8 @@
       "port-version": 0
     },
     "faiss": {
-      "baseline": "1.6.4",
-      "port-version": 1
+      "baseline": "1.7.1",
+      "port-version": 0
     },
     "fakeit": {
       "baseline": "2.0.7",
diff --git a/versions/f-/faiss.json b/versions/f-/faiss.json
index e98b785dc..8e9e24bd9 100644
--- a/versions/f-/faiss.json
+++ b/versions/f-/faiss.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "7c8e333f76263e7ca027e52fdf1d14b025be234c",
+      "version-semver": "1.7.1",
+      "port-version": 0
+    },
+    {
       "git-tree": "eb401df0155a10cfc7cba057bbf63d10fdc37067",
       "version-semver": "1.6.4",
       "port-version": 1