openvino/2024.5.0 update

microsoft · Dec 10, 2024 · 752b281 · 752b281
1 parent d2b6159
commit 752b281
Show file tree

Hide file tree

Showing 7 changed files with 66 additions and 101 deletions.
diff --git a/ports/openvino/002-fix-onnx.patch b/ports/openvino/002-fix-onnx.patch
diff --git a/ports/openvino/002-protobuf.patch b/ports/openvino/002-protobuf.patch
@@ -0,0 +1,28 @@
+diff --git a/src/frontends/onnx/frontend/src/frontend.cpp b/src/frontends/onnx/frontend/src/frontend.cpp
+index 5ad28be3654422..5296e5b1b7a506 100644
+--- a/src/frontends/onnx/frontend/src/frontend.cpp
++++ b/src/frontends/onnx/frontend/src/frontend.cpp
+@@ -3,6 +3,9 @@
+ //
+
+ #include <google/protobuf/port_def.inc>
++#ifndef PROTOBUF_VERSION
++#    include <google/protobuf/runtime_version.h>
++#endif
+ #if PROTOBUF_VERSION >= 4022000  // protobuf 4.22
+ #    define OV_PROTOBUF_ABSL_IS_USED
+ #endif
+diff --git a/src/frontends/paddle/src/frontend.cpp b/src/frontends/paddle/src/frontend.cpp
+index 163b4d894cb766..2f2ca72418e5dd 100644
+--- a/src/frontends/paddle/src/frontend.cpp
++++ b/src/frontends/paddle/src/frontend.cpp
+@@ -5,6 +5,9 @@
+ #include "openvino/frontend/paddle/frontend.hpp"
+
+ #include <google/protobuf/port_def.inc>
++#ifndef PROTOBUF_VERSION
++#    include <google/protobuf/runtime_version.h>
++#endif
+ #if PROTOBUF_VERSION >= 4022000  // protobuf 4.22
+ #    define OV_PROTOBUF_ABSL_IS_USED
+ #endif
diff --git a/ports/openvino/003-protobuf.patch b/ports/openvino/003-protobuf.patch
diff --git a/ports/openvino/portfile.cmake b/ports/openvino/portfile.cmake
@@ -2,13 +2,12 @@ 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
+        002-protobuf.patch
         add-include-chrono.patch #https://github.com/openvinotoolkit/openvino/pull/27782
 )
 
@@ -38,8 +37,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")
 
@@ -52,8 +51,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")
 
@@ -64,26 +63,28 @@ if(ENABLE_INTEL_CPU)
         SHA512 8d6dd319924135b7b22940d623305bf200b812ae64cde79000709de4fad429fbd43794301ef16e6f10ed7132777b7a73e9f30ecae7c030aea80d57d7c0ce4500
     )
     file(COPY "${DEP_SOURCE_PATH}/" DESTINATION "${SOURCE_PATH}/src/plugins/intel_cpu/thirdparty/mlas")
+endif()
+
+if(VCPKG_TARGET_ARCHITECTURE MATCHES "arm")
+    # scons (python tool) is required for ARM Compute Library building
+    vcpkg_find_acquire_program(PYTHON3)
+
+    x_vcpkg_get_python_packages(
+        PYTHON_VERSION 3
+        PYTHON_EXECUTABLE ${PYTHON3}
+        PACKAGES scons
+        OUT_PYTHON_VAR OV_PYTHON_WITH_SCONS
+    )
 
