Skip to content

Commit 77b6a3d

Browse files
p-wysockiakuporos
andauthored
Bump ONNX to 1.13, Tensorflow to 2.12 and protobuf to 3.20.3 (#23992)
### Details: - Cherry-pick #23990 - Backport #14773 ### Tickets: - N/A --------- Co-authored-by: Anastasia Kuporosova <[email protected]>
1 parent 315cc80 commit 77b6a3d

File tree

34 files changed

+572
-68
lines changed

34 files changed

+572
-68
lines changed

.ci/azure/linux.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -400,9 +400,10 @@ jobs:
400400
displayName: 'ONNX Frontend Tests'
401401
continueOnError: false
402402

403-
- script: $(RUN_PREFIX) $(INSTALL_TEST_DIR)/paddle_tests --gtest_print_time=1 --gtest_output=xml:$(INSTALL_TEST_DIR)/TEST-Paddle.xml
404-
displayName: 'Paddle Frontend UT'
405-
continueOnError: false
403+
# TODO Reenable PDPD after paddlepaddle==2.5.0 with compliant protobuf is released (ticket 95904)
404+
# - script: $(RUN_PREFIX) $(INSTALL_TEST_DIR)/paddle_tests --gtest_print_time=1 --gtest_output=xml:$(INSTALL_TEST_DIR)/TEST-Paddle.xml
405+
# displayName: 'Paddle Frontend UT'
406+
# continueOnError: false
406407

407408
- script: $(RUN_PREFIX) $(INSTALL_TEST_DIR)/ov_tensorflow_frontend_tests --gtest_print_time=1 --gtest_output=xml:$(INSTALL_TEST_DIR)/TEST-Tensorflow.xml
408409
displayName: 'TensorFlow Frontend Unit Tests'

.ci/azure/windows.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -278,9 +278,10 @@ jobs:
278278
displayName: 'ONNX Frontend Tests'
279279
continueOnError: false
280280

281-
- script: call $(SETUPVARS) && $(INSTALL_TEST_DIR)\paddle_tests --gtest_print_time=1 --gtest_output=xml:$(INSTALL_TEST_DIR)\TEST-Paddle.xml
282-
displayName: 'Paddle Frontend UT'
283-
continueOnError: false
281+
# TODO Reenable PDPD after paddlepaddle==2.5.0 with compliant protobuf is released (ticket 95904)
282+
# - script: call $(SETUPVARS) && $(INSTALL_TEST_DIR)\paddle_tests --gtest_print_time=1 --gtest_output=xml:$(INSTALL_TEST_DIR)\TEST-Paddle.xml
283+
# displayName: 'Paddle Frontend UT'
284+
# continueOnError: false
284285

285286
- script: call $(SETUPVARS) && $(INSTALL_TEST_DIR)\ov_tensorflow_frontend_tests --gtest_print_time=1 --gtest_output=xml:$(INSTALL_TEST_DIR)\TEST-Tensorflow.xml
286287
displayName: 'TensorFlow Frontend Unit Tests'

src/bindings/python/requirements_test.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ flake8_commas
2424
flake8_pep3101
2525
flake8_quotes
2626
mypy
27-
onnx==1.12.0
27+
onnx==1.13.1
2828
Pep8-naming
2929
pydocstyle
3030
pytest-forked; platform_system != "Windows"
@@ -36,4 +36,4 @@ retrying
3636
tox
3737
types-pkg_resources
3838
wheel>=0.38.1,<=0.41.0
39-
protobuf~=3.18.1
39+
protobuf~=3.20.3

src/bindings/python/tests/__init__.py

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,28 @@ def xfail_test(reason="Mark the test as expected to fail", strict=True):
5858
xfail_issue_38706 = xfail_test(reason="RuntimeError: output_3.0 has zero dimension which is not allowed")
5959
xfail_issue_38708 = xfail_test(reason="RuntimeError: While validating ONNX node '<Node(Slice): y>': "
6060
"Axes input must be constant")
61+
xfail_issue_99949 = xfail_test(reason="Bitwise operators are not supported")
62+
xfail_issue_99950 = xfail_test(reason="CenterCropPad func is not supported")
63+
xfail_issue_99952 = xfail_test(reason="Col2Im operator is not supported")
64+
xfail_issue_99954 = xfail_test(reason="Constant Pad - RuntimeError: Shape inference of Reference node with name y failed")
65+
xfail_issue_99955 = xfail_test(reason="GroupNorm is not supported")
66+
xfail_issue_99957 = xfail_test(reason="LayerNorm - RuntimeError: While validating node '<Node(Reshape): Mean>'")
67+
xfail_issue_99958 = xfail_test(reason="LogSoftmax - Results mismatch")
68+
xfail_issue_99959 = xfail_test(reason="Mish function is not supported")
69+
xfail_issue_99960 = xfail_test(reason="MVN - Results mismatch")
70+
xfail_issue_99961 = xfail_test(reason="Optional has/get element operators are not supported)'")
71+
xfail_issue_99962 = pytest.mark.skip(reason="ReduceL1/L2 - Unrecognized attribute: axes for operator ReduceL1/L2")
72+
xfail_issue_99968 = xfail_test(reason="ReduceL1/L2 - Results mismatch or unsupported ReduceSum with "
73+
"dynamic rank by CPU plugin")
74+
xfail_issue_99969 = xfail_test(reason="Resize - Results mismatch / "
75+
"RuntimeError: While validating ONNX node '<Node(Resize): Y>' / "
76+
"RuntimeError: Check '(false)' failed at onnx/frontend/src/op/resize.cpp")
77+
xfail_issue_99970 = xfail_test(reason="Scatter and ScatterND - RuntimeError: Check '(reduction == none)' failed at "
78+
"src/frontends/onnx/frontend/src/op/scatter_elements.cpp OR at "
79+
"src/frontends/onnx/frontend/src/op/scatter_nd")
80+
xfail_issue_99972 = xfail_test(reason="Softmax - Results mismatch")
81+
xfail_issue_99973 = xfail_test(reason="Split - RuntimeError: While validating ONNX node "
82+
"'<Node(Split): output_1, output_2, output_3, output_4>'")
6183
xfail_issue_38710 = xfail_test(reason="RuntimeError: data has zero dimension which is not allowed")
6284
xfail_issue_38713 = xfail_test(reason="RuntimeError: OV does not support the following ONNX operations: "
6385
"ai.onnx.preview.training.Momentum")
@@ -135,3 +157,4 @@ def xfail_test(reason="Mark the test as expected to fail", strict=True):
135157
xfail_issue_86911 = xfail_test(reason="LSTM_Seq_len_unpacked - AssertionError: zoo models results mismatch")
136158
xfail_issue_91151 = xfail_test(reason="RuntimeError: model input (shape={3,4}) and blob (shape=(1)) are incompatible")
137159
xfail_issue_91490 = xfail_test(reason="y has zero dimension which is not allowed")
160+
xfail_issue_101965 = xfail_test(reason="Mismatch with numpy-based expected results.")

src/bindings/python/tests/test_onnx/test_backend.py

Lines changed: 209 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,22 @@
4949
xfail_issue_90649,
5050
xfail_issue_91151,
5151
xfail_issue_91490,
52+
xfail_issue_99949,
53+
xfail_issue_99950,
54+
xfail_issue_99952,
55+
xfail_issue_99954,
56+
xfail_issue_99955,
57+
xfail_issue_99957,
58+
xfail_issue_99958,
59+
xfail_issue_99959,
60+
xfail_issue_99960,
61+
xfail_issue_99961,
62+
xfail_issue_99968,
63+
xfail_issue_99969,
64+
xfail_issue_99970,
65+
xfail_issue_99972,
66+
xfail_issue_99973,
67+
xfail_issue_101965,
5268
)
5369
from tests.test_onnx.utils.onnx_backend import OpenVinoTestBackend
5470

