зеркало из https://github.com/microsoft/vcpkg.git
[openvino] 2024.0.0 release (#36997)
<!-- If your PR fixes issues, please note that here by adding "Fixes #NNNNNN." for each fixed issue on separate lines. --> <!-- If you are still working on the PR, open it as a Draft: https://github.blog/2019-02-14-introducing-draft-pull-requests/. --> <!-- If this PR updates an existing port, please uncomment and fill out this checklist: - [ ] Changes comply with the [maintainer guide](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/contributing/maintainer-guide.md). - [ ] SHA512s are updated for each updated download. - [ ] The "supports" clause reflects platforms that may be fixed by this new version. - [ ] Any fixed [CI baseline](https://github.com/microsoft/vcpkg/blob/master/scripts/ci.baseline.txt) entries are removed from that file. - [ ] Any patches that are no longer applied are deleted from the port's directory. - [ ] The version database is fixed by rerunning `./vcpkg x-add-version --all` and committing the result. - [ ] Only one version is added to each modified port's versions file. END OF PORT UPDATE CHECKLIST (delete this line) --> <!-- If this PR adds a new port, please uncomment and fill out this checklist: - [ ] Changes comply with the [maintainer guide](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/contributing/maintainer-guide.md). - [ ] The name of the port matches an existing name for this component on https://repology.org/ if possible, and/or is strongly associated with that component on search engines. - [ ] Optional dependencies are resolved in exactly one way. For example, if the component is built with CMake, all `find_package` calls are REQUIRED, are satisfied by `vcpkg.json`'s declared dependencies, or disabled with [CMAKE_DISABLE_FIND_PACKAGE_Xxx](https://cmake.org/cmake/help/latest/variable/CMAKE_DISABLE_FIND_PACKAGE_PackageName.html). - [ ] The versioning scheme in `vcpkg.json` matches what upstream says. - [ ] The license declaration in `vcpkg.json` matches what upstream says. - [ ] The installed as the "copyright" file matches what upstream says. - [ ] The source code of the component installed comes from an authoritative source. - [ ] The generated "usage text" is accurate. See [adding-usage](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/examples/adding-usage.md) for context. - [ ] The version database is fixed by rerunning `./vcpkg x-add-version --all` and committing the result. - [ ] Only one version is in the new port's versions file. - [ ] Only one version is added to each modified port's versions file. END OF NEW PORT CHECKLIST (delete this line) --> Specify version: openvino/2024.0.0
This commit is contained in:
Родитель
7c49e96f41
Коммит
ab887c5623
|
@ -1,45 +0,0 @@
|
|||
diff --git a/cmake/features.cmake b/cmake/features.cmake
|
||||
index 6e383edeeb..aadd1db976 100644
|
||||
--- a/cmake/features.cmake
|
||||
+++ b/cmake/features.cmake
|
||||
@@ -177,6 +177,9 @@ ov_dependent_option (ENABLE_SYSTEM_SNAPPY "Enables use of system version of Snap
|
||||
ov_dependent_option (ENABLE_PYTHON_PACKAGING "Enables packaging of Python API in APT / YUM" OFF
|
||||
"ENABLE_PYTHON;UNIX" OFF)
|
||||
|
||||
+ov_dependent_option (ENABLE_JS "Enables JS API building" ON
|
||||
+ "NOT WIN32" OFF)
|
||||
+
|
||||
ov_option(ENABLE_OPENVINO_DEBUG "Enable output for OPENVINO_DEBUG statements" OFF)
|
||||
|
||||
if(NOT BUILD_SHARED_LIBS AND ENABLE_OV_TF_FRONTEND)
|
||||
diff --git a/src/bindings/js/CMakeLists.txt b/src/bindings/js/CMakeLists.txt
|
||||
index 329a86c2fa..20bf139a54 100644
|
||||
--- a/src/bindings/js/CMakeLists.txt
|
||||
+++ b/src/bindings/js/CMakeLists.txt
|
||||
@@ -2,6 +2,10 @@
|
||||
# SPDX-License-Identifier: Apache-2.0
|
||||
#
|
||||
|
||||
+if(NOT ENABLE_JS)
|
||||
+ return()
|
||||
+endif()
|
||||
+
|
||||
project(OpenVINO_JS_API)
|
||||
|
||||
add_subdirectory(node)
|
||||
diff --git a/src/bindings/js/node/CMakeLists.txt b/src/bindings/js/node/CMakeLists.txt
|
||||
index cc8918155f..fffceb5679 100644
|
||||
--- a/src/bindings/js/node/CMakeLists.txt
|
||||
+++ b/src/bindings/js/node/CMakeLists.txt
|
||||
@@ -2,10 +2,6 @@
|
||||
# SPDX-License-Identifier: Apache-2.0
|
||||
#
|
||||
|
||||
-if(WIN32)
|
||||
- return()
|
||||
-endif()
|
||||
-
|
||||
if(CMAKE_VERSION VERSION_LESS 3.14)
|
||||
message(WARNING "JS API is not available with CMake version less than 3.14, skipping")
|
||||
return()
|
||||
|
|
@ -1,20 +1,11 @@
|
|||
vcpkg_download_distfile(PR_22011_PATH
|
||||
URLS "https://github.com/openvinotoolkit/openvino/pull/22011.diff?full_index=1"
|
||||
FILENAME "openvino-pr-22011.patch"
|
||||
SHA512 f25de88db953a825d0a9a2f8e78664aba44eda2fecfed28ba52045c82aa5f586e42deb51cf23c47553e20c64942510500caca6e904d27ab0782270cd3047e953
|
||||
)
|
||||
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO openvinotoolkit/openvino
|
||||
REF "${VERSION}"
|
||||
SHA512 d31428a02e6869e367c00a714c5599cf84fc9839376dfc4511d2abdb4aac991fc58331318102cdc248f568ca8df0bdc7f65a6744ef2dfa52d85a60a1ec77aae9
|
||||
SHA512 89c60aa8c73d91003f9fdd4e8f93213b98164ecdcd4a4264ba93352473666a290d1dd55b61cf9c5d62b0cef429f989bb31f5d4bfa67cf6d97dfc2abca45d4186
|
||||
PATCHES
|
||||
# vcpkg specific patch, because OV creates a file in source tree, which is prohibited
|
||||
001-disable-tools.patch
|
||||
# https://github.com/openvinotoolkit/openvino/pull/22139
|
||||
002-conditional-enabling-of-js-api.patch
|
||||
${PR_22011_PATH}
|
||||
HEAD_REF master)
|
||||
|
||||
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
|
||||
|
@ -48,8 +39,8 @@ if(ENABLE_INTEL_GPU)
|
|||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH DEP_SOURCE_PATH
|
||||
REPO oneapi-src/oneDNN
|
||||
REF cb77937ffcf5e83b5d1cf2940c94e8b508d8f7b4
|
||||
SHA512 30ede7480c5563753256b6c30360c72a63489d5225ab683601ad8c4654bedf17879ae36cdf4be6423707116eca71adbd92790bb643234c7a3b99dc6e4cfdf200
|
||||
REF 494af5f9921bdae98f1a0e2955fa7d76ff386c4f
|
||||
SHA512 30c555cbe1e2f4f536ccedc920a962751ba05e2c49e38948e5da83f9b89e14eebda7450edabe51865beeebdf6b6da5fe4673c30d1db67c803f474e9093759b1f
|
||||
)
|
||||
file(COPY "${DEP_SOURCE_PATH}/" DESTINATION "${SOURCE_PATH}/src/plugins/intel_gpu/thirdparty/onednn_gpu")
|
||||
endif()
|
||||
|
@ -63,16 +54,16 @@ if(ENABLE_INTEL_CPU)
|
|||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH DEP_SOURCE_PATH
|
||||
REPO openvinotoolkit/oneDNN
|
||||
REF cb3060bbf4694e46a1359a3d4dfe70500818f72d
|
||||
SHA512 48d28273ffdfb82ad1dc6b152c812fa09ffcac387c7851e5b1393aa473ce51f9bf114d2bd462cf2003f4897907de32ab68cd2f414459c588b3155b545f3099a4
|
||||
REF f82148befdbdc9576ec721c9d500155ee4de8060
|
||||
SHA512 d4270b27ee274a5aa065ae5812db3c6ca9c898d72059eb5146f040a3ee354c8f114e45247ac37cab9fb2beee0f09eea2d0947d4f06ecbc7121b14011d3e1ce6d
|
||||
)
|
||||
file(COPY "${DEP_SOURCE_PATH}/" DESTINATION "${SOURCE_PATH}/src/plugins/intel_cpu/thirdparty/onednn")
|
||||
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH DEP_SOURCE_PATH
|
||||
REPO openvinotoolkit/mlas
|
||||
REF 7a35e48a723944972088627be1a8b60841e8f6a5
|
||||
SHA512 3094355e4d062457e6ec0b535b7dabbee5cf7257d05f7807b34a162614c96e8a6567d3fed8e955d70a69a15f26004e79a397e4d586ea81ed7b76a65dcd96a2a8
|
||||
REF d1bc25ec4660cddd87804fcf03b2411b5dfb2e94
|
||||
SHA512 8d6dd319924135b7b22940d623305bf200b812ae64cde79000709de4fad429fbd43794301ef16e6f10ed7132777b7a73e9f30ecae7c030aea80d57d7c0ce4500
|
||||
)
|
||||
file(COPY "${DEP_SOURCE_PATH}/" DESTINATION "${SOURCE_PATH}/src/plugins/intel_cpu/thirdparty/mlas")
|
||||
|
||||
|
|
|
@ -1,8 +1,7 @@
|
|||
{
|
||||
"$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
|
||||
"name": "openvino",
|
||||
"version": "2023.3.0",
|
||||
"port-version": 1,
|
||||
"version": "2024.0.0",
|
||||
"maintainers": "OpenVINO Developers <openvino@intel.com>",
|
||||
"summary": "This is a port for Open Visual Inference And Optimization toolkit for AI inference",
|
||||
"description": [
|
||||
|
|
|
@ -6501,8 +6501,8 @@
|
|||
"port-version": 0
|
||||
},
|
||||
"openvino": {
|
||||
"baseline": "2023.3.0",
|
||||
"port-version": 1
|
||||
"baseline": "2024.0.0",
|
||||
"port-version": 0
|
||||
},
|
||||
"openvpn3": {
|
||||
"baseline": "3.7.0",
|
||||
|
|
|
@ -1,5 +1,10 @@
|
|||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "0be18ab11cbaa055a9c4b84dfb11de163b3a30ea",
|
||||
"version": "2024.0.0",
|
||||
"port-version": 0
|
||||
},
|
||||
{
|
||||
"git-tree": "4ec7482b6e2fd81185058d82806cccb53e62270c",
|
||||
"version": "2023.3.0",
|
||||
|
|
Загрузка…
Ссылка в новой задаче