Skip to content

Commit 12a5e5a

Browse files
[ONNX] Switched to ONNX 1.16.0 (openvinotoolkit#24242)
### Details: - Switched to ONNX 1.16.0 - Removed WA for ONNX 1.15.0 - ONNXRuntime for tests 1.18.1 ### Tickets: - 136748, 138876 --------- Co-authored-by: Ilya Lavrenov <ilya.lavrenov@intel.com>
1 parent 7eedf84 commit 12a5e5a

File tree

10 files changed

+62
-20
lines changed

10 files changed

+62
-20
lines changed

conan.lock

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"opencl-icd-loader/2023.04.17#5f73dd9f0c023d416a7f162e320b9c77%1692732261.088",
1111
"opencl-headers/2023.04.17#3d98f2d12a67c2400de6f11d5335b5a6%1683936272.16",
1212
"opencl-clhpp-headers/2023.04.17#7c62fcc7ac2559d4839150d2ebaac5c8%1685450803.672",
13-
"onnx/1.15.0#54b6d944e6995300bc7bcdd3a3206d74%1698840505.336",
13+
"onnx/1.16.0#4d2d4f24d6f73b8a7551e001839631f0%1712404811.278",
1414
"onetbb/2021.10.0#cbb2fc43088070b48f6e4339bc8fa0e1%1693812561.235",
1515
"ittapi/3.24.0#9246125f13e7686dee2b0c992b71db94%1682969872.743",
1616
"hwloc/2.9.2#1c63e2eccac57048ae226e6c946ebf0e%1688677682.002",

conanfile.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ opencl-icd-loader/[>=2023.04.17]
77
rapidjson/[>=1.1.0]
88
xbyak/[>=6.62]
99
snappy/[>=1.1.7]
10-
onnx/1.15.0
10+
onnx/1.16.0
1111
pybind11/[>=2.12.0]
1212
flatbuffers/[>=22.9.24]
1313

src/bindings/python/constraints.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@ paddlepaddle==2.6.0
2222
tensorflow>=1.15.5,<2.18.0
2323
six~=1.16.0
2424
protobuf>=3.18.1,<4.0.0
25-
onnx==1.15.0
25+
onnx==1.16.0

src/frontends/onnx/tests/__init__.py

+7-1
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,12 @@ def xfail_test(reason="Mark the test as expected to fail", strict=True):
173173
"Not equal to tolerance")
174174
xfail_issue_122775 = xfail_test(reason="test_resize_downsample_scales_linear_cpu - "
175175
"Not equal to tolerance")
176-
skip_misalignment = pytest.mark.skip(reason="Misalignment between onnx versions") # Need to enable after bumping to 1.15
177176
skip_issue_127649 = pytest.mark.skip(reason="Not equal to tolerance rtol=0.001, atol=1e-07 - "
178177
"Mismatched elements: 1 / 1000 (0.1%)")
178+
179+
# ONNX 1.16
180+
skip_misalignment = pytest.mark.skip(reason="Misalignment between onnx versions") # Need to enable after bumping to 1.16
181+
xfail_issue_139934 = xfail_test(reason = "Int4 isn't supported")
182+
xfail_issue_139936 = xfail_test(reason = "MaxPool accuracy fails")
183+
xfail_issue_139937 = xfail_test(reason = "GroupNorm, QLinearMatMul, DequantizeLinear translation failed")
184+
xfail_issue_139938 = xfail_test(reason = "QLinearMatMul accuracy fails")
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
a457c1df80f391ea6de0ab1d454297716976dbf3
1+
rel-1.18.1

src/frontends/onnx/tests/tests_python/test_backend.py

+44
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,10 @@
7575
xfail_issue_122776,
7676
skip_misalignment,
7777
skip_issue_124587,
78+
xfail_issue_139934,
79+
xfail_issue_139936,
80+
xfail_issue_139937,
81+
xfail_issue_139938,
7882
)
7983
from tests.tests_python.utils.onnx_backend import OpenVinoTestBackend
8084

