From 3efe5b312ed07558b38da39d303ea6a88d82bba9 Mon Sep 17 00:00:00 2001 From: Katarzyna Mitrus Date: Tue, 14 Dec 2021 10:40:02 +0100 Subject: [PATCH] [ONNX] Tests manifest and xfails cleanup (#9133) --- src/bindings/python/tests/__init__.py | 7 +++---- .../python/tests/test_onnx/test_backend.py | 19 +++++++++---------- .../python/tests_compatibility/__init__.py | 6 +++--- .../test_onnx/test_backend.py | 19 +++++++++---------- 4 files changed, 24 insertions(+), 27 deletions(-) diff --git a/src/bindings/python/tests/__init__.py b/src/bindings/python/tests/__init__.py index 22996909921..f8522ff5f7d 100644 --- a/src/bindings/python/tests/__init__.py +++ b/src/bindings/python/tests/__init__.py @@ -25,7 +25,7 @@ def xfail_test(reason="Mark the test as expected to fail", strict=True): skip_segfault = pytest.mark.skip(reason="Segmentation fault error") xfail_accuracy = xfail_test(reason="Accuracy") xfail_issue_FLOAT_LIKE = xfail_test(reason="Use of bfloat16 or float16") -xfail_issue_69444 = xfail_test(reason="failed with accuracy issue") +xfail_issue_69444 = xfail_test(reason="ONNX Resize - AssertionError: Mismatched elements.") skip_issue_67415 = pytest.mark.skip(reason="RuntimeError: Unsupported data type for when filling blob!") xfail_issue_67415 = xfail_test(reason="RuntimeError: Unsupported data type for when filling blob!") xfail_issue_33488 = xfail_test(reason="RuntimeError: nGraph does not support the following ONNX operations: " @@ -91,8 +91,8 @@ xfail_issue_44958 = xfail_test(reason="Expected: Unsupported dynamic op: Interpo xfail_issue_44965 = xfail_test(reason="Expected: RuntimeError: value info has no element") xfail_issue_44968 = xfail_test(reason="Expected: Unsupported dynamic op: Squeeze") xfail_issue_47323 = xfail_test(reason="RuntimeError: The plugin does not support FP64") -xfail_issue_47337 = xfail_test(reason="RuntimeError: Unsupported dynamic ops: v1::OneHot") - +xfail_issue_73538 = xfail_test(reason="OneHot: Unsupported negative indices, " + "AssertionError: Mismatched elements.") # Model MSFT issues: xfail_issue_37957 = xfail_test(reason="RuntimeError: nGraph does not support the following ONNX operations: " "com.microsoft.CropAndResize, com.microsoft.GatherND, " @@ -117,7 +117,6 @@ xfail_issue_48145 = xfail_test(reason="BertSquad-8 - AssertionError: Items are n "DESIRED: 3") xfail_issue_48190 = xfail_test(reason="RobertaBase-11 - AssertionError: Items are not equal: " "ACTUAL: dtype('float64') DESIRED: dtype('float32')") -xfail_issue_49750 = xfail_test(reason="RuntimeError: Unsupported dynamic ops: v4::Interpolate") xfail_issue_49752 = xfail_test(reason="RuntimeError: Unsupported dynamic ops: v1::Pad") xfail_issue_49753 = xfail_test(reason="RuntimeError: Unsupported dynamic ops: v1::StridedSlice") xfail_issue_49754 = xfail_test(reason="RuntimeError: Unsupported dynamic ops: v1::TopKIE") diff --git a/src/bindings/python/tests/test_onnx/test_backend.py b/src/bindings/python/tests/test_onnx/test_backend.py index daeace44ce5..a3f88676852 100644 --- a/src/bindings/python/tests/test_onnx/test_backend.py +++ b/src/bindings/python/tests/test_onnx/test_backend.py @@ -34,10 +34,9 @@ from tests import ( xfail_issue_44968, xfail_issue_45180, xfail_issue_47323, - xfail_issue_47337, + xfail_issue_73538, xfail_issue_48052, xfail_issue_49207, - xfail_issue_49750, xfail_issue_52463, xfail_issue_58033, xfail_issue_63033, @@ -217,12 +216,6 @@ tests_expected_to_fail = [ "OnnxBackendNodeModelTest.test_scan_sum_cpu", "OnnxBackendNodeModelTest.test_scan9_sum_cpu", ), - ( - xfail_issue_49750, - "OnnxBackendNodeModelTest.test_resize_downsample_scales_cubic_align_corners_cpu", - "OnnxBackendNodeModelTest.test_resize_downsample_scales_cubic_A_n0p5_exclude_outside_cpu", - "OnnxBackendNodeModelTest.test_resize_upsample_scales_cubic_A_n0p5_exclude_outside_cpu", - ), ( xfail_issue_33581, "OnnxBackendNodeModelTest.test_gather_elements_negative_indices_cpu", @@ -234,7 +227,7 @@ tests_expected_to_fail = [ "OnnxBackendNodeModelTest.test_momentum_multiple_cpu", ), ( - xfail_issue_47337, + xfail_issue_73538, "OnnxBackendNodeModelTest.test_onehot_negative_indices_cpu", ), ( @@ -392,7 +385,13 @@ tests_expected_to_fail = [ "OnnxBackendNodeModelTest.test_shape_start_1_end_negative_1_cpu", "OnnxBackendNodeModelTest.test_shape_start_negative_1_cpu", ), - (xfail_issue_69444, "OnnxBackendNodeModelTest.test_resize_downsample_scales_linear_align_corners_cpu"), + ( + xfail_issue_69444, + "OnnxBackendNodeModelTest.test_resize_downsample_scales_linear_align_corners_cpu", + "OnnxBackendNodeModelTest.test_resize_downsample_scales_cubic_align_corners_cpu", + "OnnxBackendNodeModelTest.test_resize_downsample_scales_cubic_A_n0p5_exclude_outside_cpu", + "OnnxBackendNodeModelTest.test_resize_upsample_scales_cubic_A_n0p5_exclude_outside_cpu", + ), ] for test_group in tests_expected_to_fail: diff --git a/src/bindings/python/tests_compatibility/__init__.py b/src/bindings/python/tests_compatibility/__init__.py index 50cc1607dab..23983b5e105 100644 --- a/src/bindings/python/tests_compatibility/__init__.py +++ b/src/bindings/python/tests_compatibility/__init__.py @@ -24,7 +24,7 @@ def xfail_test(reason="Mark the test as expected to fail", strict=True): skip_segfault = pytest.mark.skip(reason="Segmentation fault error") xfail_accuracy = xfail_test(reason="Accuracy") -xfail_issue_69444 = xfail_test(reason="failed with accuracy issue") +xfail_issue_69444 = xfail_test(reason="ONNX Resize - AssertionError: Mismatched elements.") xfail_issue_67415 = xfail_test(reason="RuntimeError: Unsupported data type for when filling blob!") xfail_issue_33488 = xfail_test(reason="RuntimeError: nGraph does not support the following ONNX operations: " "MaxUnpool") @@ -96,7 +96,8 @@ xfail_issue_44958 = xfail_test(reason="Expected: Unsupported dynamic op: Interpo xfail_issue_44965 = xfail_test(reason="Expected: RuntimeError: value info has no element") xfail_issue_44968 = xfail_test(reason="Expected: Unsupported dynamic op: Squeeze") xfail_issue_47323 = xfail_test(reason="RuntimeError: The plugin does not support FP64") -xfail_issue_47337 = xfail_test(reason="RuntimeError: Unsupported dynamic ops: v1::OneHot") +xfail_issue_73538 = xfail_test(reason="OneHot: Unsupported negative indices, " + "AssertionError: Mismatched elements.") # Model MSFT issues: xfail_issue_37957 = xfail_test(reason="RuntimeError: nGraph does not support the following ONNX operations: " @@ -122,7 +123,6 @@ xfail_issue_48145 = xfail_test(reason="BertSquad-8 - AssertionError: Items are n "DESIRED: 3") xfail_issue_48190 = xfail_test(reason="RobertaBase-11 - AssertionError: Items are not equal: " "ACTUAL: dtype('float64') DESIRED: dtype('float32')") -xfail_issue_49750 = xfail_test(reason="RuntimeError: Unsupported dynamic ops: v4::Interpolate") xfail_issue_49752 = xfail_test(reason="RuntimeError: Unsupported dynamic ops: v1::Pad") xfail_issue_49753 = xfail_test(reason="RuntimeError: Unsupported dynamic ops: v1::StridedSlice") xfail_issue_49754 = xfail_test(reason="RuntimeError: Unsupported dynamic ops: v1::TopKIE") diff --git a/src/bindings/python/tests_compatibility/test_onnx/test_backend.py b/src/bindings/python/tests_compatibility/test_onnx/test_backend.py index c6bbe3d6a57..3da0078c75b 100644 --- a/src/bindings/python/tests_compatibility/test_onnx/test_backend.py +++ b/src/bindings/python/tests_compatibility/test_onnx/test_backend.py @@ -33,10 +33,9 @@ from tests_compatibility import ( xfail_issue_44968, xfail_issue_45180, xfail_issue_47323, - xfail_issue_47337, + xfail_issue_73538, xfail_issue_48052, xfail_issue_49207, - xfail_issue_49750, xfail_issue_52463, xfail_issue_58033, xfail_issue_63033, @@ -202,12 +201,6 @@ tests_expected_to_fail = [ "OnnxBackendNodeModelTest.test_scan_sum_cpu", "OnnxBackendNodeModelTest.test_scan9_sum_cpu", ), - ( - xfail_issue_49750, - "OnnxBackendNodeModelTest.test_resize_downsample_scales_cubic_align_corners_cpu", - "OnnxBackendNodeModelTest.test_resize_downsample_scales_cubic_A_n0p5_exclude_outside_cpu", - "OnnxBackendNodeModelTest.test_resize_upsample_scales_cubic_A_n0p5_exclude_outside_cpu", - ), ( xfail_issue_33581, "OnnxBackendNodeModelTest.test_gather_elements_negative_indices_cpu", @@ -219,7 +212,7 @@ tests_expected_to_fail = [ "OnnxBackendNodeModelTest.test_momentum_multiple_cpu", ), ( - xfail_issue_47337, + xfail_issue_73538, "OnnxBackendNodeModelTest.test_onehot_negative_indices_cpu", ), ( @@ -377,7 +370,13 @@ tests_expected_to_fail = [ "OnnxBackendNodeModelTest.test_shape_start_1_end_negative_1_cpu", "OnnxBackendNodeModelTest.test_shape_start_negative_1_cpu", ), - (xfail_issue_69444, "OnnxBackendNodeModelTest.test_resize_downsample_scales_linear_align_corners_cpu"), + ( + xfail_issue_69444, + "OnnxBackendNodeModelTest.test_resize_downsample_scales_linear_align_corners_cpu", + "OnnxBackendNodeModelTest.test_resize_downsample_scales_cubic_align_corners_cpu", + "OnnxBackendNodeModelTest.test_resize_downsample_scales_cubic_A_n0p5_exclude_outside_cpu", + "OnnxBackendNodeModelTest.test_resize_upsample_scales_cubic_A_n0p5_exclude_outside_cpu", + ), ] for test_group in tests_expected_to_fail: