diff --git a/ports/openvino/npu_deps.patch b/ports/openvino/npu_deps.patch index 57e9c8d40badde..71e16de84ab5d4 100644 --- a/ports/openvino/npu_deps.patch +++ b/ports/openvino/npu_deps.patch @@ -1,8 +1,8 @@ diff --git a/cmake/features.cmake b/cmake/features.cmake -index 098f5b752b..bd55827203 100644 +index 8badc2e5cb..f8791b4c4e 100644 --- a/cmake/features.cmake +++ b/cmake/features.cmake -@@ -190,7 +190,7 @@ ov_dependent_option (ENABLE_SYSTEM_TBB "Enables use of system TBB" ${ENABLE_SYS +@@ -196,7 +196,7 @@ ov_dependent_option (ENABLE_SYSTEM_TBB "Enables use of system TBB" ${ENABLE_SYS ov_option (ENABLE_SYSTEM_PUGIXML "Enables use of system PugiXML" OFF) # the option is on by default, because we use only flatc compiler and don't use any libraries ov_dependent_option(ENABLE_SYSTEM_FLATBUFFERS "Enables use of system flatbuffers" ${ENABLE_SYSTEM_FLATBUFFERS_DEFAULT} @@ -11,34 +11,43 @@ index 098f5b752b..bd55827203 100644 ov_dependent_option (ENABLE_SYSTEM_OPENCL "Enables use of system OpenCL" ${ENABLE_SYSTEM_LIBS_DEFAULT} "ENABLE_INTEL_GPU" OFF) # the option is turned off by default, because we compile our own static version of protobuf +@@ -208,7 +208,7 @@ ov_dependent_option (ENABLE_SYSTEM_SNAPPY "Enables use of system version of Snap + "ENABLE_SNAPPY_COMPRESSION" OFF) + # the option is turned off by default, because we are not sure that system version of ZE loader is fresh enough + ov_dependent_option (ENABLE_SYSTEM_LEVEL_ZERO "Enables use of system version of Level Zero" OFF +- "ENABLE_INTEL_NPU" OFF) ++ "ENABLE_INTEL_NPU OR ENABLE_INTEL_GPU" OFF) + + ov_dependent_option(ENABLE_JS "Enables JS API building" ${ENABLE_JS_DEFAULT} "NOT ANDROID;NOT EMSCRIPTEN" OFF) + diff --git a/src/plugins/intel_npu/cmake/download_compiler_libs.cmake b/src/plugins/intel_npu/cmake/download_compiler_libs.cmake -index 89009aa84e..69824f6986 100644 +index 3f34a73e45..e561d5703d 100644 --- a/src/plugins/intel_npu/cmake/download_compiler_libs.cmake +++ b/src/plugins/intel_npu/cmake/download_compiler_libs.cmake -@@ -104,7 +104,7 @@ if(ENABLE_INTEL_NPU_COMPILER) +@@ -115,7 +115,7 @@ if(ENABLE_INTEL_NPU_COMPILER) set(NPU_COMPILER_LIB_DESTINATION "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_BUILD_TYPE}") endif() if(WIN32) - set(PLUGIN_COMPILER_LIBS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/temp/plugin_compiler_lib/win") + set(PLUGIN_COMPILER_LIBS_DIR "${CMAKE_CURRENT_BINARY_DIR}/temp/plugin_compiler_lib/win") - set(PLUGIN_COMPILER_LIBS_URL "https://storage.openvinotoolkit.org/dependencies/thirdparty/windows/npu_compiler_vcl_windows_2022-7_5_0-a1ae54e9.zip") - set(PLUGIN_COMPILER_LIBS_ZIP "${PLUGIN_COMPILER_LIBS_DIR}/npu_compiler_vcl_windows_2022-${PLUGIN_COMPILER_VERSION}-a1ae54e9.zip") - set(PLUGIN_COMPILER_LIBS_DIR_UNZIPPED "${PLUGIN_COMPILER_LIBS_DIR}/npu_compiler_vcl_windows_2022-${PLUGIN_COMPILER_VERSION}-a1ae54e9") -@@ -131,7 +131,7 @@ if(ENABLE_INTEL_NPU_COMPILER) + set(PLUGIN_COMPILER_LIBS_URL "https://storage.openvinotoolkit.org/dependencies/thirdparty/windows/npu_compiler_vcl_windows_2022-${PLUGIN_COMPILER_VERSION}-${PLUGIN_COMPILER_COMMIT_SHA}.zip") + set(PLUGIN_COMPILER_LIBS_ZIP "${PLUGIN_COMPILER_LIBS_DIR}/npu_compiler_vcl_windows_2022-${PLUGIN_COMPILER_VERSION}-${PLUGIN_COMPILER_COMMIT_SHA}.zip") + set(PLUGIN_COMPILER_LIBS_DIR_UNZIPPED "${PLUGIN_COMPILER_LIBS_DIR}/npu_compiler_vcl_windows_2022-${PLUGIN_COMPILER_VERSION}-${PLUGIN_COMPILER_COMMIT_SHA}") +@@ -143,7 +143,7 @@ if(ENABLE_INTEL_NPU_COMPILER) if(OS_NAME STREQUAL "Ubuntu") if(OS_VERSION STREQUAL "22.04") # Ubuntu 22.04-specific settings or actions - set(PLUGIN_COMPILER_LIBS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/temp/compiler_libs/ubuntu22.04") + set(PLUGIN_COMPILER_LIBS_DIR "${CMAKE_CURRENT_BINARY_DIR}/temp/compiler_libs/ubuntu22.04") - set(PLUGIN_COMPILER_LIBS_URL "https://storage.openvinotoolkit.org/dependencies/thirdparty/linux/npu_compiler_vcl_ubuntu_22_04-7_5_0-a1ae54e9.tar.gz") - set(PLUGIN_COMPILER_LIBS_TAR "${PLUGIN_COMPILER_LIBS_DIR}/npu_compiler_vcl_ubuntu_22_04-${PLUGIN_COMPILER_VERSION}-a1ae54e9.tar.gz") - set(PLUGIN_COMPILER_LIBS_DIR_EXTRACTED "${PLUGIN_COMPILER_LIBS_DIR}/npu_compiler_vcl_ubuntu_22_04-${PLUGIN_COMPILER_VERSION}-a1ae54e9") -@@ -149,7 +149,7 @@ if(ENABLE_INTEL_NPU_COMPILER) + set(PLUGIN_COMPILER_LIBS_URL "https://storage.openvinotoolkit.org/dependencies/thirdparty/linux/npu_compiler_vcl_ubuntu_22_04-${PLUGIN_COMPILER_VERSION}-${PLUGIN_COMPILER_COMMIT_SHA}.tar.gz") + set(PLUGIN_COMPILER_LIBS_TAR "${PLUGIN_COMPILER_LIBS_DIR}/npu_compiler_vcl_ubuntu_22_04-${PLUGIN_COMPILER_VERSION}-${PLUGIN_COMPILER_COMMIT_SHA}.tar.gz") + set(PLUGIN_COMPILER_LIBS_DIR_EXTRACTED "${PLUGIN_COMPILER_LIBS_DIR}/npu_compiler_vcl_ubuntu_22_04-${PLUGIN_COMPILER_VERSION}-${PLUGIN_COMPILER_COMMIT_SHA}") +@@ -162,7 +162,7 @@ if(ENABLE_INTEL_NPU_COMPILER) message(STATUS "Copying prebuilt Plugin compiler libraries libopenvino_intel_npu_compiler.so to ${NPU_COMPILER_LIB_DESTINATION} for Ubuntu 22.04") elseif(OS_VERSION STREQUAL "24.04") message(STATUS "This is Ubuntu 24.04") - set(PLUGIN_COMPILER_LIBS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/temp/compiler_libs/ubuntu24.04") + set(PLUGIN_COMPILER_LIBS_DIR "${CMAKE_CURRENT_BINARY_DIR}/temp/compiler_libs/ubuntu24.04") - set(PLUGIN_COMPILER_LIBS_URL "https://storage.openvinotoolkit.org/dependencies/thirdparty/linux/npu_compiler_vcl_ubuntu_24_04-7_5_0-a1ae54e9.tar.gz") - set(PLUGIN_COMPILER_LIBS_TAR "${PLUGIN_COMPILER_LIBS_DIR}/npu_compiler_vcl_ubuntu_24_04-${PLUGIN_COMPILER_VERSION}-a1ae54e9.tar.gz") - set(PLUGIN_COMPILER_LIBS_DIR_EXTRACTED "${PLUGIN_COMPILER_LIBS_DIR}/npu_compiler_vcl_ubuntu_24_04-${PLUGIN_COMPILER_VERSION}-a1ae54e9") + set(PLUGIN_COMPILER_LIBS_URL "https://storage.openvinotoolkit.org/dependencies/thirdparty/linux/npu_compiler_vcl_ubuntu_24_04-${PLUGIN_COMPILER_VERSION}-${PLUGIN_COMPILER_COMMIT_SHA}.tar.gz") + set(PLUGIN_COMPILER_LIBS_TAR "${PLUGIN_COMPILER_LIBS_DIR}/npu_compiler_vcl_ubuntu_24_04-${PLUGIN_COMPILER_VERSION}-${PLUGIN_COMPILER_COMMIT_SHA}.tar.gz") + set(PLUGIN_COMPILER_LIBS_DIR_EXTRACTED "${PLUGIN_COMPILER_LIBS_DIR}/npu_compiler_vcl_ubuntu_24_04-${PLUGIN_COMPILER_VERSION}-${PLUGIN_COMPILER_COMMIT_SHA}") diff --git a/ports/openvino/onednn_gpu_includes.patch b/ports/openvino/onednn_gpu_includes.patch index 0ce5957c128364..19a373b99343cf 100644 --- a/ports/openvino/onednn_gpu_includes.patch +++ b/ports/openvino/onednn_gpu_includes.patch @@ -1,34 +1,34 @@ diff --git a/src/plugins/intel_gpu/src/graph/CMakeLists.txt b/src/plugins/intel_gpu/src/graph/CMakeLists.txt -index b3ee51e242..31477ec128 100644 +index 380159c387..ded4303aff 100644 --- a/src/plugins/intel_gpu/src/graph/CMakeLists.txt +++ b/src/plugins/intel_gpu/src/graph/CMakeLists.txt -@@ -82,7 +82,7 @@ macro(ov_gpu_add_backend_target) - +@@ -81,7 +81,7 @@ macro(ov_gpu_add_backend_target) + # We use onednn headers all over the graph module, so we have to append includes to all backends and add a dependency between targets if (ENABLE_ONEDNN_FOR_GPU) - target_include_directories(${ARG_NAME} SYSTEM BEFORE PRIVATE $) + target_include_directories(${ARG_NAME} BEFORE PRIVATE $) add_dependencies(openvino_intel_gpu_${IMPL_TYPE}_obj onednn_gpu_tgt) endif() - endmacro() + # Onednn headers use OCL/L0 headers diff --git a/src/plugins/intel_gpu/src/runtime/CMakeLists.txt b/src/plugins/intel_gpu/src/runtime/CMakeLists.txt -index 85dfec05c4..3f72a41949 100644 +index c8c872071e..6565ad7632 100644 --- a/src/plugins/intel_gpu/src/runtime/CMakeLists.txt +++ b/src/plugins/intel_gpu/src/runtime/CMakeLists.txt -@@ -56,7 +56,7 @@ if(OV_COMPILER_IS_INTEL_LLVM) +@@ -66,7 +66,7 @@ if(OV_COMPILER_IS_INTEL_LLVM) endif() - + if(ENABLE_ONEDNN_FOR_GPU) - ov_target_link_libraries_as_system(${TARGET_NAME} PUBLIC onednn_gpu_tgt) + target_link_libraries(${TARGET_NAME} PUBLIC onednn_gpu_tgt) endif() - + ov_set_threading_interface_for(${TARGET_NAME}) diff --git a/src/plugins/intel_gpu/thirdparty/CMakeLists.txt b/src/plugins/intel_gpu/thirdparty/CMakeLists.txt -index e47b2b1ffd..e03c95fdeb 100644 +index 2bf709fc20..edf6cf8110 100644 --- a/src/plugins/intel_gpu/thirdparty/CMakeLists.txt +++ b/src/plugins/intel_gpu/thirdparty/CMakeLists.txt -@@ -173,7 +173,6 @@ if(ENABLE_ONEDNN_FOR_GPU) +@@ -178,7 +178,6 @@ if(ENABLE_ONEDNN_FOR_GPU) set_target_properties(onednn_gpu_tgt PROPERTIES INTERFACE_LINK_LIBRARIES $ INTERFACE_INCLUDE_DIRECTORIES "$" diff --git a/ports/openvino/portfile.cmake b/ports/openvino/portfile.cmake index a5fb2e2ab9771c..ad726d2a6a742c 100644 --- a/ports/openvino/portfile.cmake +++ b/ports/openvino/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO openvinotoolkit/openvino REF "${VERSION}" - SHA512 77259f2211aa27c70c4930795ab6a7f7a0eade6fa8cda9b38caafdb3fa8081dba7c6bb5c2fa75adbdb224e4d84c80c48f19eef463500cd58316aa55183e6d660 + SHA512 c8f222cf278017da610a8d0f0c5bd5c6c54c0324bfcfdf9352063df2706732eaa54b7b01408aec1ca266a3f02bd2bffa671d2415121d8f3675f46d8114355de6 HEAD_REF master PATCHES msvc_debug_info_only_in_pdb.patch @@ -37,8 +37,8 @@ if(ENABLE_INTEL_GPU) vcpkg_from_github( OUT_SOURCE_PATH DEP_SOURCE_PATH REPO oneapi-src/oneDNN - REF v3.11 - SHA512 de60ecd881b97e9942441e0eb5c53e2caa2a0a1a1c78ab9211ab103244b66b62c0f3dfa5b322bb2c39dfe13f85a9aebf82b899dde1ccdc01ba8ff9deed832787 + REF 470e87eb07bdc805937a9f6d45d5c3a0fe4d27e7 + SHA512 ab5c303e415e88b83bf9a20b65c097827cb7b3ca8af196568fadb62f15c49af879dccb1c9130eadd40df7eb170521d02d7a48d021446ecd31fdaa56d31dba416 ) file(COPY "${DEP_SOURCE_PATH}/" DESTINATION "${SOURCE_PATH}/src/plugins/intel_gpu/thirdparty/onednn_gpu") @@ -51,8 +51,8 @@ if(ENABLE_INTEL_CPU) vcpkg_from_github( OUT_SOURCE_PATH DEP_SOURCE_PATH REPO openvinotoolkit/oneDNN - REF c6b79c1207bd5f20b9395536dab1d71a47cfcb1d - SHA512 2ed3444c60771229f051688964ee51b7cd229f75dfdbc6e59390d64223bb5d98074dd30cd4cd2458725bfba147bdf985bcc1d7ba8291f097ff4f291859b35ce3 + REF 6b6492b1ea9ef5ca9ff3c5c59ed71dcca683a446 + SHA512 767aa34ea4b423d951a91bc7c33e737485f24679cebc15536d5d9b4a993a25daaa788ebd7809c942267d8c27009d968f46118fc71302f06c8851824ab2284493 ) file(COPY "${DEP_SOURCE_PATH}/" DESTINATION "${SOURCE_PATH}/src/plugins/intel_cpu/thirdparty/onednn") @@ -80,8 +80,8 @@ if(ENABLE_INTEL_CPU) vcpkg_from_github( OUT_SOURCE_PATH DEP_SOURCE_PATH REPO ARM-software/ComputeLibrary - REF v52.6.0 - SHA512 b7f0c5b33466a064e87fbc549fbb78f49c03ef10d50d5e84a9e8dca66094e469cff5d6c5ec01e26873e957e74e8b8a8472c369ab8aeea74c7c36ad0dfe1ad152 + REF v52.8.0 + SHA512 bf1cc17fce1bd1a2aded7af8427a4ce9eedd8dc8d97329a9a533c40347fac1c620aa03af9f33e1e7e029060fd1ff235c82348d7d6fb33b260a7466adda430482 ) file(COPY "${DEP_SOURCE_PATH}/" DESTINATION "${SOURCE_PATH}/src/plugins/intel_cpu/thirdparty/ComputeLibrary") @@ -95,16 +95,18 @@ if(ENABLE_INTEL_CPU) endif() endif() +if(ENABLE_INTEL_GPU OR ENABLE_INTEL_NPU) + list(APPEND FEATURE_OPTIONS "-DENABLE_SYSTEM_LEVEL_ZERO=ON") +endif() + if(ENABLE_INTEL_NPU) - list(APPEND FEATURE_OPTIONS - "-DENABLE_INTEL_NPU_INTERNAL=OFF" - "-DENABLE_SYSTEM_LEVEL_ZERO=ON") + list(APPEND FEATURE_OPTIONS "-DENABLE_INTEL_NPU_INTERNAL=OFF") vcpkg_from_github( OUT_SOURCE_PATH DEP_SOURCE_PATH REPO intel/level-zero-npu-extensions - REF 8404c63a88d182726038d2b07c219731dada9c21 - SHA512 701c3dbb3fc016a5b2fd70b68375a8191013299b8824bdd2a2830efd69cadc3d4b104b6479c37a46164d1a1a9781e8cc50eebb96c0ada64743e5e2b9456bb1af + REF 42768cc73e74f6d371bd9dd51b1860b07774e7ec + SHA512 f5b45e5e210722f6b2d7b50a89a234089c6f141bfc63eaaab7fc7d8dc4275961bc823046f4f367f6ad8d90a1a5e0c329721a134996fb7aad0e577d94eb49e1c1 ) 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 index cea042b26261f3..275bd84726fa15 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": "2026.0.0", - "port-version": 1, + "version": "2026.1.0", "maintainers": "OpenVINO Developers ", "summary": "This is a port for Open Visual Inference And Optimization toolkit for AI inference", "description": [ @@ -79,6 +78,7 @@ "description": "Enables GPU plugin for inference", "supports": "x64 & !(osx | uwp)", "dependencies": [ + "level-zero", "opencl", "rapidjson" ] diff --git a/versions/baseline.json b/versions/baseline.json index 28f51b3816201f..c9473eb878456d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7417,8 +7417,8 @@ "port-version": 0 }, "openvino": { - "baseline": "2026.0.0", - "port-version": 1 + "baseline": "2026.1.0", + "port-version": 0 }, "openvpn3": { "baseline": "3.10", diff --git a/versions/o-/openvino.json b/versions/o-/openvino.json index ecb1a7a2d1bb05..2f7639413f4d8f 100644 --- a/versions/o-/openvino.json +++ b/versions/o-/openvino.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f8b277efe3110779dec42b55a19cdef20722891e", + "version": "2026.1.0", + "port-version": 0 + }, { "git-tree": "4155b58ea06eda39584e3d35a37fbceec289bdb5", "version": "2026.0.0",