openvino/2024.5.0 update

Signed-off-by: Ilya Lavrenov <[email protected]>

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 4d723b24aa2bf8defed7e29218fc71bcd8c82d1b5e53bde95ede84731222754a9312f8c7c09e48dfe3e8cebb488d0c275f5fdf73006c0a8fd9738392d8a5215b
+    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 bbe5409a1b9159028891e4be81bb506f018fec81c7bf76ccd395715e66734b6da07ab0fbe9fb9eafea4f6f373a6b0c952ec0102ef7248f5adeaa8e1e1941dce5
+    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 a7bf3c62c250460c50e89c2c1433bbe78632821576b114aa51893b8e45d17c12da469b3df375dfb4f5b33dbb44a0835479fa953f48a133b70f6e15ecf5339299
+    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 797b76295ebcdc1e4a1d84931f3b9491e7535cc29d78afbd3cc7dd1b7ca53e95283db4895e8882ea2449916624675252309f452458c11e5890d3a34a4b4961c1
+    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 b781c4a33eb82f8780b275d2b0ee1a81db31dd95fdf91ecc9a6a24e60e2333c27d465d2180ce3903200c3b0e39c2a2f0b09b962f3377d6564e0504a3f039f338
+    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 fa6b5b8371685ee5bcf7d269b830adbcf62fd6f6474d9d88c009e524b7c5c6da86791bd6f567e65701578ead42964d6ea3668e3e199637e08b647bddb403057d
+    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 fe22b87bc409fd9fb65df7277b0564c8a2f952622651474062fa9aed7471bb39a2d01b636a7f46ec41abbb528e41850de895b4b5043927cd1c03c9de53329ac6
+    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}"
 )
 

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 <[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": [
@@ -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",