diff options
| author | Park DongHa <luncliff@gmail.com> | 2021-05-06 05:37:53 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-05 13:37:53 -0700 |
| commit | 4ef97c2c33275d7b763e3f5b3308f4bead0a0b08 (patch) | |
| tree | ece6d513c87865cf01e07b6a9863e8d78dd16cd9 /ports/fbgemm | |
| parent | 27fe7a50db33aa5a6a004449d2645797bdb47248 (diff) | |
| download | vcpkg-4ef97c2c33275d7b763e3f5b3308f4bead0a0b08.tar.gz vcpkg-4ef97c2c33275d7b763e3f5b3308f4bead0a0b08.zip | |
[cpuinfo,fbgemm,nnpack] update to latest source version and rename targets (#17063)
* [cpuinfo] update to latest
* [cpuinfo] update baseline and port SHA
* Update ports/cpuinfo/fix-install.patch
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
* Update ports/cpuinfo/fix-install.patch
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
* Update ports/cpuinfo/portfile.cmake
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
* Update ports/cpuinfo/fix-install.patch
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
* [cpuinfo] update port SHA
* [cpuinfo] recover find_package
* fixup target path to `share/unofficial-cpuinfo`
* change IMPORTED target name to `unofficial::cpuinfo::cpuinfo`
* [fbgemm] resolve failure after cpuinfo rename
* change cpuinfo::cpuinfo to unofficial
* [fbgemm] update port version
* [nnpack] use changes target name
* [nnpack] update port-version
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
Diffstat (limited to 'ports/fbgemm')
| -rw-r--r-- | ports/fbgemm/fix-cmakelists.patch | 10 | ||||
| -rw-r--r-- | ports/fbgemm/vcpkg.json | 1 |
2 files changed, 6 insertions, 5 deletions
diff --git a/ports/fbgemm/fix-cmakelists.patch b/ports/fbgemm/fix-cmakelists.patch index 3f0b9015c..1d26e80a9 100644 --- a/ports/fbgemm/fix-cmakelists.patch +++ b/ports/fbgemm/fix-cmakelists.patch @@ -56,7 +56,7 @@ index 6f19a16..3c758d2 100644 endif()
-if(NOT TARGET cpuinfo)
-+find_package(cpuinfo CONFIG REQUIRED) # target 'cpuinfo::cpuinfo'
++find_package(unofficial-cpuinfo CONFIG REQUIRED) # target 'unofficial::cpuinfo::cpuinfo'
+if(FALSE)
#Download cpuinfo from github if CPUINFO_SOURCE_DIR is not specified.
if(NOT DEFINED CPUINFO_SOURCE_DIR)
@@ -68,7 +68,7 @@ index 6f19a16..3c758d2 100644 - PRIVATE "${ASMJIT_SRC_DIR}/src"
- PRIVATE "${CPUINFO_SOURCE_DIR}/include")
+)
-+target_link_libraries(fbgemm_generic PUBLIC asmjit::asmjit cpuinfo::cpuinfo)
++target_link_libraries(fbgemm_generic PUBLIC asmjit::asmjit unofficial::cpuinfo::cpuinfo)
target_include_directories(fbgemm_avx2 BEFORE
PUBLIC $<BUILD_INTERFACE:${FBGEMM_SOURCE_DIR}>
@@ -76,7 +76,7 @@ index 6f19a16..3c758d2 100644 - PRIVATE "${ASMJIT_SRC_DIR}/src"
- PRIVATE "${CPUINFO_SOURCE_DIR}/include")
+)
-+target_link_libraries(fbgemm_avx2 PUBLIC asmjit::asmjit cpuinfo::cpuinfo)
++target_link_libraries(fbgemm_avx2 PUBLIC asmjit::asmjit unofficial::cpuinfo::cpuinfo)
target_include_directories(fbgemm_avx512 BEFORE
PUBLIC $<BUILD_INTERFACE:${FBGEMM_SOURCE_DIR}>
@@ -95,7 +95,7 @@ index 6f19a16..3c758d2 100644 - $<TARGET_OBJECTS:fbgemm_avx2>
- $<TARGET_OBJECTS:fbgemm_avx512>)
+)
-+target_link_libraries(fbgemm_avx512 PUBLIC asmjit::asmjit cpuinfo::cpuinfo)
++target_link_libraries(fbgemm_avx512 PUBLIC asmjit::asmjit unofficial::cpuinfo::cpuinfo)
+
+add_library(fbgemm
+ $<TARGET_OBJECTS:fbgemm_generic>
@@ -131,7 +131,7 @@ index 6f19a16..3c758d2 100644 -target_link_libraries(fbgemm $<BUILD_INTERFACE:asmjit>
- $<BUILD_INTERFACE:cpuinfo>)
-add_dependencies(fbgemm asmjit cpuinfo)
-+target_link_libraries(fbgemm PUBLIC asmjit::asmjit cpuinfo::cpuinfo)
++target_link_libraries(fbgemm PUBLIC asmjit::asmjit unofficial::cpuinfo::cpuinfo)
install(TARGETS fbgemm EXPORT fbgemmLibraryConfig
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
diff --git a/ports/fbgemm/vcpkg.json b/ports/fbgemm/vcpkg.json index 85ffc1af0..3d1de8260 100644 --- a/ports/fbgemm/vcpkg.json +++ b/ports/fbgemm/vcpkg.json @@ -1,6 +1,7 @@ { "name": "fbgemm", "version-date": "2021-03-18", + "port-version": 1, "description": "FB (Facebook) + GEMM (General Matrix-Matrix Multiplication)", "homepage": "https://code.fb.com/ml-applications/fbgemm/", "supports": "!(x86 | uwp)", |