Skip to content

Conversation

@chausner
Copy link
Contributor

Describe the pull request

  • What does your PR fix?

    Updates faiss to 1.7.2

  • Which triplets are supported/not supported? Have you updated the CI baseline?

    As before, Yes

  • Does your PR follow the maintainer guide?

    Yes

  • If you have added/updated a port: Have you run ./vcpkg x-add-version --all and committed the result?

    Yes

@JonLiu1993 JonLiu1993 self-assigned this Jan 24, 2022
@JonLiu1993 JonLiu1993 added the category:port-update The issue is with a library, which is requesting update new revision label Jan 24, 2022
@JonLiu1993
Copy link
Contributor

JonLiu1993 commented Jan 24, 2022

@chausner ,Thanks for your pr, Have you test the feature locally?
I tested the x64-windows triplet but failed :

[1/2] cmd /c "cd ../../x64-windows-dbg && "E:/feature test/vcpkg/downloads/tools/cmake-3.21.1-windows/cmake-3.21.1-windows-i386/bin/cmake.exe" "E:/feature test/vcpkg/ports/blas" "-DCMAKE_PREFIX_PATH="E:/feature test/vcpkg/packages/blas_x64-windows"" "-DBUILD_SHARED_LIBS=ON" "-DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=E:/feature test/vcpkg/scripts/toolchains/windows.cmake" "-DVCPKG_TARGET_TRIPLET=x64-windows" "-DVCPKG_SET_CHARSET_FLAG=ON" "-DVCPKG_PLATFORM_TOOLSET=v142" "-DCMAKE_EXPORT_NO_PACKAGE_REGISTRY=ON" "-DCMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY=ON" "-DCMAKE_FIND_PACKAGE_NO_SYSTEM_PACKAGE_REGISTRY=ON" "-DCMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP=TRUE" "-DCMAKE_VERBOSE_MAKEFILE=ON" "-DVCPKG_APPLOCAL_DEPS=OFF" "-DCMAKE_TOOLCHAIN_FILE=E:/feature test/vcpkg/scripts/buildsystems/vcpkg.cmake" "-DCMAKE_ERROR_ON_ABSOLUTE_INSTALL_DESTINATION=ON" "-DVCPKG_CXX_FLAGS=" "-DVCPKG_CXX_FLAGS_RELEASE=" "-DVCPKG_CXX_FLAGS_DEBUG=" "-DVCPKG_C_FLAGS=" "-DVCPKG_C_FLAGS_RELEASE=" "-DVCPKG_C_FLAGS_DEBUG=" "-DVCPKG_CRT_LINKAGE=dynamic" "-DVCPKG_LINKER_FLAGS=" "-DVCPKG_LINKER_FLAGS_RELEASE=" "-DVCPKG_LINKER_FLAGS_DEBUG=" "-DVCPKG_TARGET_ARCHITECTURE=x64" "-DCMAKE_INSTALL_LIBDIR:STRING=lib" "-DCMAKE_INSTALL_BINDIR:STRING=bin" "-D_VCPKG_ROOT_DIR=E:/feature test/vcpkg" "-DZ_VCPKG_ROOT_DIR=E:/feature test/vcpkg" "-D_VCPKG_INSTALLED_DIR=E:/feature test/vcpkg/installed" "-DVCPKG_MANIFEST_INSTALL=OFF" "-Ax64" "-G" "Visual Studio 16 2019" "-DCMAKE_BUILD_TYPE=Debug" "-DCMAKE_INSTALL_PREFIX=E:/feature test/vcpkg/packages/blas_x64-windows/debug""
FAILED: ../../x64-windows-dbg/CMakeCache.txt
cmd /c "cd ../../x64-windows-dbg && "E:/feature test/vcpkg/downloads/tools/cmake-3.21.1-windows/cmake-3.21.1-windows-i386/bin/cmake.exe" "E:/feature test/vcpkg/ports/blas" "-DCMAKE_PREFIX_PATH="E:/feature test/vcpkg/packages/blas_x64-windows"" "-DBUILD_SHARED_LIBS=ON" "-DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=E:/feature test/vcpkg/scripts/toolchains/windows.cmake" "-DVCPKG_TARGET_TRIPLET=x64-windows" "-DVCPKG_SET_CHARSET_FLAG=ON" "-DVCPKG_PLATFORM_TOOLSET=v142" "-DCMAKE_EXPORT_NO_PACKAGE_REGISTRY=ON" "-DCMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY=ON" "-DCMAKE_FIND_PACKAGE_NO_SYSTEM_PACKAGE_REGISTRY=ON" "-DCMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP=TRUE" "-DCMAKE_VERBOSE_MAKEFILE=ON" "-DVCPKG_APPLOCAL_DEPS=OFF" "-DCMAKE_TOOLCHAIN_FILE=E:/feature test/vcpkg/scripts/buildsystems/vcpkg.cmake" "-DCMAKE_ERROR_ON_ABSOLUTE_INSTALL_DESTINATION=ON" "-DVCPKG_CXX_FLAGS=" "-DVCPKG_CXX_FLAGS_RELEASE=" "-DVCPKG_CXX_FLAGS_DEBUG=" "-DVCPKG_C_FLAGS=" "-DVCPKG_C_FLAGS_RELEASE=" "-DVCPKG_C_FLAGS_DEBUG=" "-DVCPKG_CRT_LINKAGE=dynamic" "-DVCPKG_LINKER_FLAGS=" "-DVCPKG_LINKER_FLAGS_RELEASE=" "-DVCPKG_LINKER_FLAGS_DEBUG=" "-DVCPKG_TARGET_ARCHITECTURE=x64" "-DCMAKE_INSTALL_LIBDIR:STRING=lib" "-DCMAKE_INSTALL_BINDIR:STRING=bin" "-D_VCPKG_ROOT_DIR=E:/feature test/vcpkg" "-DZ_VCPKG_ROOT_DIR=E:/feature test/vcpkg" "-D_VCPKG_INSTALLED_DIR=E:/feature test/vcpkg/installed" "-DVCPKG_MANIFEST_INSTALL=OFF" "-Ax64" "-G" "Visual Studio 16 2019" "-DCMAKE_BUILD_TYPE=Debug" "-DCMAKE_INSTALL_PREFIX=E:/feature test/vcpkg/packages/blas_x64-windows/debug""
CMake Error: The source directory "E:/feature test/vcpkg/buildtrees/blas/x64-windows-dbg/test/vcpkg/packages/blas_x64-windows" does not exist.
Specify --help for usage, or press the help button on the CMake GUI.
[2/2] cmd /c "cd .. && "E:/feature test/vcpkg/downloads/tools/cmake-3.21.1-windows/cmake-3.21.1-windows-i386/bin/cmake.exe" "E:/feature test/vcpkg/ports/blas" "-DCMAKE_PREFIX_PATH="E:/feature test/vcpkg/packages/blas_x64-windows"" "-DBUILD_SHARED_LIBS=ON" "-DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=E:/feature test/vcpkg/scripts/toolchains/windows.cmake" "-DVCPKG_TARGET_TRIPLET=x64-windows" "-DVCPKG_SET_CHARSET_FLAG=ON" "-DVCPKG_PLATFORM_TOOLSET=v142" "-DCMAKE_EXPORT_NO_PACKAGE_REGISTRY=ON" "-DCMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY=ON" "-DCMAKE_FIND_PACKAGE_NO_SYSTEM_PACKAGE_REGISTRY=ON" "-DCMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP=TRUE" "-DCMAKE_VERBOSE_MAKEFILE=ON" "-DVCPKG_APPLOCAL_DEPS=OFF" "-DCMAKE_TOOLCHAIN_FILE=E:/feature test/vcpkg/scripts/buildsystems/vcpkg.cmake" "-DCMAKE_ERROR_ON_ABSOLUTE_INSTALL_DESTINATION=ON" "-DVCPKG_CXX_FLAGS=" "-DVCPKG_CXX_FLAGS_RELEASE=" "-DVCPKG_CXX_FLAGS_DEBUG=" "-DVCPKG_C_FLAGS=" "-DVCPKG_C_FLAGS_RELEASE=" "-DVCPKG_C_FLAGS_DEBUG=" "-DVCPKG_CRT_LINKAGE=dynamic" "-DVCPKG_LINKER_FLAGS=" "-DVCPKG_LINKER_FLAGS_RELEASE=" "-DVCPKG_LINKER_FLAGS_DEBUG=" "-DVCPKG_TARGET_ARCHITECTURE=x64" "-DCMAKE_INSTALL_LIBDIR:STRING=lib" "-DCMAKE_INSTALL_BINDIR:STRING=bin" "-D_VCPKG_ROOT_DIR=E:/feature test/vcpkg" "-DZ_VCPKG_ROOT_DIR=E:/feature test/vcpkg" "-D_VCPKG_INSTALLED_DIR=E:/feature test/vcpkg/installed" "-DVCPKG_MANIFEST_INSTALL=OFF" "-Ax64" "-G" "Visual Studio 16 2019" "-DCMAKE_BUILD_TYPE=Release" "-DCMAKE_INSTALL_PREFIX=E:/feature test/vcpkg/packages/blas_x64-windows""
FAILED: ../CMakeCache.txt
cmd /c "cd .. && "E:/feature test/vcpkg/downloads/tools/cmake-3.21.1-windows/cmake-3.21.1-windows-i386/bin/cmake.exe" "E:/feature test/vcpkg/ports/blas" "-DCMAKE_PREFIX_PATH="E:/feature test/vcpkg/packages/blas_x64-windows"" "-DBUILD_SHARED_LIBS=ON" "-DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=E:/feature test/vcpkg/scripts/toolchains/windows.cmake" "-DVCPKG_TARGET_TRIPLET=x64-windows" "-DVCPKG_SET_CHARSET_FLAG=ON" "-DVCPKG_PLATFORM_TOOLSET=v142" "-DCMAKE_EXPORT_NO_PACKAGE_REGISTRY=ON" "-DCMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY=ON" "-DCMAKE_FIND_PACKAGE_NO_SYSTEM_PACKAGE_REGISTRY=ON" "-DCMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP=TRUE" "-DCMAKE_VERBOSE_MAKEFILE=ON" "-DVCPKG_APPLOCAL_DEPS=OFF" "-DCMAKE_TOOLCHAIN_FILE=E:/feature test/vcpkg/scripts/buildsystems/vcpkg.cmake" "-DCMAKE_ERROR_ON_ABSOLUTE_INSTALL_DESTINATION=ON" "-DVCPKG_CXX_FLAGS=" "-DVCPKG_CXX_FLAGS_RELEASE=" "-DVCPKG_CXX_FLAGS_DEBUG=" "-DVCPKG_C_FLAGS=" "-DVCPKG_C_FLAGS_RELEASE=" "-DVCPKG_C_FLAGS_DEBUG=" "-DVCPKG_CRT_LINKAGE=dynamic" "-DVCPKG_LINKER_FLAGS=" "-DVCPKG_LINKER_FLAGS_RELEASE=" "-DVCPKG_LINKER_FLAGS_DEBUG=" "-DVCPKG_TARGET_ARCHITECTURE=x64" "-DCMAKE_INSTALL_LIBDIR:STRING=lib" "-DCMAKE_INSTALL_BINDIR:STRING=bin" "-D_VCPKG_ROOT_DIR=E:/feature test/vcpkg" "-DZ_VCPKG_ROOT_DIR=E:/feature test/vcpkg" "-D_VCPKG_INSTALLED_DIR=E:/feature test/vcpkg/installed" "-DVCPKG_MANIFEST_INSTALL=OFF" "-Ax64" "-G" "Visual Studio 16 2019" "-DCMAKE_BUILD_TYPE=Release" "-DCMAKE_INSTALL_PREFIX=E:/feature test/vcpkg/packages/blas_x64-windows""
CMake Error: The source directory "E:/feature test/vcpkg/buildtrees/blas/x64-windows-rel/test/vcpkg/packages/blas_x64-windows" does not exist.
Specify --help for usage, or press the help button on the CMake GUI.
ninja: build stopped: subcommand failed.

Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

