IntenseWebs/openvino
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update ONNX to version 1.11.0 (#11046)

Browse Source
This commit is contained in:
Artur Kulikowski 2022-03-23 13:52:33 +01:00 committed by GitHub
parent a63e2080e1
commit 3674ec403f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 154 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/bindings/python/requirements_test.txt
View File

@ -4,7 +4,7 @@ flake8-comprehensions==3.3.0
flake8-docstrings==1.6.0
flake8-quotes==3.2.0
mypy==0.812
onnx==1.10.1
onnx==1.11.0
pydocstyle==5.1.1
pytest-xdist==2.2.1
pytest==6.1.2

10
src/bindings/python/tests/__init__.py
View File

@ -128,3 +128,13 @@ xfail_issue_63138 = xfail_test(reason="Missing ONNX Shape-15 support")
xfail_issue_68212 = xfail_test(reason="Unsupported reading model with bytes streams")
xfail_issue_78843 = xfail_test(reason="Missing reference output files for ssd mobilenet models")
xfail_issue_81974 = xfail_test(reason="RuntimeError: OpenVINO does not support the following ONNX "
"operations: GridSample, Optional, SequenceConstruct, "
"OptionalHasElement, SequenceInsert")
xfail_issue_81976 = xfail_test(reason="RuntimeError: z node not found in graph cache")
xfail_issue_82038 = xfail_test(reason="ScatterElements, ScatterND, AssertionError: Result mismatch")
xfail_issue_82039 = xfail_test(reason="Unsupported data type Optional, RuntimeError: [ NOT_IMPLEMENTED ] "
"CPU plugin: Input image format UNSPECIFIED is not supported yet...")
xfail_issue_82040 = xfail_test(reason="RoiAlign, AssertionError: result mismatch")

59
src/bindings/python/tests/test_onnx/test_backend.py
View File

@ -45,6 +45,12 @@ from tests import (
xfail_issue_63137,
xfail_issue_63138,
xfail_issue_69444,
xfail_issue_81974,
xfail_issue_81976,
skip_segfault,
xfail_issue_82038,
xfail_issue_82039,
xfail_issue_82040,
)
from tests.test_onnx.utils.onnx_backend import OpenVinoTestBackend
@ -147,6 +153,7 @@ tests_expected_to_fail = [
"OnnxBackendSimpleModelTest.test_sequence_model2_cpu",
"OnnxBackendNodeModelTest.test_identity_sequence_cpu",
"OnnxBackendNodeModelTest.test_if_seq_cpu",
"OnnxBackendNodeModelTest.test_if_opt_cpu", # Optional, SequenceConstruct
),
(
xfail_issue_38701,
@ -343,6 +350,7 @@ tests_expected_to_fail = [
"OnnxBackendNodeModelTest.test_optional_get_element_sequence_cpu",
"OnnxBackendNodeModelTest.test_optional_has_element_cpu",
"OnnxBackendNodeModelTest.test_optional_has_element_empty_cpu",
"OnnxBackendNodeModelTest.test_loop16_seq_none_cpu", # OptionalHasElement, SequenceInsert
),
(
xfail_issue_63138,
@ -360,6 +368,57 @@ tests_expected_to_fail = [
"OnnxBackendNodeModelTest.test_resize_downsample_scales_cubic_A_n0p5_exclude_outside_cpu",
"OnnxBackendNodeModelTest.test_resize_upsample_scales_cubic_A_n0p5_exclude_outside_cpu",
),
(
skip_segfault,
"OnnxBackendNodeModelTest.test_sce_NCd1d2d3d4d5_mean_weight_cpu", # ticket: 81976
"OnnxBackendNodeModelTest.test_sce_NCd1d2d3d4d5_mean_weight_log_prob_cpu", # ticket: 81976
),
(
xfail_issue_81974,
"OnnxBackendNodeModelTest.test_gridsample_aligncorners_true_cpu",
"OnnxBackendNodeModelTest.test_gridsample_bicubic_cpu",
"OnnxBackendNodeModelTest.test_gridsample_bilinear_cpu",
"OnnxBackendNodeModelTest.test_gridsample_border_padding_cpu",
"OnnxBackendNodeModelTest.test_gridsample_cpu",
"OnnxBackendNodeModelTest.test_gridsample_nearest_cpu",
"OnnxBackendNodeModelTest.test_gridsample_reflection_padding_cpu",
"OnnxBackendNodeModelTest.test_gridsample_zeros_padding_cpu",
),
(
xfail_issue_81976, # SoftmaxCrossEntropyLoss operator
"OnnxBackendNodeModelTest.test_sce_NCd1d2d3_none_no_weight_negative_ii_cpu",
"OnnxBackendNodeModelTest.test_sce_NCd1d2d3_none_no_weight_negative_ii_log_prob_cpu",
"OnnxBackendNodeModelTest.test_sce_NCd1d2d3d4d5_none_no_weight_cpu",
"OnnxBackendNodeModelTest.test_sce_NCd1d2d3d4d5_none_no_weight_log_prob_cpu",
"OnnxBackendNodeModelTest.test_sce_mean_3d_cpu",
"OnnxBackendNodeModelTest.test_sce_mean_3d_log_prob_cpu",
"OnnxBackendNodeModelTest.test_sce_mean_cpu",
"OnnxBackendNodeModelTest.test_sce_mean_log_prob_cpu",
"OnnxBackendNodeModelTest.test_sce_mean_no_weight_ii_3d_cpu",
"OnnxBackendNodeModelTest.test_sce_mean_no_weight_ii_3d_log_prob_cpu",
"OnnxBackendNodeModelTest.test_sce_mean_no_weight_ii_4d_cpu",
"OnnxBackendNodeModelTest.test_sce_mean_no_weight_ii_4d_log_prob_cpu",
"OnnxBackendNodeModelTest.test_sce_mean_no_weight_ii_cpu",
"OnnxBackendNodeModelTest.test_sce_mean_no_weight_ii_log_prob_cpu",
"OnnxBackendNodeModelTest.test_sce_none_cpu",
"OnnxBackendNodeModelTest.test_sce_none_log_prob_cpu",
"OnnxBackendNodeModelTest.test_sce_sum_cpu",
"OnnxBackendNodeModelTest.test_sce_sum_log_prob_cpu",
),
(
xfail_issue_82038,
"OnnxBackendNodeModelTest.test_scatter_elements_with_duplicate_indices_cpu",
"OnnxBackendNodeModelTest.test_scatternd_add_cpu",
"OnnxBackendNodeModelTest.test_scatternd_multiply_cpu",
),
(
xfail_issue_82039,
"OnnxBackendNodeModelTest.test_identity_opt_cpu",
),
(
xfail_issue_82040,
"OnnxBackendNodeModelTest.test_roialign_aligned_true_cpu",
),
]
for test_group in tests_expected_to_fail:

2
src/bindings/python/tests/test_onnx/test_ops_unary.py
View File

@ -465,8 +465,6 @@ def test_constant(value_type):
assert np.allclose(ng_results, [values])
# See https://github.com/onnx/onnx/issues/1190
@pytest.mark.xfail(reason="ONNX#1190 numpy.float16 not supported by ONNX make_node", strict=True)
def test_constant_err():
values = np.random.randn(5, 5).astype(np.float16)
node = onnx.helper.make_node(

10
src/bindings/python/tests_compatibility/__init__.py
View File

@ -138,3 +138,13 @@ xfail_issue_63138 = xfail_test(reason="Missing ONNX Shape-15 support")
xfail_issue_78843 = xfail_test(reason="Missing reference output files for ssd mobilenet models")
xfail_issue_78741 = xfail_test(reason="Cannot get dims for non static shape")
xfail_issue_81974 = xfail_test(reason="RuntimeError: OpenVINO does not support the following ONNX "
"operations: GridSample, Optional, SequenceConstruct, "
"OptionalHasElement, SequenceInsert")
xfail_issue_81976 = xfail_test(reason="RuntimeError: z node not found in graph cache")
xfail_issue_82038 = xfail_test(reason="ScatterElements, ScatterND, AssertionError: Result mismatch")
xfail_issue_82039 = xfail_test(reason="Unsupported data type Optional, RuntimeError: [ NOT_IMPLEMENTED ] "
"CPU plugin: Input image format UNSPECIFIED is not supported yet...")
xfail_issue_82040 = xfail_test(reason="RoiAlign, AssertionError: result mismatch")

63
src/bindings/python/tests_compatibility/test_onnx/test_backend.py
View File

@ -45,7 +45,13 @@ from tests_compatibility import (
xfail_issue_63137,
xfail_issue_63138,
xfail_issue_69444,
xfail_issue_78741
xfail_issue_78741,
xfail_issue_81974,
xfail_issue_81976,
skip_segfault,
xfail_issue_82038,
xfail_issue_82039,
xfail_issue_82040,
)
from tests_compatibility.test_onnx.utils.onnx_backend import OpenVinoTestBackend
@ -148,6 +154,7 @@ tests_expected_to_fail = [
"OnnxBackendSimpleModelTest.test_sequence_model2_cpu",
"OnnxBackendNodeModelTest.test_identity_sequence_cpu",
"OnnxBackendNodeModelTest.test_if_seq_cpu",
"OnnxBackendNodeModelTest.test_if_opt_cpu", # Optional, SequenceConstruct
),
(
xfail_issue_38701,
@ -344,6 +351,7 @@ tests_expected_to_fail = [
"OnnxBackendNodeModelTest.test_optional_get_element_sequence_cpu",
"OnnxBackendNodeModelTest.test_optional_has_element_cpu",
"OnnxBackendNodeModelTest.test_optional_has_element_empty_cpu",
"OnnxBackendNodeModelTest.test_loop16_seq_none_cpu", # OptionalHasElement, SequenceInsert
),
(
xfail_issue_63138,
@ -443,7 +451,58 @@ tests_expected_to_fail = [
"OnnxBackendSimpleModelTest.test_expand_shape_model2_cpu",
"OnnxBackendSimpleModelTest.test_expand_shape_model3_cpu",
"OnnxBackendSimpleModelTest.test_expand_shape_model4_cpu",
)
),
(
skip_segfault,
"OnnxBackendNodeModelTest.test_sce_NCd1d2d3d4d5_mean_weight_cpu", # ticket: 81976
"OnnxBackendNodeModelTest.test_sce_NCd1d2d3d4d5_mean_weight_log_prob_cpu", # ticket: 81976
),
(
xfail_issue_81974,
"OnnxBackendNodeModelTest.test_gridsample_aligncorners_true_cpu",
"OnnxBackendNodeModelTest.test_gridsample_bicubic_cpu",
"OnnxBackendNodeModelTest.test_gridsample_bilinear_cpu",
"OnnxBackendNodeModelTest.test_gridsample_border_padding_cpu",
"OnnxBackendNodeModelTest.test_gridsample_cpu",
"OnnxBackendNodeModelTest.test_gridsample_nearest_cpu",
"OnnxBackendNodeModelTest.test_gridsample_reflection_padding_cpu",
"OnnxBackendNodeModelTest.test_gridsample_zeros_padding_cpu",
),
(
xfail_issue_81976, # SoftmaxCrossEntropyLoss operator
"OnnxBackendNodeModelTest.test_sce_NCd1d2d3_none_no_weight_negative_ii_cpu",
"OnnxBackendNodeModelTest.test_sce_NCd1d2d3_none_no_weight_negative_ii_log_prob_cpu",
"OnnxBackendNodeModelTest.test_sce_NCd1d2d3d4d5_none_no_weight_cpu",
"OnnxBackendNodeModelTest.test_sce_NCd1d2d3d4d5_none_no_weight_log_prob_cpu",
"OnnxBackendNodeModelTest.test_sce_mean_3d_cpu",
"OnnxBackendNodeModelTest.test_sce_mean_3d_log_prob_cpu",
"OnnxBackendNodeModelTest.test_sce_mean_cpu",
"OnnxBackendNodeModelTest.test_sce_mean_log_prob_cpu",
"OnnxBackendNodeModelTest.test_sce_mean_no_weight_ii_3d_cpu",
"OnnxBackendNodeModelTest.test_sce_mean_no_weight_ii_3d_log_prob_cpu",
"OnnxBackendNodeModelTest.test_sce_mean_no_weight_ii_4d_cpu",
"OnnxBackendNodeModelTest.test_sce_mean_no_weight_ii_4d_log_prob_cpu",
"OnnxBackendNodeModelTest.test_sce_mean_no_weight_ii_cpu",
"OnnxBackendNodeModelTest.test_sce_mean_no_weight_ii_log_prob_cpu",
"OnnxBackendNodeModelTest.test_sce_none_cpu",
"OnnxBackendNodeModelTest.test_sce_none_log_prob_cpu",
"OnnxBackendNodeModelTest.test_sce_sum_cpu",
"OnnxBackendNodeModelTest.test_sce_sum_log_prob_cpu",
),
(
xfail_issue_82038,
"OnnxBackendNodeModelTest.test_scatter_elements_with_duplicate_indices_cpu",
"OnnxBackendNodeModelTest.test_scatternd_add_cpu",
"OnnxBackendNodeModelTest.test_scatternd_multiply_cpu",
),
(
xfail_issue_82039,
"OnnxBackendNodeModelTest.test_identity_opt_cpu",
),
(
xfail_issue_82040,
"OnnxBackendNodeModelTest.test_roialign_aligned_true_cpu",
),
]
for test_group in tests_expected_to_fail:

2
src/bindings/python/tests_compatibility/test_onnx/test_ops_unary.py
View File

@ -465,8 +465,6 @@ def test_constant(value_type):
assert np.allclose(ng_results, [values])
# See https://github.com/onnx/onnx/issues/1190
@pytest.mark.xfail(reason="ONNX#1190 numpy.float16 not supported by ONNX make_node", strict=True)
def test_constant_err():
values = np.random.randn(5, 5).astype(np.float16)
node = onnx.helper.make_node(

3
src/core/tests/onnx/onnx_transformations.cpp
View File

@ -73,7 +73,8 @@ NGRAPH_TEST(onnx_transformations, expand_function_greater_or_equal) {
EXPECT_TRUE(result.is_ok) << result.error_message;
}
NGRAPH_TEST(onnx_transformations, expand_function_softmax_crossentropy) {
// Disabled, ticket: #81976
NGRAPH_TEST(onnx_transformations, DISABLED_expand_function_softmax_crossentropy) {
ONNXModelEditor editor{
file_util::path_join(SERIALIZED_ZOO, "onnx/transformations/softmax_crossentropy_consumed.onnx")};
editor.decode(); // onnx transformations are applied

2
src/core/tests/requirements_test_onnx.txt
View File

@ -1,4 +1,4 @@
# ONNX - generate test models
docopt~=0.6.2
onnx~=1.10.0
onnx~=1.11.0
protobuf>=3.12

4
src/core/tests/runtime/ie/unit_test.manifest
View File

@ -1551,3 +1551,7 @@ onnx_model_skip_layer_normalization_dynamic_shapes
onnx_model_embed_layer_normalization_dynamic_shapes
# CPU plug-in doesn't support operation with dynamic rank
onnx_model_attention_dynamic_shapes
# z node not found in graph cache ticket: 81976
IE_CPU.onnx_expand_context_dependent_function
IE_CPU.onnx_softmax_crossentropy_loss_mean

4
src/core/tests/runtime/interpreter/unit_test.manifest
View File

@ -140,3 +140,7 @@ INTERPRETER.onnx_controlflow_loop_2d_no_identity_termination_cond_false
# new failures after fixing the TestCase class - 77385
quant_dequant_pattern_axis
onnx_clip_no_min_no_max_int64
# z node not found in graph cache - ticket: 81976
INTERPRETER.onnx_expand_context_dependent_function
INTERPRETER.onnx_softmax_crossentropy_loss_mean

2
src/frontends/onnx/frontend/CMakeLists.txt
View File

@ -10,7 +10,7 @@ ov_add_frontend(NAME onnx
FILEDESCRIPTION "FrontEnd to load and convert ONNX file format"
LINK_LIBRARIES ngraph::builder openvino::util onnx_common openvino::runtime::dev)
set(ONNX_OPSET_VERSION 15 CACHE INTERNAL "Supported version of ONNX operator set")
set(ONNX_OPSET_VERSION 16 CACHE INTERNAL "Supported version of ONNX operator set")
target_compile_definitions(${TARGET_NAME} PRIVATE ONNX_OPSET_VERSION=${ONNX_OPSET_VERSION})
ov_ncc_naming_style(FOR_TARGET ${TARGET_NAME}

2
thirdparty/onnx/onnx vendored

@ -1 +1 @@
Subproject commit da889e6b95750350726d149bf447bf0cd1245964
Subproject commit 96046b8ccfb8e6fa82f6b2b34b3d56add2e8849c