-    if(VCPKG_TARGET_ARCHITECTURE MATCHES "arm")
-        # scons (python tool) is required for ARM Compute Library building
-        vcpkg_find_acquire_program(PYTHON3)
-
-        x_vcpkg_get_python_packages(
-            PYTHON_VERSION 3
-            PYTHON_EXECUTABLE ${PYTHON3}
-            PACKAGES scons
-            OUT_PYTHON_VAR OV_PYTHON_WITH_SCONS
-        )
-
-        vcpkg_from_github(
-            OUT_SOURCE_PATH DEP_SOURCE_PATH
-            REPO ARM-software/ComputeLibrary
-            REF v24.08
-            SHA512 82debaf8d8345b79b112afdabf6019c7ad8a9b30161d3061320a3da3040b2ad49153cc508caafe9fb1182c2669c958785acf2c361382080af273465d1727a71c
-        )
-        file(COPY "${DEP_SOURCE_PATH}/" DESTINATION "${SOURCE_PATH}/src/plugins/intel_cpu/thirdparty/ComputeLibrary")
-    endif()
+    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.09
+        SHA512 c755da7d576b9bc1f33c9505efe4ce9e50cb927978f929d61f31b213904dca45ddb78b7c0cf9b215e37d2028e0404f4e3435678c120bba16263b55fd701eb4f1
+    )
+    file(COPY "${DEP_SOURCE_PATH}/" DESTINATION "${SOURCE_PATH}/src/plugins/intel_cpu/thirdparty/ComputeLibrary")
 endif()
 
 if(ENABLE_INTEL_NPU)
@@ -94,13 +95,13 @@ if(ENABLE_INTEL_NPU)
         REF v1.17.6
         SHA512 bb412e875d97d1c80a0e67087e6dac1a6ffb91fa50e22deb7649ee3250c0937679d225419b52bfd7938f71a66ac15742a6a215cee7714c27e0f935e04df5b88e
     )
-    file(COPY "${DEP_SOURCE_PATH}/" DESTINATION "${SOURCE_PATH}/src/plugins/intel_npu/thirdparty/level-zero")
+    file(COPY "${DEP_SOURCE_PATH}/" DESTINATION "${SOURCE_PATH}/thirdparty/level_zero/level-zero")
 
     vcpkg_from_github(
         OUT_SOURCE_PATH DEP_SOURCE_PATH
         REPO intel/level-zero-npu-extensions
-        REF 16c85231a82ee1a0b06ed7ab7da3f411a0878ed7
-        SHA512 983468c7706dc44cfc248c491cf51d2f69181c16ae1e400ca689df39c51112e03227c2f311173b1665115cdd33fa7d51d48e75adaf8353564a980b37c16aaa66
+        REF a6487cc2c5da9aa13db9e005a320a1b6a0ee5919
+        SHA512 9c4f401f52fddaea30c71ac9a15a2cdeed9e688b0f0392c55c819351287e84772c7b6cbfc21446cde0b5a5be3319b6164d345a720d44d882c0eba0c7b477242c
     )
     file(COPY "${DEP_SOURCE_PATH}/" DESTINATION "${SOURCE_PATH}/src/plugins/intel_npu/thirdparty/level-zero-ext")
 endif()

diff --git 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": 5,
+  "version": "2024.5.0",
   "maintainers": "OpenVINO Developers <[email protected]>",
   "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": [
@@ -93,7 +92,7 @@
       "dependencies": [
         {
           "name": "onnx",
-          "version>=": "1.13.1"
+          "version>=": "1.16.2"
         },
         {
           "name": "protobuf",

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -6777,8 +6777,8 @@
       "port-version": 0
     },
     "openvino": {
-      "baseline": "2024.4.0",
-      "port-version": 5
+      "baseline": "2024.5.0",
+      "port-version": 0
     },
     "openvpn3": {
       "baseline": "3.10",

diff --git a/versions/o-/openvino.json b/versions/o-/openvino.json
@@ -1,9 +1,9 @@
 {
   "versions": [
     {
-      "git-tree": "d3497e79615424c72514c072b5f7deb876f35718",
-      "version": "2024.4.0",
-      "port-version": 5
+      "git-tree": "318f3bb6708b3c47a1a88960139fadb37694f21c",
+      "version": "2024.5.0",
+      "port-version": 0
     },
     {
       "git-tree": "04f4c58adc2db11be31f2d4427c6eeb62bbe0dd2",