mirror of https://github.com/microsoft/vcpkg.git
[openvino] update to 2026.3.0 (#53401)
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
parent
ffe4f22377
commit
aeb844bc19
|
|
@ -0,0 +1,13 @@
|
|||
diff --git a/src/cmake/ov_parallel.cmake b/src/cmake/ov_parallel.cmake
|
||||
index 2f2efc00b7..67d67ff17e 100644
|
||||
--- a/src/cmake/ov_parallel.cmake
|
||||
+++ b/src/cmake/ov_parallel.cmake
|
||||
@@ -77,7 +77,7 @@ endfunction()
|
||||
|
||||
macro(ov_find_package_tbb)
|
||||
if((THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO" OR THREADING STREQUAL "TBB_ADAPTIVE") AND NOT TBB_FOUND)
|
||||
- if(ANDROID)
|
||||
+ if(FALSE)
|
||||
if(NOT DEFINED TBB_DIR AND NOT DEFINED ENV{TBB_DIR})
|
||||
message(FATAL_ERROR
|
||||
"Android build with TBB threading requires a separately built oneTBB package. "
|
||||
|
|
@ -0,0 +1,14 @@
|
|||
diff --git a/src/plugins/intel_npu/src/utils/src/vm/CMakeLists.txt b/src/plugins/intel_npu/src/utils/src/vm/CMakeLists.txt
|
||||
index 6264da970c..e526291afd 100644
|
||||
--- a/src/plugins/intel_npu/src/utils/src/vm/CMakeLists.txt
|
||||
+++ b/src/plugins/intel_npu/src/utils/src/vm/CMakeLists.txt
|
||||
@@ -34,4 +34,8 @@ endif()
|
||||
# headers are copied into the build directory by prepare_ze_headers; without
|
||||
# this explicit dependency a parallel build may compile ${TARGET_NAME} before
|
||||
# the headers are copied, causing a missing-header error
|
||||
-add_dependencies(${TARGET_NAME} prepare_ze_headers)
|
||||
+# If ENABLE_SYSTEM_LEVEL_ZERO enabled, prepare_ze_headers is not defined so
|
||||
+# it may not exist
|
||||
+if (TARGET prepare_ze_headers)
|
||||
+ add_dependencies(${TARGET_NAME} prepare_ze_headers)
|
||||
+endif()
|
||||
|
|
@ -6,10 +6,10 @@ index 3ce87023..1f023280 100644
|
|||
set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /DEBUG")
|
||||
endif()
|
||||
|
||||
+ if(CMAKE_BUILD_TYPE STREQUAL "Debug")
|
||||
+ string(REPLACE "/Z7" "/Zi" CMAKE_C_FLAGS_DEBUG $CMAKE_C_FLAGS_DEBUG)
|
||||
+ string(REPLACE "/Z7" "/Zi" CMAKE_CXX_FLAGS_DEBUG $CMAKE_CXX_FLAGS_DEBUG)
|
||||
+ endif()
|
||||
+ string(REPLACE "/Z7" "/Zi" CMAKE_C_FLAGS_DEBUG ${CMAKE_C_FLAGS_DEBUG})
|
||||
+ string(REPLACE "/Z7" "/Zi" CMAKE_CXX_FLAGS_DEBUG ${CMAKE_CXX_FLAGS_DEBUG})
|
||||
+ string(REPLACE "/Z7" "/Zi" CMAKE_C_FLAGS_RELEASE ${CMAKE_C_FLAGS_RELEASE})
|
||||
+ string(REPLACE "/Z7" "/Zi" CMAKE_CXX_FLAGS_RELEASE ${CMAKE_CXX_FLAGS_RELEASE})
|
||||
+
|
||||
# need to set extra flags after /DEBUG to ensure that binary size is not bloated
|
||||
set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /OPT:REF /OPT:ICF")
|
||||
|
|
|
|||
|
|
@ -1,53 +0,0 @@
|
|||
diff --git a/cmake/features.cmake b/cmake/features.cmake
|
||||
index 8badc2e5..f8791b4c 100644
|
||||
--- a/cmake/features.cmake
|
||||
+++ b/cmake/features.cmake
|
||||
@@ -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}
|
||||
- "ENABLE_OV_TF_LITE_FRONTEND" OFF)
|
||||
+ "ENABLE_OV_TF_LITE_FRONTEND OR ENABLE_INTEL_NPU" OFF)
|
||||
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 3f34a73e..e561d570 100644
|
||||
--- a/src/plugins/intel_npu/cmake/download_compiler_libs.cmake
|
||||
+++ b/src/plugins/intel_npu/cmake/download_compiler_libs.cmake
|
||||
@@ -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-${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-${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-${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}")
|
||||
|
|
@ -1,38 +0,0 @@
|
|||
diff --git a/src/plugins/intel_gpu/src/graph/CMakeLists.txt b/src/plugins/intel_gpu/src/graph/CMakeLists.txt
|
||||
index 380159c3..ded4303a 100644
|
||||
--- a/src/plugins/intel_gpu/src/graph/CMakeLists.txt
|
||||
+++ b/src/plugins/intel_gpu/src/graph/CMakeLists.txt
|
||||
@@ -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_PROPERTY:onednn_gpu_tgt,INTERFACE_INCLUDE_DIRECTORIES>)
|
||||
+ target_include_directories(${ARG_NAME} BEFORE PRIVATE $<TARGET_PROPERTY:onednn_gpu_tgt,INTERFACE_INCLUDE_DIRECTORIES>)
|
||||
add_dependencies(openvino_intel_gpu_${IMPL_TYPE}_obj onednn_gpu_tgt)
|
||||
endif()
|
||||
# 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 c8c87207..6565ad76 100644
|
||||
--- a/src/plugins/intel_gpu/src/runtime/CMakeLists.txt
|
||||
+++ b/src/plugins/intel_gpu/src/runtime/CMakeLists.txt
|
||||
@@ -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 2bf709fc..edf6cf81 100644
|
||||
--- a/src/plugins/intel_gpu/thirdparty/CMakeLists.txt
|
||||
+++ b/src/plugins/intel_gpu/thirdparty/CMakeLists.txt
|
||||
@@ -178,7 +178,6 @@ if(ENABLE_ONEDNN_FOR_GPU)
|
||||
set_target_properties(onednn_gpu_tgt PROPERTIES
|
||||
INTERFACE_LINK_LIBRARIES $<BUILD_INTERFACE:${ONEDNN_GPU_LIB_PATH}>
|
||||
INTERFACE_INCLUDE_DIRECTORIES "$<BUILD_INTERFACE:${LIB_INCLUDE_DIRS}>"
|
||||
- INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "${LIB_INCLUDE_DIRS}"
|
||||
INTERFACE_COMPILE_DEFINITIONS "${LIB_DEFINITIONS}"
|
||||
)
|
||||
add_dependencies(onednn_gpu_tgt onednn_gpu_build)
|
||||
|
|
@ -2,14 +2,13 @@ vcpkg_from_github(
|
|||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO openvinotoolkit/openvino
|
||||
REF "${VERSION}"
|
||||
SHA512 c8f222cf278017da610a8d0f0c5bd5c6c54c0324bfcfdf9352063df2706732eaa54b7b01408aec1ca266a3f02bd2bffa671d2415121d8f3675f46d8114355de6
|
||||
SHA512 161ee93fb99df97ff7724411f4d697f90c70614840aee3eb40b865faad719f8e2e8892637b867fc3cd97c1de8ebadab84973c379c5a1927bed70ca2c74e6344c
|
||||
HEAD_REF master
|
||||
PATCHES
|
||||
msvc-debug-info-only-in-pdb.patch
|
||||
onednn-gpu-includes.patch
|
||||
protobuf-6.patch
|
||||
npu-deps.patch
|
||||
remove-stdext-on-new-msvc.diff
|
||||
levelzero-prepareheaders.patch
|
||||
android-ignore-onetbb-warning.patch
|
||||
)
|
||||
|
||||
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
|
||||
|
|
@ -38,8 +37,8 @@ if(ENABLE_INTEL_GPU)
|
|||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH DEP_SOURCE_PATH
|
||||
REPO oneapi-src/oneDNN
|
||||
REF 470e87eb07bdc805937a9f6d45d5c3a0fe4d27e7
|
||||
SHA512 ab5c303e415e88b83bf9a20b65c097827cb7b3ca8af196568fadb62f15c49af879dccb1c9130eadd40df7eb170521d02d7a48d021446ecd31fdaa56d31dba416
|
||||
REF v3.13
|
||||
SHA512 e2dc1a17252bff470c1dce2ef675d77308255ad3c9d40c3e77bcc3f560a2d1617f0878e5dec22a5012c31fb75809c0483a2cd8eefd5b9f2a2549a5afecf9135c
|
||||
)
|
||||
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 6b6492b1ea9ef5ca9ff3c5c59ed71dcca683a446
|
||||
SHA512 767aa34ea4b423d951a91bc7c33e737485f24679cebc15536d5d9b4a993a25daaa788ebd7809c942267d8c27009d968f46118fc71302f06c8851824ab2284493
|
||||
REF f82d833de6f13fac4bb1926d521ca8fec4f4ae01
|
||||
SHA512 aea38db54ad75196d4475c8bcf9a7d781979d714f0eadf964337cff3f713a747e3a82f4c68c2597ecfd6ea882cf8a30e1a53f0425206e7c892b1e2e86a1e3201
|
||||
)
|
||||
file(COPY "${DEP_SOURCE_PATH}/" DESTINATION "${SOURCE_PATH}/src/plugins/intel_cpu/thirdparty/onednn")
|
||||
|
||||
|
|
@ -81,16 +80,16 @@ if(ENABLE_INTEL_CPU)
|
|||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH DEP_SOURCE_PATH
|
||||
REPO ARM-software/ComputeLibrary
|
||||
REF v52.8.0
|
||||
SHA512 bf1cc17fce1bd1a2aded7af8427a4ce9eedd8dc8d97329a9a533c40347fac1c620aa03af9f33e1e7e029060fd1ff235c82348d7d6fb33b260a7466adda430482
|
||||
REF v53.1.0
|
||||
SHA512 6f49f1a66d8242d73d2f736668ea7156a2564d47b1eb8dc106095ec0f0b662873f65f8e3e47bdbfb769f273d9d7707d253ab3eba95b2830eb0ddbc80f657f718
|
||||
)
|
||||
file(COPY "${DEP_SOURCE_PATH}/" DESTINATION "${SOURCE_PATH}/src/plugins/intel_cpu/thirdparty/ComputeLibrary")
|
||||
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH DEP_SOURCE_PATH
|
||||
REPO ARM-software/kleidiai
|
||||
REF v1.19.0
|
||||
SHA512 46de1f0cdd04ce1e8de5d1bdb2499d07eb377e616eb3a8596fbcd296b7887e413be5470f383b5790cef73dc370bead3db36ef2ed116513b95924ae71d87ef123
|
||||
REF v1.26.0
|
||||
SHA512 bdb2fa30025d7cd885ab143df98f70c454e2ff7a5d94be6ac99cfa66dafa4a8dcd83f07652b285ef61ed8523bdb0d4c313b506cd1c71347d5400e935783fc459
|
||||
)
|
||||
file(COPY "${DEP_SOURCE_PATH}/" DESTINATION "${SOURCE_PATH}/src/plugins/intel_cpu/thirdparty/kleidiai")
|
||||
endif()
|
||||
|
|
@ -106,10 +105,24 @@ if(ENABLE_INTEL_NPU)
|
|||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH DEP_SOURCE_PATH
|
||||
REPO intel/level-zero-npu-extensions
|
||||
REF 42768cc73e74f6d371bd9dd51b1860b07774e7ec
|
||||
SHA512 f5b45e5e210722f6b2d7b50a89a234089c6f141bfc63eaaab7fc7d8dc4275961bc823046f4f367f6ad8d90a1a5e0c329721a134996fb7aad0e577d94eb49e1c1
|
||||
REF f9ad3bf89c2418d714aef2e6b96a5aafb12a1971
|
||||
SHA512 ab450badbf3aa39ca9b753b0b3019c0d3fb6d267c4689cffca3c9a36163aaaebcba327f11991d5bc0798b6d5f530331e4456abdaec520e5ad486bfca9f6404ff
|
||||
)
|
||||
file(COPY "${DEP_SOURCE_PATH}/" DESTINATION "${SOURCE_PATH}/src/plugins/intel_npu/thirdparty/level-zero-ext")
|
||||
|
||||
if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
|
||||
vcpkg_download_distfile(
|
||||
NPU_PLUGIN_COMPILER_ARCHIVE
|
||||
URLS "https://storage.openvinotoolkit.org/dependencies/thirdparty/windows/npu_compiler/npu_compiler_vcl_windows_2022-8_2_0-9802763.zip"
|
||||
FILENAME "npu_compiler_vcl_windows_2022-8_2_0-9802763.zip"
|
||||
SHA512 "5fbe44129b796b12c106a80a967fc9e50e561fcac1bd7b1a2f17cfd50462accfe82d3049f75512566c3d80963ee597e3003a1e0ce52ce7bb0280193ceed83fa3"
|
||||
)
|
||||
vcpkg_extract_archive(
|
||||
ARCHIVE ${NPU_PLUGIN_COMPILER_ARCHIVE}
|
||||
DESTINATION ${SOURCE_PATH}/npu_compiler
|
||||
)
|
||||
list(APPEND FEATURE_OPTIONS "-DNPU_PLUGIN_COMPILER_ROOT=${SOURCE_PATH}/npu_compiler")
|
||||
endif()
|
||||
endif()
|
||||
|
||||
if(ENABLE_OV_TF_FRONTEND OR ENABLE_OV_ONNX_FRONTEND OR ENABLE_OV_PADDLE_FRONTEND)
|
||||
|
|
@ -128,6 +141,10 @@ if(CMAKE_HOST_WIN32)
|
|||
list(APPEND FEATURE_OPTIONS "-DENABLE_API_VALIDATOR=OFF")
|
||||
endif()
|
||||
|
||||
if(VCPKG_TARGET_IS_WINDOWS)
|
||||
list(APPEND FEATURE_OPTIONS "-DENABLE_PDB_IN_RELEASE=ON")
|
||||
endif()
|
||||
|
||||
vcpkg_find_acquire_program(PKGCONFIG)
|
||||
|
||||
vcpkg_cmake_configure(
|
||||
|
|
@ -154,7 +171,26 @@ vcpkg_cmake_install()
|
|||
|
||||
vcpkg_cmake_config_fixup()
|
||||
|
||||
vcpkg_copy_pdbs()
|
||||
if(ENABLE_INTEL_NPU AND VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
|
||||
file(GLOB_RECURSE openvino_built_dlls "${CURRENT_PACKAGES_DIR}/*.dll")
|
||||
list(FILTER openvino_built_dlls EXCLUDE REGEX "/openvino_intel_npu_(compiler|compiler_loader|vm_runtime)\\.dll$")
|
||||
vcpkg_copy_pdbs(BUILD_PATHS ${openvino_built_dlls})
|
||||
|
||||
foreach(config IN ITEMS "" "debug/")
|
||||
file(INSTALL
|
||||
"${SOURCE_PATH}/npu_compiler/pdb/openvino_intel_npu_compiler.pdb"
|
||||
"${SOURCE_PATH}/npu_compiler/pdb/openvino_intel_npu_compiler_loader.pdb"
|
||||
DESTINATION "${CURRENT_PACKAGES_DIR}/${config}bin"
|
||||
)
|
||||
file(INSTALL
|
||||
"${SOURCE_PATH}/npu_compiler/pdb/npu_interpreter_runtime.pdb"
|
||||
DESTINATION "${CURRENT_PACKAGES_DIR}/${config}bin"
|
||||
RENAME "openvino_intel_npu_vm_runtime.pdb"
|
||||
)
|
||||
endforeach()
|
||||
else()
|
||||
vcpkg_copy_pdbs()
|
||||
endif()
|
||||
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
diff --git a/thirdparty/dependencies.cmake b/thirdparty/dependencies.cmake
|
||||
index 95b97fcb..ac8b6c06 100644
|
||||
index 5e1073d802..6e3faaa3e1 100644
|
||||
--- a/thirdparty/dependencies.cmake
|
||||
+++ b/thirdparty/dependencies.cmake
|
||||
@@ -363,7 +363,7 @@ if(ENABLE_OV_PADDLE_FRONTEND OR ENABLE_OV_ONNX_FRONTEND OR ENABLE_OV_TF_FRONTEND
|
||||
@@ -376,7 +376,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
|
||||
|
|
|
|||
|
|
@ -1,26 +0,0 @@
|
|||
diff --git a/src/plugins/intel_gpu/include/intel_gpu/runtime/compounds.hpp b/src/plugins/intel_gpu/include/intel_gpu/runtime/compounds.hpp
|
||||
index 0554b0fd..f07e4c82 100644
|
||||
--- a/src/plugins/intel_gpu/include/intel_gpu/runtime/compounds.hpp
|
||||
+++ b/src/plugins/intel_gpu/include/intel_gpu/runtime/compounds.hpp
|
||||
@@ -50,7 +50,7 @@ public:
|
||||
size_t size() const { return _size; }
|
||||
bool empty() const { return _size == 0; }
|
||||
|
||||
-#if defined(_SECURE_SCL) && (_SECURE_SCL > 0)
|
||||
+#if defined(_SECURE_SCL) && (_SECURE_SCL > 0) && (!defined(_MSC_VER) || _MSC_VER < 1951)
|
||||
typedef stdext::checked_array_iterator<T*> iterator;
|
||||
typedef stdext::checked_array_iterator<const T*> const_iterator;
|
||||
iterator begin() const { return stdext::make_checked_array_iterator(_data, _size); }
|
||||
diff --git a/src/plugins/intel_gpu/include/intel_gpu/runtime/memory.hpp b/src/plugins/intel_gpu/include/intel_gpu/runtime/memory.hpp
|
||||
index ee7dfa1f..91dedccb 100644
|
||||
--- a/src/plugins/intel_gpu/include/intel_gpu/runtime/memory.hpp
|
||||
+++ b/src/plugins/intel_gpu/include/intel_gpu/runtime/memory.hpp
|
||||
@@ -186,7 +186,7 @@ struct mem_lock {
|
||||
mem_lock(const mem_lock& other) = delete;
|
||||
mem_lock& operator=(const mem_lock& other) = delete;
|
||||
|
||||
-#if defined(_SECURE_SCL) && (_SECURE_SCL > 0)
|
||||
+#if defined(_SECURE_SCL) && (_SECURE_SCL > 0) && (!defined(_MSC_VER) || _MSC_VER < 1951)
|
||||
auto begin() & { return stdext::make_checked_array_iterator(_ptr, size()); }
|
||||
auto end() & { return stdext::make_checked_array_iterator(_ptr, size(), size()); }
|
||||
#else
|
||||
|
|
@ -1,8 +1,7 @@
|
|||
{
|
||||
"$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
|
||||
"name": "openvino",
|
||||
"version": "2026.1.0",
|
||||
"port-version": 1,
|
||||
"version": "2026.3.0",
|
||||
"maintainers": "OpenVINO Developers <openvino@intel.com>",
|
||||
"summary": "This is a port for Open Visual Inference And Optimization toolkit for AI inference",
|
||||
"description": [
|
||||
|
|
|
|||
|
|
@ -7569,8 +7569,8 @@
|
|||
"port-version": 0
|
||||
},
|
||||
"openvino": {
|
||||
"baseline": "2026.1.0",
|
||||
"port-version": 1
|
||||
"baseline": "2026.3.0",
|
||||
"port-version": 0
|
||||
},
|
||||
"openvpn3": {
|
||||
"baseline": "3.10",
|
||||
|
|
|
|||
|
|
@ -1,5 +1,10 @@
|
|||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "976f9b1f7756644db3ddf20ebd61b61c344d1e20",
|
||||
"version": "2026.3.0",
|
||||
"port-version": 0
|
||||
},
|
||||
{
|
||||
"git-tree": "61f1fad46909bd824f7e673dd654d03347d95d58",
|
||||
"version": "2026.1.0",
|
||||
|
|
|
|||
Loading…
Reference in New Issue