diff options
| author | chausner <15180557+chausner@users.noreply.github.com> | 2021-09-29 17:36:49 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-29 08:36:49 -0700 |
| commit | 6591df6fd8e16260cfc26cc7ee1f4a9bea6f674e (patch) | |
| tree | 4acc9cda5e120a589ac1f9230953ba9db56c2048 | |
| parent | 39ed6e65af18f838f4acb7b031f00d5328c59f5d (diff) | |
| download | vcpkg-6591df6fd8e16260cfc26cc7ee1f4a9bea6f674e.tar.gz vcpkg-6591df6fd8e16260cfc26cc7ee1f4a9bea6f674e.zip | |
[onednn] Update to 2.3.2 (#20396)
* Update onednn to 2.3.2
* Update CI baseline
* Fix vcpkg_cmake_config_fixup
* Update git-tree hash
* Update portfile.cmake
* Update versions/o-/onednn.json
Co-authored-by: chausner <chausner@users.noreply.github.com>
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
| -rw-r--r-- | ports/onednn/portfile.cmake | 15 | ||||
| -rw-r--r-- | ports/onednn/vcpkg.json | 16 | ||||
| -rw-r--r-- | versions/baseline.json | 4 | ||||
| -rw-r--r-- | versions/o-/onednn.json | 5 |
4 files changed, 27 insertions, 13 deletions
diff --git a/ports/onednn/portfile.cmake b/ports/onednn/portfile.cmake index c2179d5ff..69d0a17e7 100644 --- a/ports/onednn/portfile.cmake +++ b/ports/onednn/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_fail_port_install(ON_ARCH "x86" "arm" ON_TARGET "uwp") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO oneapi-src/oneDNN - REF v2.0 - SHA512 740fa871e29edc8bb8a54d4ba615e856712f7f63efe4c70f4a3d5f6d143d60bc51366b9355ab4b6702718ba711b48350ea49b1335ec10c1dc4f655cc9728ff3e + REF v2.3.2 + SHA512 14B3E6E40F29250AAE1FC677E6723953CA3BFBC9544B32CA1AE51ABA35DAB53C8CFCC58DD57610E644EB324821F3F370A31E8D960B1E4D5AF0C066441ED7FF45 HEAD_REF master ) @@ -12,18 +12,17 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL static) set(DNNL_OPTIONS "-DDNNL_LIBRARY_TYPE=STATIC") endif() -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${DNNL_OPTIONS} ) -vcpkg_install_cmake() +vcpkg_cmake_install() # The port name and the find_package() name are different (onednn versus dnnl) -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/dnnl TARGET_PATH share/dnnl) +vcpkg_cmake_config_fixup(PACKAGE_NAME dnnl CONFIG_PATH lib/cmake/dnnl) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") # Copyright and license -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) diff --git a/ports/onednn/vcpkg.json b/ports/onednn/vcpkg.json index 86f7989f4..7e46d72ba 100644 --- a/ports/onednn/vcpkg.json +++ b/ports/onednn/vcpkg.json @@ -1,7 +1,17 @@ { "name": "onednn", - "version-string": "2.0", - "port-version": 1, + "version-semver": "2.3.2", "description": "oneAPI Deep Neural Network Library (oneDNN)", - "supports": "x64 & !uwp" + "homepage": "https://github.com/oneapi-src/oneDNN", + "supports": "x64 & !uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index c91372a19..ebc618660 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4741,8 +4741,8 @@ "port-version": 0 }, "onednn": { - "baseline": "2.0", - "port-version": 1 + "baseline": "2.3.2", + "port-version": 0 }, "oniguruma": { "baseline": "6.9.4", diff --git a/versions/o-/onednn.json b/versions/o-/onednn.json index f403b00d0..c3cfeb886 100644 --- a/versions/o-/onednn.json +++ b/versions/o-/onednn.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "3d3bacca42ae3bc1a41217c50f23953f13220732", + "version-semver": "2.3.2", + "port-version": 0 + }, + { "git-tree": "c48b3b7e1da48208cce9dbd5ee231d8c087b29ac", "version-string": "2.0", "port-version": 1 |