Skip to content

Commit

Permalink
Bump ONNX to 1.13, Tensorflow to 2.12 and protobuf to 3.20.3 (#23992)
Browse files Browse the repository at this point in the history
### Details:
 - Cherry-pick #23990
 - Backport #14773

### Tickets:
 - N/A

---------

Co-authored-by: Anastasia Kuporosova <anastasia.kuporosova@intel.com>
  • Loading branch information
p-wysocki and akuporos authored Apr 19, 2024
1 parent 315cc80 commit 77b6a3d
Show file tree
Hide file tree
Showing 34 changed files with 572 additions and 68 deletions.
7 changes: 4 additions & 3 deletions .ci/azure/linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -400,9 +400,10 @@ jobs:
displayName: 'ONNX Frontend Tests'
continueOnError: false

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

- script: $(RUN_PREFIX) $(INSTALL_TEST_DIR)/ov_tensorflow_frontend_tests --gtest_print_time=1 --gtest_output=xml:$(INSTALL_TEST_DIR)/TEST-Tensorflow.xml
displayName: 'TensorFlow Frontend Unit Tests'
Expand Down
7 changes: 4 additions & 3 deletions .ci/azure/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -278,9 +278,10 @@ jobs:
displayName: 'ONNX Frontend Tests'
continueOnError: false

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

- script: call $(SETUPVARS) && $(INSTALL_TEST_DIR)\ov_tensorflow_frontend_tests --gtest_print_time=1 --gtest_output=xml:$(INSTALL_TEST_DIR)\TEST-Tensorflow.xml
displayName: 'TensorFlow Frontend Unit Tests'
Expand Down
4 changes: 2 additions & 2 deletions src/bindings/python/requirements_test.txt
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ flake8_commas
flake8_pep3101
flake8_quotes
mypy
onnx==1.12.0
onnx==1.13.1
Pep8-naming
pydocstyle
pytest-forked; platform_system != "Windows"
Expand All @@ -36,4 +36,4 @@ retrying
tox
types-pkg_resources
wheel>=0.38.1,<=0.41.0
protobuf~=3.18.1
protobuf~=3.20.3
23 changes: 23 additions & 0 deletions src/bindings/python/tests/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,28 @@ def xfail_test(reason="Mark the test as expected to fail", strict=True):
xfail_issue_38706 = xfail_test(reason="RuntimeError: output_3.0 has zero dimension which is not allowed")
xfail_issue_38708 = xfail_test(reason="RuntimeError: While validating ONNX node '<Node(Slice): y>': "
"Axes input must be constant")
xfail_issue_99949 = xfail_test(reason="Bitwise operators are not supported")
xfail_issue_99950 = xfail_test(reason="CenterCropPad func is not supported")
xfail_issue_99952 = xfail_test(reason="Col2Im operator is not supported")
xfail_issue_99954 = xfail_test(reason="Constant Pad - RuntimeError: Shape inference of Reference node with name y failed")
xfail_issue_99955 = xfail_test(reason="GroupNorm is not supported")
xfail_issue_99957 = xfail_test(reason="LayerNorm - RuntimeError: While validating node '<Node(Reshape): Mean>'")
xfail_issue_99958 = xfail_test(reason="LogSoftmax - Results mismatch")
xfail_issue_99959 = xfail_test(reason="Mish function is not supported")
xfail_issue_99960 = xfail_test(reason="MVN - Results mismatch")
xfail_issue_99961 = xfail_test(reason="Optional has/get element operators are not supported)'")
xfail_issue_99962 = pytest.mark.skip(reason="ReduceL1/L2 - Unrecognized attribute: axes for operator ReduceL1/L2")
xfail_issue_99968 = xfail_test(reason="ReduceL1/L2 - Results mismatch or unsupported ReduceSum with "
"dynamic rank by CPU plugin")
xfail_issue_99969 = xfail_test(reason="Resize - Results mismatch / "
"RuntimeError: While validating ONNX node '<Node(Resize): Y>' / "
"RuntimeError: Check '(false)' failed at onnx/frontend/src/op/resize.cpp")
xfail_issue_99970 = xfail_test(reason="Scatter and ScatterND - RuntimeError: Check '(reduction == none)' failed at "
"src/frontends/onnx/frontend/src/op/scatter_elements.cpp OR at "
"src/frontends/onnx/frontend/src/op/scatter_nd")
xfail_issue_99972 = xfail_test(reason="Softmax - Results mismatch")
xfail_issue_99973 = xfail_test(reason="Split - RuntimeError: While validating ONNX node "
"'<Node(Split): output_1, output_2, output_3, output_4>'")
xfail_issue_38710 = xfail_test(reason="RuntimeError: data has zero dimension which is not allowed")
xfail_issue_38713 = xfail_test(reason="RuntimeError: OV does not support the following ONNX operations: "
"ai.onnx.preview.training.Momentum")
Expand Down Expand Up @@ -135,3 +157,4 @@ def xfail_test(reason="Mark the test as expected to fail", strict=True):
xfail_issue_86911 = xfail_test(reason="LSTM_Seq_len_unpacked - AssertionError: zoo models results mismatch")
xfail_issue_91151 = xfail_test(reason="RuntimeError: model input (shape={3,4}) and blob (shape=(1)) are incompatible")
xfail_issue_91490 = xfail_test(reason="y has zero dimension which is not allowed")
xfail_issue_101965 = xfail_test(reason="Mismatch with numpy-based expected results.")
209 changes: 209 additions & 0 deletions src/bindings/python/tests/test_onnx/test_backend.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,22 @@
xfail_issue_90649,
xfail_issue_91151,
xfail_issue_91490,
xfail_issue_99949,
xfail_issue_99950,
xfail_issue_99952,
xfail_issue_99954,
xfail_issue_99955,
xfail_issue_99957,
xfail_issue_99958,
xfail_issue_99959,
xfail_issue_99960,
xfail_issue_99961,
xfail_issue_99968,
xfail_issue_99969,
xfail_issue_99970,
xfail_issue_99972,
xfail_issue_99973,
xfail_issue_101965,
)
from tests.test_onnx.utils.onnx_backend import OpenVinoTestBackend