@@ -399,6 +415,199 @@ def expect_fail(test_case_path, xfail): # type: (str) -> None
399415
"OnnxBackendNodeModelTest.test_castlike_BFLOAT16_to_FLOAT_cpu",
400416
"OnnxBackendNodeModelTest.test_castlike_FLOAT_to_BFLOAT16_cpu",
401417
),
418+
(
419+
xfail_issue_99949,
420+
"OnnxBackendNodeModelTest.test_bitwise_and_i16_3d_cpu",
421+
"OnnxBackendNodeModelTest.test_bitwise_and_i32_2d_cpu",
422+
"OnnxBackendNodeModelTest.test_bitwise_and_ui64_bcast_3v1d_cpu",
423+
"OnnxBackendNodeModelTest.test_bitwise_not_2d_cpu",
424+
"OnnxBackendNodeModelTest.test_bitwise_not_3d_cpu",
425+
"OnnxBackendNodeModelTest.test_bitwise_not_4d_cpu",
426+
"OnnxBackendNodeModelTest.test_bitwise_or_i16_4d_cpu",
427+
"OnnxBackendNodeModelTest.test_bitwise_or_i32_2d_cpu",
428+
"OnnxBackendNodeModelTest.test_bitwise_or_ui64_bcast_3v1d_cpu",
429+
"OnnxBackendNodeModelTest.test_bitwise_xor_ui8_bcast_4v3d_cpu",
430+
"OnnxBackendNodeModelTest.test_bitwise_xor_i16_3d_cpu",
431+
"OnnxBackendNodeModelTest.test_bitwise_xor_i32_2d_cpu",
432+
"OnnxBackendNodeModelTest.test_bitwise_and_ui8_bcast_4v3d_cpu",
433+
"OnnxBackendNodeModelTest.test_bitwise_or_ui8_bcast_4v3d_cpu",
434+
"OnnxBackendNodeModelTest.test_bitwise_xor_ui64_bcast_3v1d_cpu",
435+
),
436+
(
437+
xfail_issue_99950,
438+
"OnnxBackendNodeModelTest.test_center_crop_pad_crop_and_pad_cpu",
439+
"OnnxBackendNodeModelTest.test_center_crop_pad_crop_axes_chw_cpu",
440+
"OnnxBackendNodeModelTest.test_center_crop_pad_crop_axes_chw_expanded_cpu",
441+
"OnnxBackendNodeModelTest.test_center_crop_pad_crop_axes_hwc_cpu",
442+
"OnnxBackendNodeModelTest.test_center_crop_pad_crop_axes_hwc_expanded_cpu",
443+
"OnnxBackendNodeModelTest.test_center_crop_pad_crop_cpu",
444+
"OnnxBackendNodeModelTest.test_center_crop_pad_pad_cpu",
445+
),
446+
(
447+
xfail_issue_99952,
448+
"OnnxBackendNodeModelTest.test_col2im_5d_cpu",
449+
"OnnxBackendNodeModelTest.test_col2im_cpu",
450+
"OnnxBackendNodeModelTest.test_col2im_dilations_cpu",
451+
"OnnxBackendNodeModelTest.test_col2im_pads_cpu",
452+
"OnnxBackendNodeModelTest.test_col2im_strides_cpu",
453+
),
454+
(
455+
xfail_issue_99954,
456+
"OnnxBackendNodeModelTest.test_constant_pad_axes_cpu",
457+
),
458+
(
459+
xfail_issue_99955,
460+
"OnnxBackendNodeModelTest.test_group_normalization_epsilon_cpu",
461+
"OnnxBackendNodeModelTest.test_group_normalization_epsilon_expanded_cpu",
462+
"OnnxBackendNodeModelTest.test_group_normalization_example_cpu",
463+
"OnnxBackendNodeModelTest.test_group_normalization_example_expanded_cpu",
464+
),
465+
(
466+
xfail_issue_99957,
467+
"OnnxBackendNodeModelTest.test_layer_normalization_2d_axis1_expanded_ver18_cpu",
468+
"OnnxBackendNodeModelTest.test_layer_normalization_2d_axis_negative_1_expanded_ver18_cpu",
469+
"OnnxBackendNodeModelTest.test_layer_normalization_3d_axis1_epsilon_expanded_ver18_cpu",
470+
"OnnxBackendNodeModelTest.test_layer_normalization_3d_axis2_epsilon_expanded_ver18_cpu",
471+
"OnnxBackendNodeModelTest.test_layer_normalization_3d_axis_negative_1_epsilon_expanded_ver18_cpu",
472+
"OnnxBackendNodeModelTest.test_layer_normalization_3d_axis_negative_2_epsilon_expanded_ver18_cpu",
473+
"OnnxBackendNodeModelTest.test_layer_normalization_4d_axis1_expanded_ver18_cpu",
474+
"OnnxBackendNodeModelTest.test_layer_normalization_4d_axis2_expanded_ver18_cpu",
475+
"OnnxBackendNodeModelTest.test_layer_normalization_4d_axis3_expanded_ver18_cpu",
476+
"OnnxBackendNodeModelTest.test_layer_normalization_4d_axis_negative_1_expanded_ver18_cpu",
477+
"OnnxBackendNodeModelTest.test_layer_normalization_4d_axis_negative_2_expanded_ver18_cpu",
478+
"OnnxBackendNodeModelTest.test_layer_normalization_4d_axis_negative_3_expanded_ver18_cpu",
479+
"OnnxBackendNodeModelTest.test_layer_normalization_default_axis_expanded_ver18_cpu",
480+
),
481+
(
482+
xfail_issue_99958,
483+
"OnnxBackendNodeModelTest.test_logsoftmax_large_number_expanded_ver18_cpu",
484+
),
485+
(
486+
xfail_issue_99959,
487+
"OnnxBackendNodeModelTest.test_mish_cpu",
488+
),
489+
(
490+
xfail_issue_99960,
491+
"OnnxBackendNodeModelTest.test_mvn_expanded_ver18_cpu",
492+
),
493+
(
494+
xfail_issue_99961,
495+
"OnnxBackendNodeModelTest.test_optional_get_element_optional_sequence_cpu",
496+
"OnnxBackendNodeModelTest.test_optional_get_element_optional_tensor_cpu",
497+
"OnnxBackendNodeModelTest.test_optional_get_element_tensor_cpu",
498+
"OnnxBackendNodeModelTest.test_optional_has_element_empty_no_input_name_optional_input_cpu",
499+
"OnnxBackendNodeModelTest.test_optional_has_element_empty_no_input_name_tensor_input_cpu",
500+
"OnnxBackendNodeModelTest.test_optional_has_element_empty_no_input_optional_input_cpu",
501+
"OnnxBackendNodeModelTest.test_optional_has_element_empty_no_input_tensor_input_cpu",
502+
"OnnxBackendNodeModelTest.test_optional_has_element_empty_optional_input_cpu",
503+
"OnnxBackendNodeModelTest.test_optional_has_element_optional_input_cpu",
504+
"OnnxBackendNodeModelTest.test_optional_has_element_tensor_input_cpu",
505+
),
506+
(
507+
xfail_issue_99968,
508+
"OnnxBackendNodeModelTest.test_reduce_l1_do_not_keepdims_example_cpu",
509+
"OnnxBackendNodeModelTest.test_reduce_l1_do_not_keepdims_example_expanded_cpu",
510+
"OnnxBackendNodeModelTest.test_reduce_l1_do_not_keepdims_random_cpu",
511+
"OnnxBackendNodeModelTest.test_reduce_l1_do_not_keepdims_random_expanded_cpu",
512+
"OnnxBackendNodeModelTest.test_reduce_l1_keep_dims_example_cpu",
513+
"OnnxBackendNodeModelTest.test_reduce_l1_keep_dims_random_cpu",
514+
"OnnxBackendNodeModelTest.test_reduce_l1_negative_axes_keep_dims_example_cpu",
515+
"OnnxBackendNodeModelTest.test_reduce_l1_negative_axes_keep_dims_random_cpu",
516+
"OnnxBackendNodeModelTest.test_reduce_l2_do_not_keepdims_example_cpu",
517+
"OnnxBackendNodeModelTest.test_reduce_l2_do_not_keepdims_example_expanded_cpu",
518+
"OnnxBackendNodeModelTest.test_reduce_l2_do_not_keepdims_random_cpu",
519+
"OnnxBackendNodeModelTest.test_reduce_l2_do_not_keepdims_random_expanded_cpu",
520+
"OnnxBackendNodeModelTest.test_reduce_l2_keep_dims_example_cpu",
521+
"OnnxBackendNodeModelTest.test_reduce_l2_keep_dims_random_cpu",
522+
"OnnxBackendNodeModelTest.test_reduce_l2_negative_axes_keep_dims_example_cpu",
523+
"OnnxBackendNodeModelTest.test_reduce_l2_negative_axes_keep_dims_random_cpu",
524+
"OnnxBackendNodeModelTest.test_reduce_log_sum_asc_axes_cpu",
525+
"OnnxBackendNodeModelTest.test_reduce_log_sum_asc_axes_expanded_cpu",
526+
"OnnxBackendNodeModelTest.test_reduce_log_sum_desc_axes_cpu",
527+
"OnnxBackendNodeModelTest.test_reduce_log_sum_desc_axes_expanded_cpu",
528+
"OnnxBackendNodeModelTest.test_reduce_log_sum_exp_do_not_keepdims_example_cpu",
529+
"OnnxBackendNodeModelTest.test_reduce_log_sum_exp_do_not_keepdims_example_expanded_cpu",
530+
"OnnxBackendNodeModelTest.test_reduce_log_sum_exp_do_not_keepdims_random_cpu",
531+
"OnnxBackendNodeModelTest.test_reduce_log_sum_exp_do_not_keepdims_random_expanded_cpu",
532+
"OnnxBackendNodeModelTest.test_reduce_l1_do_not_keepdims_example_cpu",
533+
"OnnxBackendNodeModelTest.test_reduce_log_sum_exp_keepdims_example_cpu",
534+
"OnnxBackendNodeModelTest.test_reduce_log_sum_exp_negative_axes_keepdims_example_cpu",
535+
"OnnxBackendNodeModelTest.test_reduce_log_sum_exp_keepdims_random_cpu",
536+
"OnnxBackendNodeModelTest.test_reduce_log_sum_negative_axes_cpu",
537+
"OnnxBackendNodeModelTest.test_reduce_max_do_not_keepdims_example_cpu",
538+
"OnnxBackendNodeModelTest.test_reduce_max_do_not_keepdims_random_cpu",
539+
"OnnxBackendNodeModelTest.test_reduce_max_keepdims_example_cpu",
540+
"OnnxBackendNodeModelTest.test_reduce_max_keepdims_random_cpu",
541+
"OnnxBackendNodeModelTest.test_reduce_max_negative_axes_keepdims_example_cpu",
542+
"OnnxBackendNodeModelTest.test_reduce_max_negative_axes_keepdims_random_cpu",
543+
"OnnxBackendNodeModelTest.test_reduce_mean_do_not_keepdims_example_cpu",
544+
"OnnxBackendNodeModelTest.test_reduce_log_sum_exp_negative_axes_keepdims_random_cpu",
545+
"OnnxBackendNodeModelTest.test_reduce_mean_do_not_keepdims_random_cpu",
546+
"OnnxBackendNodeModelTest.test_reduce_mean_keepdims_example_cpu",
547+
"OnnxBackendNodeModelTest.test_reduce_mean_negative_axes_keepdims_example_cpu",
548+
"OnnxBackendNodeModelTest.test_reduce_mean_keepdims_random_cpu",
549+
"OnnxBackendNodeModelTest.test_reduce_mean_negative_axes_keepdims_random_cpu",
550+
"OnnxBackendNodeModelTest.test_reduce_min_do_not_keepdims_example_cpu",
551+
"OnnxBackendNodeModelTest.test_reduce_min_do_not_keepdims_random_cpu",
552+
"OnnxBackendNodeModelTest.test_reduce_min_keepdims_example_cpu",
553+
"OnnxBackendNodeModelTest.test_reduce_min_keepdims_random_cpu",
554+
"OnnxBackendNodeModelTest.test_reduce_min_negative_axes_keepdims_example_cpu",
555+
"OnnxBackendNodeModelTest.test_reduce_min_negative_axes_keepdims_random_cpu",
556+
"OnnxBackendNodeModelTest.test_reduce_prod_do_not_keepdims_example_cpu",
557+
"OnnxBackendNodeModelTest.test_reduce_prod_do_not_keepdims_random_cpu",
558+
"OnnxBackendNodeModelTest.test_reduce_prod_keepdims_example_cpu",
559+
"OnnxBackendNodeModelTest.test_reduce_prod_keepdims_random_cpu",
560+
"OnnxBackendNodeModelTest.test_reduce_prod_negative_axes_keepdims_example_cpu",
561+
"OnnxBackendNodeModelTest.test_reduce_prod_negative_axes_keepdims_random_cpu",
562+
"OnnxBackendNodeModelTest.test_reduce_sum_square_do_not_keepdims_example_cpu",
563+
"OnnxBackendNodeModelTest.test_reduce_sum_square_do_not_keepdims_example_expanded_cpu",
564+
"OnnxBackendNodeModelTest.test_reduce_sum_square_do_not_keepdims_random_cpu",
565+
"OnnxBackendNodeModelTest.test_reduce_sum_square_do_not_keepdims_random_expanded_cpu",
566+
"OnnxBackendNodeModelTest.test_reduce_sum_square_keepdims_example_cpu",
567+
"OnnxBackendNodeModelTest.test_reduce_sum_square_keepdims_random_cpu",
568+
"OnnxBackendNodeModelTest.test_reduce_sum_square_negative_axes_keepdims_example_cpu",
569+
"OnnxBackendNodeModelTest.test_reduce_sum_square_negative_axes_keepdims_random_cpu",
570+
),
571+
(
572+
xfail_issue_99969,
573+
"OnnxBackendNodeModelTest.test_resize_downsample_scales_cubic_antialias_cpu",
574+
"OnnxBackendNodeModelTest.test_resize_downsample_scales_linear_antialias_cpu",
575+
"OnnxBackendNodeModelTest.test_resize_downsample_sizes_cubic_antialias_cpu",
576+
"OnnxBackendNodeModelTest.test_resize_downsample_sizes_linear_antialias_cpu",
577+
"OnnxBackendNodeModelTest.test_resize_downsample_sizes_nearest_not_smaller_cpu",
578+
"OnnxBackendNodeModelTest.test_resize_downsample_sizes_nearest_not_larger_cpu",
579+
"OnnxBackendNodeModelTest.test_resize_tf_crop_and_resize_axes_2_3_cpu",
580+
"OnnxBackendNodeModelTest.test_resize_tf_crop_and_resize_axes_3_2_cpu",
581+
"OnnxBackendNodeModelTest.test_resize_upsample_scales_nearest_axes_2_3_cpu",
582+
"OnnxBackendNodeModelTest.test_resize_upsample_scales_nearest_axes_3_2_cpu",
583+
"OnnxBackendNodeModelTest.test_resize_upsample_sizes_nearest_axes_2_3_cpu",
584+
"OnnxBackendNodeModelTest.test_resize_upsample_sizes_nearest_axes_3_2_cpu",
585+
"OnnxBackendNodeModelTest.test_resize_upsample_sizes_nearest_not_larger_cpu",
586+
),
587+
(
588+
xfail_issue_99970,
589+
"OnnxBackendNodeModelTest.test_scatter_elements_with_reduction_max_cpu",
590+
"OnnxBackendNodeModelTest.test_scatter_elements_with_reduction_min_cpu",
591+
"OnnxBackendNodeModelTest.test_scatternd_max_cpu",
592+
"OnnxBackendNodeModelTest.test_scatternd_min_cpu",
593+
),
594+
(
595+
xfail_issue_99972,
596+
"OnnxBackendNodeModelTest.test_softmax_large_number_expanded_ver18_cpu",
597+
),
598+
(
599+
xfail_issue_99973,
600+
"OnnxBackendNodeModelTest.test_split_1d_uneven_split_opset18_cpu",
601+
"OnnxBackendNodeModelTest.test_split_2d_uneven_split_opset18_cpu",
602+
"OnnxBackendNodeModelTest.test_split_zero_size_splits_opset13_cpu",
603+
"OnnxBackendNodeModelTest.test_split_zero_size_splits_opset18_cpu",
604+
),
605+
(
606+
xfail_issue_101965,
607+
"OnnxBackendNodeModelTest.test_dft_axis_cpu",
608+
"OnnxBackendNodeModelTest.test_dft_cpu",
609+
"OnnxBackendNodeModelTest.test_dft_inverse_cpu",
610+
),
402611
]
403612

404613
for test_group in tests_expected_to_fail:

0 commit comments

Comments
 (0)