Skip to content

Commit a5ea3ca

Browse files
culhatskerculhatsker
authored
[openvino] update to 2025.2.0 (#46147)
1 parent 18e8629 commit a5ea3ca

File tree

7 files changed

+77
-25
lines changed

7 files changed

+77
-25
lines changed

‎ports/openvino/ambient-onednn-fix.patch

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎ports/openvino/onednn_gpu_includes.patch

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
diff --git a/src/plugins/intel_gpu/src/graph/CMakeLists.txt b/src/plugins/intel_gpu/src/graph/CMakeLists.txt
2+
index b3ee51e242..31477ec128 100644
3+
--- a/src/plugins/intel_gpu/src/graph/CMakeLists.txt
4+
+++ b/src/plugins/intel_gpu/src/graph/CMakeLists.txt
5+
@@ -82,7 +82,7 @@ macro(ov_gpu_add_backend_target)
6+
7+
# We use onednn headers all over the graph module, so we have to append includes to all backends and add a dependency between targets
8+
if (ENABLE_ONEDNN_FOR_GPU)
9+
- target_include_directories(${ARG_NAME} SYSTEM BEFORE PRIVATE $<TARGET_PROPERTY:onednn_gpu_tgt,INTERFACE_INCLUDE_DIRECTORIES>)
10+
+ target_include_directories(${ARG_NAME} BEFORE PRIVATE $<TARGET_PROPERTY:onednn_gpu_tgt,INTERFACE_INCLUDE_DIRECTORIES>)
11+
add_dependencies(openvino_intel_gpu_${IMPL_TYPE}_obj onednn_gpu_tgt)
12+
endif()
13+
endmacro()
14+
diff --git a/src/plugins/intel_gpu/src/runtime/CMakeLists.txt b/src/plugins/intel_gpu/src/runtime/CMakeLists.txt
15+
index 85dfec05c4..3f72a41949 100644
16+
--- a/src/plugins/intel_gpu/src/runtime/CMakeLists.txt
17+
+++ b/src/plugins/intel_gpu/src/runtime/CMakeLists.txt
18+
@@ -56,7 +56,7 @@ if(OV_COMPILER_IS_INTEL_LLVM)
19+
endif()
20+
21+
if(ENABLE_ONEDNN_FOR_GPU)
22+
- ov_target_link_libraries_as_system(${TARGET_NAME} PUBLIC onednn_gpu_tgt)
23+
+ target_link_libraries(${TARGET_NAME} PUBLIC onednn_gpu_tgt)
24+
endif()
25+
26+
ov_set_threading_interface_for(${TARGET_NAME})
27+
diff --git a/src/plugins/intel_gpu/thirdparty/CMakeLists.txt b/src/plugins/intel_gpu/thirdparty/CMakeLists.txt
28+
index e47b2b1ffd..e03c95fdeb 100644
29+
--- a/src/plugins/intel_gpu/thirdparty/CMakeLists.txt
30+
+++ b/src/plugins/intel_gpu/thirdparty/CMakeLists.txt
31+
@@ -173,7 +173,6 @@ if(ENABLE_ONEDNN_FOR_GPU)
32+
set_target_properties(onednn_gpu_tgt PROPERTIES
33+
INTERFACE_LINK_LIBRARIES $<BUILD_INTERFACE:${ONEDNN_GPU_LIB_PATH}>
34+
INTERFACE_INCLUDE_DIRECTORIES "$<BUILD_INTERFACE:${LIB_INCLUDE_DIRS}>"
35+
- INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "${LIB_INCLUDE_DIRS}"
36+
INTERFACE_COMPILE_DEFINITIONS "${LIB_DEFINITIONS}"
37+
)
38+
add_dependencies(onednn_gpu_tgt onednn_gpu_build)

‎ports/openvino/portfile.cmake

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ vcpkg_from_github(
22
OUT_SOURCE_PATH SOURCE_PATH
33
REPO openvinotoolkit/openvino
44
REF "${VERSION}"
5-
SHA512 ae3432e9caf5df1ec292a029c3708a294447070fa02ef1be084264cdc1f21711d0ced8fdb198ea2597bb75f9742efcb4a978517e7bb4baa1bcd67d2c05395501
5+
SHA512 c197421ea3cb68f9444d6fd6273994ed97324aa8cbe88c2ffe8752a693bdcdfeb1a23c5a177ab458855561b75472822cd1a55041369d77140c7f014df0c0f487
66
HEAD_REF master
77
PATCHES
8-
"ambient-onednn-fix.patch"
8+
"onednn_gpu_includes.patch"
99
)
1010

1111
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
@@ -34,8 +34,8 @@ if(ENABLE_INTEL_GPU)
3434
vcpkg_from_github(
3535
OUT_SOURCE_PATH DEP_SOURCE_PATH
3636
REPO oneapi-src/oneDNN
37-
REF fb61a91dd068f9f5abfe2629edbd7cdf53712c7a
38-
SHA512 ab9cd014b00f3981a20684eb7b70a95e0352e3ffd895a38de685b2864481d130d7c712c003bd34db0174d8cfbe3f4aca202d0e0f9fe80bf4893985a874b48b2a
37+
REF c7d59a12849295c8bdf6401b8ea3968f4346ee0c
38+
SHA512 82d0eb852e67dbbc30ceb13c350e493e778b87343909e1c680b05643d92ac3ed2f6bc80d2343ac8c862b1d9001f54542796d905d222f342782feb508747a2414
3939
)
4040
file(COPY "${DEP_SOURCE_PATH}/" DESTINATION "${SOURCE_PATH}/src/plugins/intel_gpu/thirdparty/onednn_gpu")
4141

@@ -48,8 +48,8 @@ if(ENABLE_INTEL_CPU)
4848
vcpkg_from_github(
4949
OUT_SOURCE_PATH DEP_SOURCE_PATH
5050
REPO openvinotoolkit/oneDNN
51-
REF 5baba714e16e11309774a62783f363cad30e97c7
52-
SHA512 72f1a11623f8cabb2605eb734b891f36b16876ac7c940947807c4d574c7e6031dd064de5ebc7d2042c02989c1f38b55499d8c16d70a52d35dfbe74047d0ea3ce
51+
REF 793dd02883483385fb7ee3b1af1e4273ce833444
52+
SHA512 f6b49a9335dacb0ad184a4b98fb97288adfec91ebddd8baa9e02eb443262d995fbd3dbb42d5c1ad99dcd455eef7da829e827a4cd3a09241b9e7aae5ad5cd08be
5353
)
5454
file(COPY "${DEP_SOURCE_PATH}/" DESTINATION "${SOURCE_PATH}/src/plugins/intel_cpu/thirdparty/onednn")
5555

@@ -77,8 +77,8 @@ if(ENABLE_INTEL_CPU)
7777
vcpkg_from_github(
7878
OUT_SOURCE_PATH DEP_SOURCE_PATH
7979
REPO ARM-software/ComputeLibrary
80-
REF v24.09
81-
SHA512 c755da7d576b9bc1f33c9505efe4ce9e50cb927978f929d61f31b213904dca45ddb78b7c0cf9b215e37d2028e0404f4e3435678c120bba16263b55fd701eb4f1
80+
REF v25.03
81+
SHA512 a7c9f8138631aabe24cfe68021d3cdaf6716b69dbcf183694217ca87720efd399f5d809f9fd4522a435a6a991855bcf40d5c6fa6189d77ee8ca5caa1f9ade95c
8282
)
8383
file(COPY "${DEP_SOURCE_PATH}/" DESTINATION "${SOURCE_PATH}/src/plugins/intel_cpu/thirdparty/ComputeLibrary")
8484

@@ -100,8 +100,8 @@ if(ENABLE_INTEL_NPU)
100100
vcpkg_from_github(
101101
OUT_SOURCE_PATH DEP_SOURCE_PATH
102102
REPO intel/level-zero-npu-extensions
103-
REF c0156a3390ae39671ff8f2a6f5471f04bb65bb12
104-
SHA512 33ebdaec13dd05d6cf51e79f0e91a3c68621c428061423e243eb998c9ebe123ee90f6b4edc749d7fa2206c729058afff945177e8c90a05d36220f076e067c22c
103+
REF fd679a50f138840633fee8c780dbbbaee971179c
104+
SHA512 423efbfb81613282e4a9e966930938fade3a9d7e5a5e92e38f119c7a7df93d1c4d5c53d7974dfc828335b84bf174413af61ee8660161316a32fbc1b487133d97
105105
)
106106
file(COPY "${DEP_SOURCE_PATH}/" DESTINATION "${SOURCE_PATH}/src/plugins/intel_npu/thirdparty/level-zero-ext")
107107
endif()

‎ports/openvino/vcpkg.json

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
33
"name": "openvino",
4-
"version": "2025.1.0",
4+
"version": "2025.2.0",
55
"maintainers": "OpenVINO Developers <[email protected]>",
66
"summary": "This is a port for Open Visual Inference And Optimization toolkit for AI inference",
77
"description": [
@@ -133,6 +133,15 @@
133133
"tensorflow": {
134134
"description": "Enables TensorFlow frontend for reading models in TensorFlow format",
135135
"dependencies": [
136+
{
137+
"$comment": "to workaround a linking issue for 2025.2.0 openvino[core,tensorflow]",
138+
"name": "openvino",
139+
"default-features": false,
140+
"features": [
141+
"pytorch"
142+
],
143+
"platform": "linux & static"
144+
},
136145
{
137146
"name": "protobuf",
138147
"version>=": "3.21.2"
@@ -156,6 +165,15 @@
156165
"name": "flatbuffers",
157166
"host": true,
158167
"version>=": "2.0.6"
168+
},
169+
{
170+
"$comment": "to workaround a linking issue for 2025.2.0 openvino[core,tensorflow]",
171+
"name": "openvino",
172+
"default-features": false,
173+
"features": [
174+
"pytorch"
175+
],
176+
"platform": "linux & static"
159177
}
160178
]
161179
}

‎scripts/ci.feature.baseline.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -375,6 +375,10 @@ openmesh:arm-uwp=fail
375375
openmesh:arm64-windows=fail
376376
openmesh:x64-uwp=fail
377377
openslide(windows & native)=fail # g_auto* using __attribute__((cleanup))
378+
# Incorrect use of arm64 intrinsics in <wchar.h> in VS 2022 17.13 broke these with -Zc:arm64-aliased-neon-types-
379+
openvino:arm64-windows-static-md=fail
380+
openvino:arm64-windows=fail
381+
openvino[npu]:x64-linux=cascade # dependency level-zero not supported
378382
openvpn3:x64-osx=fail
379383
openvr:arm-uwp=fail
380384
openvr:arm64-windows=fail

‎versions/baseline.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7113,7 +7113,7 @@
71137113
"port-version": 0
71147114
},
71157115
"openvino": {
7116-
"baseline": "2025.1.0",
7116+
"baseline": "2025.2.0",
71177117
"port-version": 0
71187118
},
71197119
"openvpn3": {

‎versions/o-/openvino.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
{
22
"versions": [
3+
{
4+
"git-tree": "2161d12c267d72c47c732c702c3601e26c71cf9d",
5+
"version": "2025.2.0",
6+
"port-version": 0
7+
},
38
{
49
"git-tree": "b6927db91e67c1efe5e5c98d458cfc7a9196b3c2",
510
"version": "2025.1.0",

0 commit comments

Comments
 (0)