Expand Down Expand Up @@ -399,6 +415,199 @@ def expect_fail(test_case_path, xfail): # type: (str) -> None
"OnnxBackendNodeModelTest.test_castlike_BFLOAT16_to_FLOAT_cpu",
"OnnxBackendNodeModelTest.test_castlike_FLOAT_to_BFLOAT16_cpu",
),
(
xfail_issue_99949,
"OnnxBackendNodeModelTest.test_bitwise_and_i16_3d_cpu",
"OnnxBackendNodeModelTest.test_bitwise_and_i32_2d_cpu",
"OnnxBackendNodeModelTest.test_bitwise_and_ui64_bcast_3v1d_cpu",
"OnnxBackendNodeModelTest.test_bitwise_not_2d_cpu",
"OnnxBackendNodeModelTest.test_bitwise_not_3d_cpu",
"OnnxBackendNodeModelTest.test_bitwise_not_4d_cpu",
"OnnxBackendNodeModelTest.test_bitwise_or_i16_4d_cpu",
"OnnxBackendNodeModelTest.test_bitwise_or_i32_2d_cpu",
"OnnxBackendNodeModelTest.test_bitwise_or_ui64_bcast_3v1d_cpu",
"OnnxBackendNodeModelTest.test_bitwise_xor_ui8_bcast_4v3d_cpu",
"OnnxBackendNodeModelTest.test_bitwise_xor_i16_3d_cpu",
"OnnxBackendNodeModelTest.test_bitwise_xor_i32_2d_cpu",
"OnnxBackendNodeModelTest.test_bitwise_and_ui8_bcast_4v3d_cpu",
"OnnxBackendNodeModelTest.test_bitwise_or_ui8_bcast_4v3d_cpu",
"OnnxBackendNodeModelTest.test_bitwise_xor_ui64_bcast_3v1d_cpu",
),
(
xfail_issue_99950,
"OnnxBackendNodeModelTest.test_center_crop_pad_crop_and_pad_cpu",
"OnnxBackendNodeModelTest.test_center_crop_pad_crop_axes_chw_cpu",
"OnnxBackendNodeModelTest.test_center_crop_pad_crop_axes_chw_expanded_cpu",
"OnnxBackendNodeModelTest.test_center_crop_pad_crop_axes_hwc_cpu",
"OnnxBackendNodeModelTest.test_center_crop_pad_crop_axes_hwc_expanded_cpu",
"OnnxBackendNodeModelTest.test_center_crop_pad_crop_cpu",
"OnnxBackendNodeModelTest.test_center_crop_pad_pad_cpu",
),
(
xfail_issue_99952,
"OnnxBackendNodeModelTest.test_col2im_5d_cpu",
"OnnxBackendNodeModelTest.test_col2im_cpu",
"OnnxBackendNodeModelTest.test_col2im_dilations_cpu",
"OnnxBackendNodeModelTest.test_col2im_pads_cpu",
"OnnxBackendNodeModelTest.test_col2im_strides_cpu",
),
(
xfail_issue_99954,
"OnnxBackendNodeModelTest.test_constant_pad_axes_cpu",
),
(
xfail_issue_99955,
"OnnxBackendNodeModelTest.test_group_normalization_epsilon_cpu",
"OnnxBackendNodeModelTest.test_group_normalization_epsilon_expanded_cpu",
"OnnxBackendNodeModelTest.test_group_normalization_example_cpu",
"OnnxBackendNodeModelTest.test_group_normalization_example_expanded_cpu",
),
(
xfail_issue_99957,
"OnnxBackendNodeModelTest.test_layer_normalization_2d_axis1_expanded_ver18_cpu",
"OnnxBackendNodeModelTest.test_layer_normalization_2d_axis_negative_1_expanded_ver18_cpu",
"OnnxBackendNodeModelTest.test_layer_normalization_3d_axis1_epsilon_expanded_ver18_cpu",
"OnnxBackendNodeModelTest.test_layer_normalization_3d_axis2_epsilon_expanded_ver18_cpu",
"OnnxBackendNodeModelTest.test_layer_normalization_3d_axis_negative_1_epsilon_expanded_ver18_cpu",
"OnnxBackendNodeModelTest.test_layer_normalization_3d_axis_negative_2_epsilon_expanded_ver18_cpu",
"OnnxBackendNodeModelTest.test_layer_normalization_4d_axis1_expanded_ver18_cpu",
"OnnxBackendNodeModelTest.test_layer_normalization_4d_axis2_expanded_ver18_cpu",
"OnnxBackendNodeModelTest.test_layer_normalization_4d_axis3_expanded_ver18_cpu",
"OnnxBackendNodeModelTest.test_layer_normalization_4d_axis_negative_1_expanded_ver18_cpu",
"OnnxBackendNodeModelTest.test_layer_normalization_4d_axis_negative_2_expanded_ver18_cpu",
"OnnxBackendNodeModelTest.test_layer_normalization_4d_axis_negative_3_expanded_ver18_cpu",
"OnnxBackendNodeModelTest.test_layer_normalization_default_axis_expanded_ver18_cpu",
),
(
xfail_issue_99958,
"OnnxBackendNodeModelTest.test_logsoftmax_large_number_expanded_ver18_cpu",
),
(
xfail_issue_99959,
"OnnxBackendNodeModelTest.test_mish_cpu",
),
(
xfail_issue_99960,
"OnnxBackendNodeModelTest.test_mvn_expanded_ver18_cpu",
),
(
xfail_issue_99961,
"OnnxBackendNodeModelTest.test_optional_get_element_optional_sequence_cpu",
"OnnxBackendNodeModelTest.test_optional_get_element_optional_tensor_cpu",
"OnnxBackendNodeModelTest.test_optional_get_element_tensor_cpu",
"OnnxBackendNodeModelTest.test_optional_has_element_empty_no_input_name_optional_input_cpu",
"OnnxBackendNodeModelTest.test_optional_has_element_empty_no_input_name_tensor_input_cpu",
"OnnxBackendNodeModelTest.test_optional_has_element_empty_no_input_optional_input_cpu",
"OnnxBackendNodeModelTest.test_optional_has_element_empty_no_input_tensor_input_cpu",
"OnnxBackendNodeModelTest.test_optional_has_element_empty_optional_input_cpu",
"OnnxBackendNodeModelTest.test_optional_has_element_optional_input_cpu",
"OnnxBackendNodeModelTest.test_optional_has_element_tensor_input_cpu",
),
(
xfail_issue_99968,
"OnnxBackendNodeModelTest.test_reduce_l1_do_not_keepdims_example_cpu",
"OnnxBackendNodeModelTest.test_reduce_l1_do_not_keepdims_example_expanded_cpu",
"OnnxBackendNodeModelTest.test_reduce_l1_do_not_keepdims_random_cpu",
"OnnxBackendNodeModelTest.test_reduce_l1_do_not_keepdims_random_expanded_cpu",
"OnnxBackendNodeModelTest.test_reduce_l1_keep_dims_example_cpu",
"OnnxBackendNodeModelTest.test_reduce_l1_keep_dims_random_cpu",
"OnnxBackendNodeModelTest.test_reduce_l1_negative_axes_keep_dims_example_cpu",
"OnnxBackendNodeModelTest.test_reduce_l1_negative_axes_keep_dims_random_cpu",
"OnnxBackendNodeModelTest.test_reduce_l2_do_not_keepdims_example_cpu",
"OnnxBackendNodeModelTest.test_reduce_l2_do_not_keepdims_example_expanded_cpu",
"OnnxBackendNodeModelTest.test_reduce_l2_do_not_keepdims_random_cpu",
"OnnxBackendNodeModelTest.test_reduce_l2_do_not_keepdims_random_expanded_cpu",
"OnnxBackendNodeModelTest.test_reduce_l2_keep_dims_example_cpu",
"OnnxBackendNodeModelTest.test_reduce_l2_keep_dims_random_cpu",
"OnnxBackendNodeModelTest.test_reduce_l2_negative_axes_keep_dims_example_cpu",
"OnnxBackendNodeModelTest.test_reduce_l2_negative_axes_keep_dims_random_cpu",
"OnnxBackendNodeModelTest.test_reduce_log_sum_asc_axes_cpu",
"OnnxBackendNodeModelTest.test_reduce_log_sum_asc_axes_expanded_cpu",
"OnnxBackendNodeModelTest.test_reduce_log_sum_desc_axes_cpu",
"OnnxBackendNodeModelTest.test_reduce_log_sum_desc_axes_expanded_cpu",
"OnnxBackendNodeModelTest.test_reduce_log_sum_exp_do_not_keepdims_example_cpu",
"OnnxBackendNodeModelTest.test_reduce_log_sum_exp_do_not_keepdims_example_expanded_cpu",
"OnnxBackendNodeModelTest.test_reduce_log_sum_exp_do_not_keepdims_random_cpu",
"OnnxBackendNodeModelTest.test_reduce_log_sum_exp_do_not_keepdims_random_expanded_cpu",
"OnnxBackendNodeModelTest.test_reduce_l1_do_not_keepdims_example_cpu",
"OnnxBackendNodeModelTest.test_reduce_log_sum_exp_keepdims_example_cpu",
"OnnxBackendNodeModelTest.test_reduce_log_sum_exp_negative_axes_keepdims_example_cpu",
"OnnxBackendNodeModelTest.test_reduce_log_sum_exp_keepdims_random_cpu",
"OnnxBackendNodeModelTest.test_reduce_log_sum_negative_axes_cpu",
"OnnxBackendNodeModelTest.test_reduce_max_do_not_keepdims_example_cpu",
"OnnxBackendNodeModelTest.test_reduce_max_do_not_keepdims_random_cpu",
"OnnxBackendNodeModelTest.test_reduce_max_keepdims_example_cpu",
"OnnxBackendNodeModelTest.test_reduce_max_keepdims_random_cpu",
"OnnxBackendNodeModelTest.test_reduce_max_negative_axes_keepdims_example_cpu",
"OnnxBackendNodeModelTest.test_reduce_max_negative_axes_keepdims_random_cpu",
"OnnxBackendNodeModelTest.test_reduce_mean_do_not_keepdims_example_cpu",
"OnnxBackendNodeModelTest.test_reduce_log_sum_exp_negative_axes_keepdims_random_cpu",
"OnnxBackendNodeModelTest.test_reduce_mean_do_not_keepdims_random_cpu",
"OnnxBackendNodeModelTest.test_reduce_mean_keepdims_example_cpu",
"OnnxBackendNodeModelTest.test_reduce_mean_negative_axes_keepdims_example_cpu",
"OnnxBackendNodeModelTest.test_reduce_mean_keepdims_random_cpu",
"OnnxBackendNodeModelTest.test_reduce_mean_negative_axes_keepdims_random_cpu",
"OnnxBackendNodeModelTest.test_reduce_min_do_not_keepdims_example_cpu",
"OnnxBackendNodeModelTest.test_reduce_min_do_not_keepdims_random_cpu",
"OnnxBackendNodeModelTest.test_reduce_min_keepdims_example_cpu",
"OnnxBackendNodeModelTest.test_reduce_min_keepdims_random_cpu",
"OnnxBackendNodeModelTest.test_reduce_min_negative_axes_keepdims_example_cpu",
"OnnxBackendNodeModelTest.test_reduce_min_negative_axes_keepdims_random_cpu",
"OnnxBackendNodeModelTest.test_reduce_prod_do_not_keepdims_example_cpu",
"OnnxBackendNodeModelTest.test_reduce_prod_do_not_keepdims_random_cpu",
"OnnxBackendNodeModelTest.test_reduce_prod_keepdims_example_cpu",
"OnnxBackendNodeModelTest.test_reduce_prod_keepdims_random_cpu",
"OnnxBackendNodeModelTest.test_reduce_prod_negative_axes_keepdims_example_cpu",
"OnnxBackendNodeModelTest.test_reduce_prod_negative_axes_keepdims_random_cpu",
"OnnxBackendNodeModelTest.test_reduce_sum_square_do_not_keepdims_example_cpu",
"OnnxBackendNodeModelTest.test_reduce_sum_square_do_not_keepdims_example_expanded_cpu",
"OnnxBackendNodeModelTest.test_reduce_sum_square_do_not_keepdims_random_cpu",
"OnnxBackendNodeModelTest.test_reduce_sum_square_do_not_keepdims_random_expanded_cpu",
"OnnxBackendNodeModelTest.test_reduce_sum_square_keepdims_example_cpu",
"OnnxBackendNodeModelTest.test_reduce_sum_square_keepdims_random_cpu",
"OnnxBackendNodeModelTest.test_reduce_sum_square_negative_axes_keepdims_example_cpu",
"OnnxBackendNodeModelTest.test_reduce_sum_square_negative_axes_keepdims_random_cpu",
),
(
xfail_issue_99969,
"OnnxBackendNodeModelTest.test_resize_downsample_scales_cubic_antialias_cpu",
"OnnxBackendNodeModelTest.test_resize_downsample_scales_linear_antialias_cpu",
"OnnxBackendNodeModelTest.test_resize_downsample_sizes_cubic_antialias_cpu",
"OnnxBackendNodeModelTest.test_resize_downsample_sizes_linear_antialias_cpu",
"OnnxBackendNodeModelTest.test_resize_downsample_sizes_nearest_not_smaller_cpu",
"OnnxBackendNodeModelTest.test_resize_downsample_sizes_nearest_not_larger_cpu",
"OnnxBackendNodeModelTest.test_resize_tf_crop_and_resize_axes_2_3_cpu",
"OnnxBackendNodeModelTest.test_resize_tf_crop_and_resize_axes_3_2_cpu",
"OnnxBackendNodeModelTest.test_resize_upsample_scales_nearest_axes_2_3_cpu",
"OnnxBackendNodeModelTest.test_resize_upsample_scales_nearest_axes_3_2_cpu",
"OnnxBackendNodeModelTest.test_resize_upsample_sizes_nearest_axes_2_3_cpu",
"OnnxBackendNodeModelTest.test_resize_upsample_sizes_nearest_axes_3_2_cpu",
"OnnxBackendNodeModelTest.test_resize_upsample_sizes_nearest_not_larger_cpu",
),
(
xfail_issue_99970,
"OnnxBackendNodeModelTest.test_scatter_elements_with_reduction_max_cpu",
"OnnxBackendNodeModelTest.test_scatter_elements_with_reduction_min_cpu",
"OnnxBackendNodeModelTest.test_scatternd_max_cpu",
"OnnxBackendNodeModelTest.test_scatternd_min_cpu",
),
(
xfail_issue_99972,
"OnnxBackendNodeModelTest.test_softmax_large_number_expanded_ver18_cpu",
),
(
xfail_issue_99973,
"OnnxBackendNodeModelTest.test_split_1d_uneven_split_opset18_cpu",
"OnnxBackendNodeModelTest.test_split_2d_uneven_split_opset18_cpu",
"OnnxBackendNodeModelTest.test_split_zero_size_splits_opset13_cpu",
"OnnxBackendNodeModelTest.test_split_zero_size_splits_opset18_cpu",
),
(
xfail_issue_101965,
"OnnxBackendNodeModelTest.test_dft_axis_cpu",
"OnnxBackendNodeModelTest.test_dft_cpu",
"OnnxBackendNodeModelTest.test_dft_inverse_cpu",
),
]

for test_group in tests_expected_to_fail:
Expand Down
Loading

0 comments on commit 77b6a3d

Please sign in to comment.