After committing all other changes, the version database must be updated
git add -u && git commit
git checkout 0a9e204dadc20054aafe2d7151136f08ad5637fa -- versions
./vcpkg x-add-version --all
Diff
diff --git a/versions/f-/faiss.json b/versions/f-/faiss.json
index de651c1..58721b0 100644
--- a/versions/f-/faiss.json
+++ b/versions/f-/faiss.json
@@ -1,10 +1,15 @@
 {
   "versions": [
     {
-      "git-tree": "81d02d8ccfb7e2902af99fc401fe71bbcbf0b68d",
+      "git-tree": "1f9afe2148c0cfa76354882e136af60bab695061",
       "version-semver": "1.7.2",
       "port-version": 0
     },
+    {
+      "git-tree": "efbc0f9d771826b57c327d3a008ee4bff6bdbda1",
+      "version-semver": "1.7.1",
+      "port-version": 1
+    },
     {
       "git-tree": "7c8e333f76263e7ca027e52fdf1d14b025be234c",
       "version-semver": "1.7.1",

@chausner
Copy link
Contributor Author

chausner commented Feb 1, 2022

@chausner ,Thanks for your pr, Have you test the feature locally? I tested the x64-windows triplet but failed 👍

I am currently not able to build it locally because it fails building the lapack dependency. I am not sure what the problem is there but at least in CI it seems to succeed on all platforms (except on x86-windows but that error seems more related to some package version conflict).

@JonLiu1993
Copy link
Contributor

@chausner ,I'll test it again locally to investigate

Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

After committing all other changes, the version database must be updated
git add -u && git commit
git checkout 0a9e204dadc20054aafe2d7151136f08ad5637fa -- versions
./vcpkg x-add-version --all
Diff
diff --git a/versions/f-/faiss.json b/versions/f-/faiss.json
index beb43cd..58721b0 100644
--- a/versions/f-/faiss.json
+++ b/versions/f-/faiss.json
@@ -5,6 +5,11 @@
       "version-semver": "1.7.2",
       "port-version": 0
     },
+    {
+      "git-tree": "efbc0f9d771826b57c327d3a008ee4bff6bdbda1",
+      "version-semver": "1.7.1",
+      "port-version": 1
+    },
     {
       "git-tree": "7c8e333f76263e7ca027e52fdf1d14b025be234c",
       "version-semver": "1.7.1",

@JonLiu1993
Copy link
Contributor

All features are tested successfully in the following triplet:

  • x64-windows
  • x64-windows-static

@JonLiu1993 JonLiu1993 added the info:needs-maintainer-attention Lets the current 'on rotation' vcpkg maintainer know they need to look at this. label Feb 10, 2022
@ras0219-msft
Copy link
Contributor

Thanks for the PR!

PRs must not remove or modify existing entries in the version database; please address the bot's review #22705 (review). @JonLiu1993 please take the github bot's review into account before marking info:reviewed

@ras0219-msft ras0219-msft added requires:author-response and removed info:needs-maintainer-attention Lets the current 'on rotation' vcpkg maintainer know they need to look at this. labels Feb 10, 2022
@chausner
Copy link
Contributor Author

PRs must not remove or modify existing entries in the version database; please address the bot's review #22705 (review).

Oops. Should be fixed now.

@JonLiu1993
Copy link
Contributor

github bot's review

When I marked review at that time, I helped users to update faiss.json, maybe I deleted one of the previous entries by mistake, I will seriously consider github bot's review in the future, sincerely thanks for your reminder

@JonLiu1993 JonLiu1993 added the info:needs-maintainer-attention Lets the current 'on rotation' vcpkg maintainer know they need to look at this. label Feb 11, 2022
@ras0219-msft ras0219-msft merged commit 93cdce8 into microsoft:master Feb 11, 2022
@ras0219-msft
Copy link
Contributor

LGTM, thanks everyone!

@chausner chausner deleted the faiss-1.7.2 branch February 11, 2022 23:15
ekilmer added a commit to ekilmer/vcpkg that referenced this pull request Feb 15, 2022
* master: (54 commits)
  [imgui] Update to 1.87 [implot] Update to 0.13 (microsoft#22988)
  [nu-book-zxing-cpp] New port  (microsoft#22657)
  [librabbitmq] Update to 0.11.0 (microsoft#23037)
  [doc] Add doc for `supports` expression `staticcrt` (microsoft#23079)
  [doctest] Update to 2.4.8 (microsoft#23081)
  [log4cplus] Remove unneeded catch dependency (microsoft#23066)
  [Azure SDK] Update vcpkg ports for Feb Release (microsoft#23080)
  [Freerdp] Update to 2.5.0 (microsoft#23095)
  Update vcpkg-tool to 2022-02-11 (microsoft#23059)
  Minor bugfixes to MacOS deployment readme. (microsoft#23062)
  [ci.baseline.txt] Skip colmap on osx due to metis conflict (microsoft#23047)
  [gtkmm] update to 4.6.0 (microsoft#23024)
  [faiss] Update to 1.7.2 (microsoft#22705)
  [ocilib] Disable warning C4191 (microsoft#23028)
  [polyhook2] Update to latest  (microsoft#23044)
  Add notice about how to export unofficial CMake targets. (microsoft#23041)
  [Spirv reflect] Add new port (microsoft#22295)
  [easyhook] Update target .NET Framework version to 4.7.2. (microsoft#23040)
  [gh suggestions] change license link, make it details (microsoft#22946)
  [field3d] Remove port (microsoft#22463)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

category:port-update The issue is with a library, which is requesting update new revision info:needs-maintainer-attention Lets the current 'on rotation' vcpkg maintainer know they need to look at this.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants