aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPark DongHa <luncliff@gmail.com>2021-09-14 12:04:23 +0900
committerGitHub <noreply@github.com>2021-09-13 20:04:23 -0700
commit0e4460554f28d92c5ad01bfe3b79e4b7fd840edf (patch)
tree610af047dddb75a77ee850303d08577fdc06a21d
parentcce4bf5dffff23038f5b2fed911844b9434c5826 (diff)
downloadvcpkg-0e4460554f28d92c5ad01bfe3b79e4b7fd840edf.tar.gz
vcpkg-0e4460554f28d92c5ad01bfe3b79e4b7fd840edf.zip
[fbgemm] fix find_package (#20111)
* [fbgemm] fix find_package * install internal header for pytorch * [fbgemm] remove GPU feature * The source requires ATen and some other libraries ...
-rw-r--r--ports/fbgemm/portfile.cmake16
-rw-r--r--ports/fbgemm/vcpkg.json12
-rw-r--r--versions/baseline.json2
-rw-r--r--versions/f-/fbgemm.json5
4 files changed, 25 insertions, 10 deletions
diff --git a/ports/fbgemm/portfile.cmake b/ports/fbgemm/portfile.cmake
index b61db3979..ee0da8e80 100644
--- a/ports/fbgemm/portfile.cmake
+++ b/ports/fbgemm/portfile.cmake
@@ -12,18 +12,20 @@ vcpkg_from_github(
fix-cmakelists.patch
)
-vcpkg_configure_cmake(
- SOURCE_PATH ${SOURCE_PATH}
- PREFER_NINJA
+vcpkg_cmake_configure(
+ SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
-DUSE_SANITIZER=OFF
-DFBGEMM_BUILD_TESTS=OFF
-DFBGEMM_BUILD_BENCHMARKS=OFF
-DPYTHON_EXECUTABLE=${PYTHON3} # inject the path instead of find_package(Python)
)
-vcpkg_install_cmake()
+vcpkg_cmake_install()
vcpkg_copy_pdbs()
-vcpkg_fixup_cmake_targets(CONFIG_PATH share/cmake/${PORT})
+vcpkg_cmake_config_fixup(PACKAGE_NAME fbgemmLibrary CONFIG_PATH share/cmake/${PORT})
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+# this internal header is required by pytorch
+file(INSTALL "${SOURCE_PATH}/src/RefImplementations.h"
+ DESTINATION "${CURRENT_PACKAGES_DIR}/include/fbgemm/src")
+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/fbgemm/vcpkg.json b/ports/fbgemm/vcpkg.json
index 3d1de8260..aeddbfe0d 100644
--- a/ports/fbgemm/vcpkg.json
+++ b/ports/fbgemm/vcpkg.json
@@ -1,12 +1,20 @@
{
"name": "fbgemm",
"version-date": "2021-03-18",
- "port-version": 1,
+ "port-version": 2,
"description": "FB (Facebook) + GEMM (General Matrix-Matrix Multiplication)",
"homepage": "https://code.fb.com/ml-applications/fbgemm/",
"supports": "!(x86 | uwp)",
"dependencies": [
"asmjit",
- "cpuinfo"
+ "cpuinfo",
+ {
+ "name": "vcpkg-cmake",
+ "host": true
+ },
+ {
+ "name": "vcpkg-cmake-config",
+ "host": true
+ }
]
}
diff --git a/versions/baseline.json b/versions/baseline.json
index 42af23cce..f6c7eda8a 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -2030,7 +2030,7 @@
},
"fbgemm": {
"baseline": "2021-03-18",
- "port-version": 1
+ "port-version": 2
},
"fbthrift": {
"baseline": "2021.06.14.00",
diff --git a/versions/f-/fbgemm.json b/versions/f-/fbgemm.json
index ae67aa190..2308259e2 100644
--- a/versions/f-/fbgemm.json
+++ b/versions/f-/fbgemm.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "8707b988ad38aae04720ce3494ef09603bd67954",
+ "version-date": "2021-03-18",
+ "port-version": 2
+ },
+ {
"git-tree": "6f3e815d3e806243cddff7b0e262d130ef702e98",
"version-date": "2021-03-18",
"port-version": 1