@@ -575,6 +579,8 @@ def expect_fail(test_case_path, xfail): # type: (str) -> None
575579
"OnnxBackendNodeModelTest.test_ai_onnx_ml_label_encoder_string_int_no_default_cpu",
576580
"OnnxBackendNodeModelTest.test_ai_onnx_ml_label_encoder_tensor_mapping_cpu",
577581
"OnnxBackendNodeModelTest.test_ai_onnx_ml_label_encoder_tensor_value_only_mapping_cpu",
582+
"OnnxBackendNodeModelTest.test_ai_onnx_ml_tree_ensemble_set_membership_cpu",
583+
"OnnxBackendNodeModelTest.test_ai_onnx_ml_tree_ensemble_single_tree_cpu",
578584
),
579585
(
580586
xfail_issue_119925,
@@ -650,6 +656,13 @@ def expect_fail(test_case_path, xfail): # type: (str) -> None
650656
skip_misalignment,
651657
"OnnxBackendNodeModelTest.test_gelu_default_2_expanded_cpu",
652658
"OnnxBackendNodeModelTest.test_reduce_log_sum_exp_empty_set_expanded_cpu",
659+
"OnnxBackendNodeModelTest.test_group_normalization_epsilon_cpu",
660+
"OnnxBackendNodeModelTest.test_group_normalization_example_cpu",
661+
"OnnxBackendNodeModelTest.test_qlinearmatmul_3D_int8_float16_cpu",
662+
"OnnxBackendNodeModelTest.test_qlinearmatmul_3D_int8_float32_cpu",
663+
"OnnxBackendNodeModelTest.test_qlinearmatmul_3D_uint8_float16_cpu",
664+
"OnnxBackendNodeModelTest.test_quantizelinear_blocked_asymmetric_cpu",
665+
"OnnxBackendNodeModelTest.test_quantizelinear_blocked_symmetric_cpu",
653666
),
654667
(
655668
skip_issue_124587,
@@ -658,6 +671,37 @@ def expect_fail(test_case_path, xfail): # type: (str) -> None
658671
"OnnxBackendNodeModelTest.test_split_variable_parts_default_axis_opset13_cpu",
659672
"OnnxBackendNodeModelTest.test_split_variable_parts_default_axis_opset18_cpu",
660673
),
674+
(
675+
xfail_issue_139934,
676+
"OnnxBackendNodeModelTest.test_cast_FLOAT16_to_INT4_cpu",
677+
"OnnxBackendNodeModelTest.test_cast_FLOAT16_to_UINT4_cpu",
678+
"OnnxBackendNodeModelTest.test_cast_FLOAT_to_INT4_cpu",
679+
"OnnxBackendNodeModelTest.test_cast_FLOAT_to_UINT4_cpu",
680+
"OnnxBackendNodeModelTest.test_cast_INT4_to_FLOAT16_cpu",
681+
"OnnxBackendNodeModelTest.test_cast_INT4_to_FLOAT_cpu",
682+
"OnnxBackendNodeModelTest.test_cast_INT4_to_INT8_cpu",
683+
"OnnxBackendNodeModelTest.test_cast_UINT4_to_FLOAT16_cpu",
684+
"OnnxBackendNodeModelTest.test_cast_UINT4_to_FLOAT_cpu",
685+
"OnnxBackendNodeModelTest.test_cast_UINT4_to_UINT8_cpu",
686+
"OnnxBackendNodeModelTest.test_dequantizelinear_int4_cpu",
687+
"OnnxBackendNodeModelTest.test_dequantizelinear_uint4_cpu",
688+
"OnnxBackendNodeModelTest.test_quantizelinear_int4_cpu",
689+
"OnnxBackendNodeModelTest.test_quantizelinear_uint4_cpu",
690+
),
691+
(
692+
xfail_issue_139936,
693+
"OnnxBackendNodeModelTest.test_maxpool_2d_ceil_output_size_reduce_by_one_cpu",
694+
),
695+
(
696+
xfail_issue_139937,
697+
"OnnxBackendNodeModelTest.test_dequantizelinear_blocked_cpu",
698+
"OnnxBackendNodeModelTest.test_qlinearmatmul_2D_int8_float16_cpu",
699+
),
700+
(
701+
xfail_issue_139938,
702+
"OnnxBackendNodeModelTest.test_qlinearmatmul_2D_int8_float32_cpu",
703+
"OnnxBackendNodeModelTest.test_qlinearmatmul_2D_uint8_float16_cpu",
704+
),
661705
]
662706

663707
if platform.system() == 'Darwin':

thirdparty/onnx/CMakeLists.txt

+4-12
Original file line numberDiff line numberDiff line change
@@ -44,21 +44,13 @@ foreach(_onnx_target onnx onnx_proto)
4444
$<TARGET_PROPERTY:protobuf::libprotobuf,INTERFACE_INCLUDE_DIRECTORIES>)
4545
endforeach()
4646

47-
if(WIN32)
48-
# from onnx==1.13.1 it requires C++17 when compiling on Windows
49-
target_compile_features(onnx PRIVATE cxx_std_17)
47+
if(MINGW)
5048
# OPTIONAL is a reserved word for mingw at least
51-
if(MINGW)
52-
target_compile_definitions(onnx PRIVATE OPTIONAL=OPTIONAL_PLACEHOLDER)
53-
endif()
49+
target_compile_definitions(onnx PRIVATE OPTIONAL=OPTIONAL_PLACEHOLDER)
5450
endif()
5551

56-
# WA to support old compiler version, removes unused header which may block build
57-
if(CMAKE_COMPILER_IS_GNUCXX AND LINUX AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 7.0)
58-
file(READ onnx/onnx/defs/parser.cc CONTENT)
59-
string(REPLACE "#include <string_view>" "" CONTENT "${CONTENT}")
60-
file(WRITE onnx/onnx/defs/parser.cc "${CONTENT}")
61-
endif()
52+
# from onnx==1.13.1 it requires C++17 when compiling on Windows, and since onnx==1.16.0 on Linux
53+
target_compile_features(onnx PRIVATE cxx_std_17)
6254

6355
ov_disable_all_warnings(onnx onnx_proto)
6456

thirdparty/onnx/onnx

Submodule onnx updated 625 files

tools/constraints.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
h5py>=3.1.0,<3.11.0
66
mxnet~=1.2.0; sys_platform == 'win32'
77
mxnet>=1.7.0.post2,<=1.9.1; sys_platform != 'win32'
8-
onnx>=1.8.1,<=1.15.0
8+
onnx>=1.8.1,<=1.16.0
99
networkx<=3.1.0
1010
pytest>=5.0,<8.4
1111
protobuf>=3.18.1,<4.0.0

vcpkg.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -140,4 +140,4 @@
140140
]
141141
}
142142
}
143-
}
143+
}

0 commit comments

Comments
 (0)