From 30024c2c04a34e357a764badc64490c959c0dc6a Mon Sep 17 00:00:00 2001 From: Ilya Lavrenov Date: Thu, 2 Jan 2025 08:44:08 +0100 Subject: [PATCH 1/2] openvino/2024.5.0 update Signed-off-by: Ilya Lavrenov --- ports/openvino/002-fix-onnx.patch | 26 ------- ports/openvino/003-protobuf.patch | 37 --------- ports/openvino/004-opencl-v2024.10.24.patch | 64 ---------------- ports/openvino/add-include-chrono.patch | 12 --- ports/openvino/portfile.cmake | 85 ++++++++++++++++----- ports/openvino/vcpkg.json | 18 +++-- 6 files changed, 76 insertions(+), 166 deletions(-) delete mode 100644 ports/openvino/002-fix-onnx.patch delete mode 100644 ports/openvino/003-protobuf.patch delete mode 100644 ports/openvino/004-opencl-v2024.10.24.patch delete mode 100644 ports/openvino/add-include-chrono.patch diff --git a/ports/openvino/002-fix-onnx.patch b/ports/openvino/002-fix-onnx.patch deleted file mode 100644 index 7fdbc006a6f0f8..00000000000000 --- a/ports/openvino/002-fix-onnx.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/src/frontends/onnx/onnx_common/CMakeLists.txt b/src/frontends/onnx/onnx_common/CMakeLists.txt -index d63bce4..116a6e3 100644 ---- a/src/frontends/onnx/onnx_common/CMakeLists.txt -+++ b/src/frontends/onnx/onnx_common/CMakeLists.txt -@@ -30,7 +30,7 @@ target_include_directories(${TARGET_NAME} - - target_link_libraries(${TARGET_NAME} PRIVATE openvino::runtime openvino::util) - --ov_link_system_libraries(${TARGET_NAME} PUBLIC onnx_proto onnx) -+ov_link_system_libraries(${TARGET_NAME} PUBLIC ONNX::onnx ONNX::onnx_proto) - - ov_add_clang_format_target(${TARGET_NAME}_clang FOR_TARGETS ${TARGET_NAME}) - -diff --git a/thirdparty/dependencies.cmake b/thirdparty/dependencies.cmake -index 24c4940..8ea7d12 100644 ---- a/thirdparty/dependencies.cmake -+++ b/thirdparty/dependencies.cmake -@@ -479,7 +479,7 @@ endif() - # - - if(ENABLE_OV_ONNX_FRONTEND) -- find_package(ONNX 1.15.0 QUIET COMPONENTS onnx onnx_proto NO_MODULE) -+ find_package(ONNX CONFIG REQUIRED) - - if(ONNX_FOUND) - # conan and vcpkg create imported targets 'onnx' and 'onnx_proto' diff --git a/ports/openvino/003-protobuf.patch b/ports/openvino/003-protobuf.patch deleted file mode 100644 index dcb3ba4bb293ae..00000000000000 --- a/ports/openvino/003-protobuf.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff --git a/src/frontends/onnx/frontend/src/frontend.cpp b/src/frontends/onnx/frontend/src/frontend.cpp -index d4b83fee20..28272a1eda 100644 ---- a/src/frontends/onnx/frontend/src/frontend.cpp -+++ b/src/frontends/onnx/frontend/src/frontend.cpp -@@ -2,6 +2,7 @@ - // SPDX-License-Identifier: Apache-2.0 - // - -+#include - #include - #if PROTOBUF_VERSION >= 4022000 // protobuf 4.22 - # define OV_PROTOBUF_ABSL_IS_USED -diff --git a/src/frontends/paddle/src/frontend.cpp b/src/frontends/paddle/src/frontend.cpp -index c6febe0843..5d4789ccb6 100644 ---- a/src/frontends/paddle/src/frontend.cpp -+++ b/src/frontends/paddle/src/frontend.cpp -@@ -4,6 +4,7 @@ - - #include "openvino/frontend/paddle/frontend.hpp" - -+#include - #include - #if PROTOBUF_VERSION >= 4022000 // protobuf 4.22 - # define OV_PROTOBUF_ABSL_IS_USED -diff --git a/thirdparty/dependencies.cmake b/thirdparty/dependencies.cmake -index 9d7b16aeb8..af47fb99ee 100644 ---- a/thirdparty/dependencies.cmake -+++ b/thirdparty/dependencies.cmake -@@ -325,7 +325,7 @@ if(ENABLE_OV_PADDLE_FRONTEND OR ENABLE_OV_ONNX_FRONTEND OR ENABLE_OV_TF_FRONTEND - # try to find newer version first (major is changed) - # see https://protobuf.dev/support/version-support/ and - # https://github.com/protocolbuffers/protobuf/commit/d61f75ff6db36b4f9c0765f131f8edc2f86310fa -- find_package(Protobuf 4.22.0 QUIET CONFIG) -+ find_package(Protobuf REQUIRED CONFIG) - if(Protobuf_FOUND) - # protobuf was found via CONFIG mode, let's save it for later usage in OpenVINOConfig.cmake static build - set(protobuf_config CONFIG) diff --git a/ports/openvino/004-opencl-v2024.10.24.patch b/ports/openvino/004-opencl-v2024.10.24.patch deleted file mode 100644 index 332c23862420f7..00000000000000 --- a/ports/openvino/004-opencl-v2024.10.24.patch +++ /dev/null @@ -1,64 +0,0 @@ -commit 255202328d39490f2cdca0d646b2e12b17ac9b69 -Author: Ilya Lavrenov -Date: Mon Jan 6 09:56:08 2025 +0100 - - Migrate to OpenCL v2024.10.24 - -diff --git a/src/plugins/intel_gpu/src/runtime/ocl/ocl_ext.hpp b/src/plugins/intel_gpu/src/runtime/ocl/ocl_ext.hpp -index 759d796a5e..7246a6f6df 100644 ---- a/src/plugins/intel_gpu/src/runtime/ocl/ocl_ext.hpp -+++ b/src/plugins/intel_gpu/src/runtime/ocl/ocl_ext.hpp -@@ -16,6 +16,10 @@ - #include - #endif - -+#ifndef CL_HPP_PARAM_NAME_CL_INTEL_UNIFIED_SHARED_MEMORY_ -+#define OPENVINO_CLHPP_HEADERS_ARE_OLDER_THAN_V2024_10_24 -+#endif -+ - #include - - #ifdef _WIN32 -@@ -45,12 +49,16 @@ typedef cl_va_api_device_set_intel cl_device_set_intel; - - #endif // cl_intel_required_subgroup_size - -+#ifdef OPENVINO_CLHPP_HEADERS_ARE_OLDER_THAN_V2024_10_24 -+ - namespace cl { - namespace detail { --CL_HPP_DECLARE_PARAM_TRAITS_(cl_device_info, CL_DEVICE_SUB_GROUP_SIZES_INTEL, vector) -+CL_HPP_DECLARE_PARAM_TRAITS_(cl_device_info, CL_DEVICE_SUB_GROUP_SIZES_INTEL, cl::vector) - } // namespace detail - } // namespace cl - -+#endif // OPENVINO_CLHPP_HEADERS_ARE_OLDER_THAN_V2024_10_24 -+ - /*************************************************************** - * cl_intel_command_queue_families - ***************************************************************/ -@@ -260,11 +268,15 @@ typedef cl_bitfield cl_device_feature_capabilities_intel; - - #endif // cl_intel_device_attribute_query - -+#ifndef CL_HPP_PARAM_NAME_CL_INTEL_COMMAND_QUEUE_FAMILIES_ - #define CL_HPP_PARAM_NAME_CL_INTEL_COMMAND_QUEUE_FAMILIES_(F) \ - F(cl_device_info, CL_DEVICE_QUEUE_FAMILY_PROPERTIES_INTEL, cl::vector) \ - \ - F(cl_command_queue_info, CL_QUEUE_FAMILY_INTEL, cl_uint) \ - F(cl_command_queue_info, CL_QUEUE_INDEX_INTEL, cl_uint) -+#endif // CL_HPP_PARAM_NAME_CL_INTEL_COMMAND_QUEUE_FAMILIES_ -+ -+#ifdef OPENVINO_CLHPP_HEADERS_ARE_OLDER_THAN_V2024_10_24 - - namespace cl { - namespace detail { -@@ -279,6 +291,8 @@ CL_HPP_PARAM_NAME_CL_INTEL_COMMAND_QUEUE_FAMILIES_(CL_HPP_DECLARE_PARAM_TRAITS_) - } // namespace detail - } // namespace cl - -+#endif // OPENVINO_CLHPP_HEADERS_ARE_OLDER_THAN_V2024_10_24 -+ - #include - - namespace { diff --git a/ports/openvino/add-include-chrono.patch b/ports/openvino/add-include-chrono.patch deleted file mode 100644 index 7a71f969f9c023..00000000000000 --- a/ports/openvino/add-include-chrono.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/core/include/openvino/pass/manager.hpp b/src/core/include/openvino/pass/manager.hpp -index a026957..a727942 100644 ---- a/src/core/include/openvino/pass/manager.hpp -+++ b/src/core/include/openvino/pass/manager.hpp -@@ -4,6 +4,7 @@ - - #pragma once - -+#include - #include - #include - #include diff --git a/ports/openvino/portfile.cmake b/ports/openvino/portfile.cmake index 2eddc5a5b344f6..0b79fba488e400 100644 --- a/ports/openvino/portfile.cmake +++ b/ports/openvino/portfile.cmake @@ -1,16 +1,61 @@ +vcpkg_download_distfile(PATCH_002_PROTOBUF # https://github.com/openvinotoolkit/openvino/pull/27510 + URLS https://github.com/openvinotoolkit/openvino/commit/103c3b72259648c990970afb8ce2bec489fcf583.patch?full_index=1 + SHA512 315eb2f651b55fc70a4d6faeb1ac1b5d90d53b9010fdc98f3417beb86854ed733eba105ea51de8795471c5e84340b96cf17d511ea3fe3447c5f961ded661a947 + FILENAME openvinotoolkit-openvino-103c3b72259648c990970afb8ce2bec489fcf583.patch +) + +vcpkg_download_distfile(PATCH_003_CODE_SNIPPETS_TEMPALTE # https://github.com/openvinotoolkit/openvino/pull/28172 + URLS https://github.com/openvinotoolkit/openvino/commit/8d74cbb8e1af7c66ccee202fec5a18565e5b37b0.patch?full_index=1 + SHA512 24640b608c2eb78b948c257a8bc9bb0c2f05e4d6cb04c23cf7546a3191a73e163b4732590eb8e5b834765bb78472e1454785c20c74a4dcbaf40a34ff14fafc83 + FILENAME openvinotoolkit-openvino-8d74cbb8e1af7c66ccee202fec5a18565e5b37b0.patch +) + +vcpkg_download_distfile(PATCH_004_ADD_CHRONO # https://github.com/openvinotoolkit/openvino/pull/28192 + URLS https://github.com/openvinotoolkit/openvino/commit/9d78056f243b1f8d5c0331420416c98a005e5945.patch?full_index=1 + SHA512 8b44e04ed88945174b17c6dada2ce3065340b6278a140717599ec0c33f548679424c5acd36b5edc10f2ed74c3288626c2b47a1af0ab530ed6a7ca868fe88ad4b + FILENAME openvinotoolkit-openvino-9d78056f243b1f8d5c0331420416c98a005e5945.patch +) + +vcpkg_download_distfile(PATCH_005_LEVEL_ZERO_FROM_SYSTEM # https://github.com/openvinotoolkit/openvino/pull/27633 + URLS https://github.com/openvinotoolkit/openvino/commit/5c2b9ac6b4daffc24762aea2f6dacdaa70d5ae8c.patch?full_index=1 + SHA512 85c2422ef78b853dd9937319cf16c915c3ce4a143f3a0628ffd4edf0ceac4c26d90e3ffd9d6c7f4f3f72fc631c4860fcfcbf96ce37134b31fc45ccae4f3df308 + FILENAME openvinotoolkit-openvino-5c2b9ac6b4daffc24762aea2f6dacdaa70d5ae8c.patch +) + +vcpkg_download_distfile(PATCH_006_LEVEL_ZERO_AT_RUNTIME # https://github.com/openvinotoolkit/openvino/pull/27659 + URLS https://github.com/openvinotoolkit/openvino/commit/99d7cd4bc4492b81a99bc41e2d2469da1a929491.patch?full_index=1 + SHA512 091ad0328feb0ec9a59a9728ede444c408db9e7532b7a85b62b63f059fa766833b9c0b2d1c8e5972476652b24d62cf8bdb0313b197e2ea5e0b64c79a0a0da1b1 + FILENAME openvinotoolkit-openvino-99d7cd4bc4492b81a99bc41e2d2469da1a929491.patch +) + +vcpkg_download_distfile(PATCH_007_OPENCL_V2024_10_24 # https://github.com/openvinotoolkit/openvino/pull/28275 + URLS https://github.com/openvinotoolkit/openvino/commit/120ad760494eeb513ea957bdbc655b6ad07bce42.patch?full_index=1 + SHA512 45a06bf54cef7d619b862f3219dd1225fb38bb653b2f09191d57e945a2df08621b15a27463429d5d72a18dfe05b113b94555cea0cabab0da36c9d89a2757196a + FILENAME openvinotoolkit-openvino-120ad760494eeb513ea957bdbc655b6ad07bce42.patch +) + +vcpkg_download_distfile(PATCH_008_FIX_LEVEL_ZERO_SYSTEM # https://github.com/openvinotoolkit/openvino/pull/28241 + URLS https://github.com/openvinotoolkit/openvino/commit/65f6ce8c5cd0ac5ae5f64fc1c533cc621475a105.patch?full_index=1 + SHA512 e756d181658dee933ffb727d004276a8fc37f9cfc473b25b0e0b5043234b1b2f021e1b26aa6513f7f40a9897d3c96b652aa7d81521205602f673d73a74cb5621 + FILENAME openvinotoolkit-openvino-65f6ce8c5cd0ac5ae5f64fc1c533cc621475a105.patch +) + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO openvinotoolkit/openvino REF "${VERSION}" - SHA512 2bf3f00589d825b7f4ca40d43129d81af4ba62382f98b283a3a206e7661a7a69f178c6afafdde646db8d68cb7fc54ec5280d2f4ff4fbbffe24082cf6649dda29 + SHA512 b003647de3de49e605943488ca9b2e5196b20d95b3152f0c2331c283d4cb253d1bbbb9cde04fa82733d3871d7128c6db6210957660bd89f26462798f782eca47 HEAD_REF master PATCHES # vcpkg specific patch, because OV creates a file in source tree, which is prohibited 001-disable-tools.patch - 002-fix-onnx.patch - 003-protobuf.patch - add-include-chrono.patch #https://github.com/openvinotoolkit/openvino/pull/27782 - 004-opencl-v2024.10.24.patch # https://github.com/openvinotoolkit/openvino/pull/28275 + "${PATCH_002_PROTOBUF}" + "${PATCH_003_CODE_SNIPPETS_TEMPALTE}" + "${PATCH_004_ADD_CHRONO}" + "${PATCH_005_LEVEL_ZERO_FROM_SYSTEM}" + "${PATCH_006_LEVEL_ZERO_AT_RUNTIME}" + "${PATCH_007_OPENCL_V2024_10_24}" + "${PATCH_008_FIX_LEVEL_ZERO_SYSTEM}" ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -39,8 +84,8 @@ if(ENABLE_INTEL_GPU) vcpkg_from_github( OUT_SOURCE_PATH DEP_SOURCE_PATH REPO oneapi-src/oneDNN - REF 4ccd07e3a10e1c08075cf824ac14708245fbc334 - SHA512 c9a28f8427b5cd9c057a546b0b62303026f848045b26e0c9705e2f64d5bc84424ee15935d3bf5ee120d3c430a9dd41b7a6e26ef4fc0c53a2154ce83fcaee8b5a + REF 1722066ad4c0f15495f2d0fcbe9deb2bfd188c36 + SHA512 0b0461bf42d67f0fe7c6c61289a28e42915f7ac2ea5cc569957b8bb601962bec6135e84a2716911394952dffe2bb557c2d59d42c7f80a8db3c3937ecc6bd8ce8 ) file(COPY "${DEP_SOURCE_PATH}/" DESTINATION "${SOURCE_PATH}/src/plugins/intel_gpu/thirdparty/onednn_gpu") @@ -53,8 +98,8 @@ if(ENABLE_INTEL_CPU) vcpkg_from_github( OUT_SOURCE_PATH DEP_SOURCE_PATH REPO openvinotoolkit/oneDNN - REF c8ae8d96e963bd04214858319fa334968e5e73c9 - SHA512 6877ca37c3678e738fa94767b70432d3fff73305342164d0902875d9bcce3fe12abaf52bfc6ae0ef288532324e746b01e604ab7e47f198e7776352b8f5b6f009 + REF c60a9946aa2386890e5c9f5587974facb7624227 + SHA512 cc91f5b2ece1c3f14af308e3da436447d07964fa5ffa848c571fe67197a367673bf7bf9cd979fab0c9b216f92c611bd8df7018ec8e080f10759582629c10cb9d ) file(COPY "${DEP_SOURCE_PATH}/" DESTINATION "${SOURCE_PATH}/src/plugins/intel_cpu/thirdparty/onednn") @@ -77,31 +122,28 @@ if(ENABLE_INTEL_CPU) OUT_PYTHON_VAR OV_PYTHON_WITH_SCONS ) + list(APPEND FEATURE_OPTIONS "-DPython3_EXECUTABLE=${OV_PYTHON_WITH_SCONS}") + vcpkg_from_github( OUT_SOURCE_PATH DEP_SOURCE_PATH REPO ARM-software/ComputeLibrary - REF v24.08 - SHA512 82debaf8d8345b79b112afdabf6019c7ad8a9b30161d3061320a3da3040b2ad49153cc508caafe9fb1182c2669c958785acf2c361382080af273465d1727a71c + REF v24.09 + SHA512 c755da7d576b9bc1f33c9505efe4ce9e50cb927978f929d61f31b213904dca45ddb78b7c0cf9b215e37d2028e0404f4e3435678c120bba16263b55fd701eb4f1 ) file(COPY "${DEP_SOURCE_PATH}/" DESTINATION "${SOURCE_PATH}/src/plugins/intel_cpu/thirdparty/ComputeLibrary") endif() endif() if(ENABLE_INTEL_NPU) - list(APPEND FEATURE_OPTIONS "-DENABLE_INTEL_NPU_INTERNAL=OFF") - vcpkg_from_github( - OUT_SOURCE_PATH DEP_SOURCE_PATH - REPO oneapi-src/level-zero - REF v1.17.6 - SHA512 bb412e875d97d1c80a0e67087e6dac1a6ffb91fa50e22deb7649ee3250c0937679d225419b52bfd7938f71a66ac15742a6a215cee7714c27e0f935e04df5b88e - ) - file(COPY "${DEP_SOURCE_PATH}/" DESTINATION "${SOURCE_PATH}/src/plugins/intel_npu/thirdparty/level-zero") + list(APPEND FEATURE_OPTIONS + "-DENABLE_INTEL_NPU_INTERNAL=OFF" + "-DENABLE_SYSTEM_LEVEL_ZERO=ON") vcpkg_from_github( OUT_SOURCE_PATH DEP_SOURCE_PATH REPO intel/level-zero-npu-extensions - REF 16c85231a82ee1a0b06ed7ab7da3f411a0878ed7 - SHA512 983468c7706dc44cfc248c491cf51d2f69181c16ae1e400ca689df39c51112e03227c2f311173b1665115cdd33fa7d51d48e75adaf8353564a980b37c16aaa66 + REF 110f48ee8eda22d8b40daeeecdbbed0fc3b08f8b + SHA512 aaaeecad6c00489b652cd94d63ed0c1e59eb0eaed8b463198b40f1af3944004b072808ccc3074b71d825e9f0f37bf76fedf296961bb18959ef66a699b71fec41 ) file(COPY "${DEP_SOURCE_PATH}/" DESTINATION "${SOURCE_PATH}/src/plugins/intel_npu/thirdparty/level-zero-ext") endif() @@ -140,6 +182,7 @@ vcpkg_cmake_configure( "-DENABLE_SYSTEM_TBB=ON" "-DENABLE_TBBBIND_2_5=OFF" "-DENABLE_TEMPLATE=OFF" + "-DENABLE_OV_JAX_FRONTEND=OFF" "-DPKG_CONFIG_EXECUTABLE=${PKGCONFIG}" ) diff --git a/ports/openvino/vcpkg.json b/ports/openvino/vcpkg.json index 6ae6e73a9340c2..426b6e333de644 100644 --- a/ports/openvino/vcpkg.json +++ b/ports/openvino/vcpkg.json @@ -1,8 +1,7 @@ { "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json", "name": "openvino", - "version": "2024.4.0", - "port-version": 6, + "version": "2024.5.0", "maintainers": "OpenVINO Developers ", "summary": "This is a port for Open Visual Inference And Optimization toolkit for AI inference", "description": [ @@ -37,7 +36,7 @@ { "name": "xbyak", "platform": "!(arm | uwp)", - "version>=": "6.69" + "version>=": "6.73" } ], "default-features": [ @@ -53,6 +52,10 @@ }, "hetero", "ir", + { + "name": "npu", + "platform": "x64 & !(osx | uwp)" + }, "onnx", "paddle", "pytorch", @@ -85,15 +88,18 @@ "description": "Enables IR frontend for reading models in OpenVINO IR format" }, "npu": { - "description": "NPU Support", - "supports": "x64 & !(osx | uwp) & !static" + "description": "Enables NPU plugin for inference", + "supports": "x64 & !(osx | uwp)", + "dependencies": [ + "level-zero" + ] }, "onnx": { "description": "Enables ONNX frontend for reading models in ONNX format", "dependencies": [ { "name": "onnx", - "version>=": "1.13.1" + "version>=": "1.16.2" }, { "name": "protobuf", From 2e659a6f0c242e4aad32fcbbbe6055fa16c0a25a Mon Sep 17 00:00:00 2001 From: Ilya Lavrenov Date: Mon, 13 Jan 2025 14:24:12 +0100 Subject: [PATCH 2/2] updated version database Signed-off-by: Ilya Lavrenov --- versions/baseline.json | 4 ++-- versions/o-/openvino.json | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/versions/baseline.json b/versions/baseline.json index 1691d227e4db54..c367437c505fef 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6793,8 +6793,8 @@ "port-version": 0 }, "openvino": { - "baseline": "2024.4.0", - "port-version": 6 + "baseline": "2024.5.0", + "port-version": 0 }, "openvpn3": { "baseline": "3.10", diff --git a/versions/o-/openvino.json b/versions/o-/openvino.json index d3f809fbae4523..6a101c4506bf90 100644 --- a/versions/o-/openvino.json +++ b/versions/o-/openvino.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "244afb074f2bdd5195e2631afdfe8af8753c5362", + "version": "2024.5.0", + "port-version": 0 + }, { "git-tree": "a52cc9b435c23fc08e94f744aa4799de019a76c7", "version": "2024.4.0",