From 45cbf70265772151eec2084ece99a13b862883bf Mon Sep 17 00:00:00 2001 From: Maksim Shabunin Date: Tue, 8 Feb 2022 20:32:55 +0300 Subject: [PATCH] Update filters in ONNX tests --- ...conformance_layer_filter__openvino.inl.hpp | 178 +++++++++--------- 1 file changed, 92 insertions(+), 86 deletions(-) diff --git a/modules/dnn/test/test_onnx_conformance_layer_filter__openvino.inl.hpp b/modules/dnn/test/test_onnx_conformance_layer_filter__openvino.inl.hpp index 3fa45a39b8..bdd8f3b8b9 100644 --- a/modules/dnn/test/test_onnx_conformance_layer_filter__openvino.inl.hpp +++ b/modules/dnn/test/test_onnx_conformance_layer_filter__openvino.inl.hpp @@ -59,6 +59,12 @@ EOF_LABEL: bool filterApplied = false; +#if INF_ENGINE_VER_MAJOR_EQ(2021040000) || INF_ENGINE_VER_MAJOR_EQ(2022010000) +#define SKIP_SET_1 1 +#else +#define SKIP_SET_1 0 +#endif + // Update note: execute /testdata/dnn/onnx/generate_conformance_list.py BEGIN_SWITCH() CASE(test_abs) @@ -82,11 +88,11 @@ CASE(test_adam_multiple) CASE(test_add) // no filter CASE(test_add_bcast) -#if INF_ENGINE_VER_MAJOR_EQ(2021040000) +#if SKIP_SET_1 SKIP; #endif CASE(test_add_uint8) -#if INF_ENGINE_VER_MAJOR_EQ(2021040000) +#if SKIP_SET_1 SKIP; #endif CASE(test_and2d) @@ -106,131 +112,131 @@ CASE(test_and_bcast4v3d) CASE(test_and_bcast4v4d) // no filter CASE(test_argmax_default_axis_example) -#if INF_ENGINE_VER_MAJOR_EQ(2021040000) +#if SKIP_SET_1 SKIP; #endif CASE(test_argmax_default_axis_example_select_last_index) -#if INF_ENGINE_VER_MAJOR_EQ(2021040000) +#if SKIP_SET_1 SKIP; #endif CASE(test_argmax_default_axis_random) -#if INF_ENGINE_VER_MAJOR_EQ(2021040000) +#if SKIP_SET_1 SKIP; #endif CASE(test_argmax_default_axis_random_select_last_index) -#if INF_ENGINE_VER_MAJOR_EQ(2021040000) +#if SKIP_SET_1 SKIP; #endif CASE(test_argmax_keepdims_example) -#if INF_ENGINE_VER_MAJOR_EQ(2021040000) +#if SKIP_SET_1 SKIP; #endif CASE(test_argmax_keepdims_example_select_last_index) -#if INF_ENGINE_VER_MAJOR_EQ(2021040000) +#if SKIP_SET_1 SKIP; #endif CASE(test_argmax_keepdims_random) -#if INF_ENGINE_VER_MAJOR_EQ(2021040000) +#if SKIP_SET_1 SKIP; #endif CASE(test_argmax_keepdims_random_select_last_index) -#if INF_ENGINE_VER_MAJOR_EQ(2021040000) +#if SKIP_SET_1 SKIP; #endif CASE(test_argmax_negative_axis_keepdims_example) -#if INF_ENGINE_VER_MAJOR_EQ(2021040000) +#if SKIP_SET_1 SKIP; #endif CASE(test_argmax_negative_axis_keepdims_example_select_last_index) -#if INF_ENGINE_VER_MAJOR_EQ(2021040000) +#if SKIP_SET_1 SKIP; #endif CASE(test_argmax_negative_axis_keepdims_random) -#if INF_ENGINE_VER_MAJOR_EQ(2021040000) +#if SKIP_SET_1 SKIP; #endif CASE(test_argmax_negative_axis_keepdims_random_select_last_index) -#if INF_ENGINE_VER_MAJOR_EQ(2021040000) +#if SKIP_SET_1 SKIP; #endif CASE(test_argmax_no_keepdims_example) -#if INF_ENGINE_VER_MAJOR_EQ(2021040000) +#if SKIP_SET_1 SKIP; #endif CASE(test_argmax_no_keepdims_example_select_last_index) -#if INF_ENGINE_VER_MAJOR_EQ(2021040000) +#if SKIP_SET_1 SKIP; #endif CASE(test_argmax_no_keepdims_random) -#if INF_ENGINE_VER_MAJOR_EQ(2021040000) +#if SKIP_SET_1 SKIP; #endif CASE(test_argmax_no_keepdims_random_select_last_index) -#if INF_ENGINE_VER_MAJOR_EQ(2021040000) +#if SKIP_SET_1 SKIP; #endif CASE(test_argmin_default_axis_example) -#if INF_ENGINE_VER_MAJOR_EQ(2021040000) +#if SKIP_SET_1 SKIP; #endif CASE(test_argmin_default_axis_example_select_last_index) -#if INF_ENGINE_VER_MAJOR_EQ(2021040000) +#if SKIP_SET_1 SKIP; #endif CASE(test_argmin_default_axis_random) -#if INF_ENGINE_VER_MAJOR_EQ(2021040000) +#if SKIP_SET_1 SKIP; #endif CASE(test_argmin_default_axis_random_select_last_index) -#if INF_ENGINE_VER_MAJOR_EQ(2021040000) +#if SKIP_SET_1 SKIP; #endif CASE(test_argmin_keepdims_example) -#if INF_ENGINE_VER_MAJOR_EQ(2021040000) +#if SKIP_SET_1 SKIP; #endif CASE(test_argmin_keepdims_example_select_last_index) -#if INF_ENGINE_VER_MAJOR_EQ(2021040000) +#if SKIP_SET_1 SKIP; #endif CASE(test_argmin_keepdims_random) -#if INF_ENGINE_VER_MAJOR_EQ(2021040000) +#if SKIP_SET_1 SKIP; #endif CASE(test_argmin_keepdims_random_select_last_index) -#if INF_ENGINE_VER_MAJOR_EQ(2021040000) +#if SKIP_SET_1 SKIP; #endif CASE(test_argmin_negative_axis_keepdims_example) -#if INF_ENGINE_VER_MAJOR_EQ(2021040000) +#if SKIP_SET_1 SKIP; #endif CASE(test_argmin_negative_axis_keepdims_example_select_last_index) -#if INF_ENGINE_VER_MAJOR_EQ(2021040000) +#if SKIP_SET_1 SKIP; #endif CASE(test_argmin_negative_axis_keepdims_random) -#if INF_ENGINE_VER_MAJOR_EQ(2021040000) +#if SKIP_SET_1 SKIP; #endif CASE(test_argmin_negative_axis_keepdims_random_select_last_index) -#if INF_ENGINE_VER_MAJOR_EQ(2021040000) +#if SKIP_SET_1 SKIP; #endif CASE(test_argmin_no_keepdims_example) -#if INF_ENGINE_VER_MAJOR_EQ(2021040000) +#if SKIP_SET_1 SKIP; #endif CASE(test_argmin_no_keepdims_example_select_last_index) -#if INF_ENGINE_VER_MAJOR_EQ(2021040000) +#if SKIP_SET_1 SKIP; #endif CASE(test_argmin_no_keepdims_random) -#if INF_ENGINE_VER_MAJOR_EQ(2021040000) +#if SKIP_SET_1 SKIP; #endif CASE(test_argmin_no_keepdims_random_select_last_index) -#if INF_ENGINE_VER_MAJOR_EQ(2021040000) +#if SKIP_SET_1 SKIP; #endif CASE(test_asin) @@ -256,11 +262,11 @@ CASE(test_averagepool_2d_ceil) CASE(test_averagepool_2d_default) // no filter CASE(test_averagepool_2d_pads) -#if INF_ENGINE_VER_MAJOR_EQ(2021040000) +#if SKIP_SET_1 SKIP_MYRIAD; #endif CASE(test_averagepool_2d_pads_count_include_pad) -#if INF_ENGINE_VER_MAJOR_EQ(2021040000) +#if SKIP_SET_1 SKIP_CPU; // MYRIAD is ok SKIP_OPENCL; @@ -269,7 +275,7 @@ CASE(test_averagepool_2d_pads_count_include_pad) CASE(test_averagepool_2d_precomputed_pads) // no filter CASE(test_averagepool_2d_precomputed_pads_count_include_pad) -#if INF_ENGINE_VER_MAJOR_EQ(2021040000) +#if SKIP_SET_1 SKIP; #endif CASE(test_averagepool_2d_precomputed_same_upper) @@ -277,7 +283,7 @@ CASE(test_averagepool_2d_precomputed_same_upper) CASE(test_averagepool_2d_precomputed_strides) // no filter CASE(test_averagepool_2d_same_lower) -#if INF_ENGINE_VER_MAJOR_EQ(2021040000) +#if SKIP_SET_1 SKIP; #endif CASE(test_averagepool_2d_same_upper) @@ -287,11 +293,11 @@ CASE(test_averagepool_2d_strides) CASE(test_averagepool_3d_default) // no filter CASE(test_basic_conv_with_padding) -#if INF_ENGINE_VER_MAJOR_EQ(2021040000) +#if SKIP_SET_1 SKIP_MYRIAD; #endif CASE(test_basic_conv_without_padding) -#if INF_ENGINE_VER_MAJOR_EQ(2021040000) +#if SKIP_SET_1 SKIP_MYRIAD; #endif CASE(test_basic_convinteger) @@ -349,11 +355,11 @@ CASE(test_cast_FLOAT_to_DOUBLE) CASE(test_cast_FLOAT_to_FLOAT16) // no filter CASE(test_cast_FLOAT_to_STRING) -#if INF_ENGINE_VER_MAJOR_EQ(2021040000) +#if SKIP_SET_1 SKIP; #endif CASE(test_cast_STRING_to_FLOAT) -#if INF_ENGINE_VER_MAJOR_EQ(2021040000) +#if SKIP_SET_1 SKIP; #endif CASE(test_castlike_BFLOAT16_to_FLOAT) @@ -391,13 +397,13 @@ CASE(test_castlike_FLOAT_to_FLOAT16_expanded) CASE(test_castlike_FLOAT_to_STRING) // no filter CASE(test_castlike_FLOAT_to_STRING_expanded) -#if INF_ENGINE_VER_MAJOR_EQ(2021040000) +#if SKIP_SET_1 SKIP; #endif CASE(test_castlike_STRING_to_FLOAT) // no filter CASE(test_castlike_STRING_to_FLOAT_expanded) -#if INF_ENGINE_VER_MAJOR_EQ(2021040000) +#if SKIP_SET_1 SKIP; #endif CASE(test_ceil) @@ -441,7 +447,7 @@ CASE(test_compress_negative_axis) CASE(test_concat_1d_axis_0) // no filter CASE(test_concat_1d_axis_negative_1) -#if INF_ENGINE_VER_MAJOR_EQ(2021040000) +#if SKIP_SET_1 SKIP; #endif CASE(test_concat_2d_axis_0) @@ -475,19 +481,19 @@ CASE(test_constantofshape_int_shape_zero) CASE(test_constantofshape_int_zeros) // no filter CASE(test_conv_with_autopad_same) -#if INF_ENGINE_VER_MAJOR_EQ(2021040000) +#if SKIP_SET_1 SKIP_MYRIAD; #endif CASE(test_conv_with_strides_and_asymmetric_padding) -#if INF_ENGINE_VER_MAJOR_EQ(2021040000) +#if SKIP_SET_1 SKIP_MYRIAD; #endif CASE(test_conv_with_strides_no_padding) -#if INF_ENGINE_VER_MAJOR_EQ(2021040000) +#if SKIP_SET_1 SKIP_MYRIAD; #endif CASE(test_conv_with_strides_padding) -#if INF_ENGINE_VER_MAJOR_EQ(2021040000) +#if SKIP_SET_1 SKIP_MYRIAD; #endif CASE(test_convinteger_with_padding) @@ -555,13 +561,13 @@ CASE(test_det_nd) CASE(test_div) // no filter CASE(test_div_bcast) -#if INF_ENGINE_VER_MAJOR_EQ(2021040000) +#if SKIP_SET_1 SKIP; #endif CASE(test_div_example) // no filter CASE(test_div_uint8) -#if INF_ENGINE_VER_MAJOR_EQ(2021040000) +#if SKIP_SET_1 SKIP; #endif CASE(test_dropout_default) @@ -573,7 +579,7 @@ CASE(test_dropout_default_mask_ratio) CASE(test_dropout_default_old) // no filter CASE(test_dropout_default_ratio) -#if INF_ENGINE_VER_MAJOR_EQ(2021040000) +#if SKIP_SET_1 SKIP; #endif CASE(test_dropout_random_old) @@ -697,11 +703,11 @@ CASE(test_globalaveragepool) CASE(test_globalaveragepool_precomputed) // no filter CASE(test_globalmaxpool) -#if INF_ENGINE_VER_MAJOR_EQ(2021040000) +#if SKIP_SET_1 SKIP_MYRIAD; #endif CASE(test_globalmaxpool_precomputed) -#if INF_ENGINE_VER_MAJOR_EQ(2021040000) +#if SKIP_SET_1 SKIP_MYRIAD; #endif CASE(test_greater) @@ -811,12 +817,12 @@ CASE(test_log) CASE(test_log_example) // no filter CASE(test_logsoftmax_axis_0) -#if INF_ENGINE_VER_MAJOR_EQ(2021040000) +#if SKIP_SET_1 SKIP_OPENCL; SKIP_OPENCL_FP16; #endif CASE(test_logsoftmax_axis_0_expanded) -#if INF_ENGINE_VER_MAJOR_EQ(2021040000) +#if SKIP_SET_1 SKIP_OPENCL; SKIP_OPENCL_FP16; #endif @@ -829,7 +835,7 @@ CASE(test_logsoftmax_axis_2) CASE(test_logsoftmax_axis_2_expanded) // no filter CASE(test_logsoftmax_default_axis) -#if INF_ENGINE_VER_MAJOR_EQ(2021040000) +#if SKIP_SET_1 SKIP; #endif CASE(test_logsoftmax_default_axis_expanded) @@ -839,12 +845,12 @@ CASE(test_logsoftmax_example_1) CASE(test_logsoftmax_example_1_expanded) // no filter CASE(test_logsoftmax_large_number) -#if INF_ENGINE_VER_MAJOR_EQ(2021040000) +#if SKIP_SET_1 SKIP_OPENCL_FP16; SKIP_MYRIAD; #endif CASE(test_logsoftmax_large_number_expanded) -#if INF_ENGINE_VER_MAJOR_EQ(2021040000) +#if SKIP_SET_1 SKIP_OPENCL_FP16; SKIP_MYRIAD; #endif @@ -907,71 +913,71 @@ CASE(test_max_uint64) CASE(test_max_uint8) // no filter CASE(test_maxpool_1d_default) -#if INF_ENGINE_VER_MAJOR_EQ(2021040000) +#if SKIP_SET_1 SKIP_MYRIAD; #endif CASE(test_maxpool_2d_ceil) -#if INF_ENGINE_VER_MAJOR_EQ(2021040000) +#if SKIP_SET_1 SKIP_MYRIAD; #endif CASE(test_maxpool_2d_default) -#if INF_ENGINE_VER_MAJOR_EQ(2021040000) +#if SKIP_SET_1 SKIP_MYRIAD; #endif CASE(test_maxpool_2d_dilations) -#if INF_ENGINE_VER_MAJOR_EQ(2021040000) +#if SKIP_SET_1 SKIP; #endif CASE(test_maxpool_2d_pads) -#if INF_ENGINE_VER_MAJOR_EQ(2021040000) +#if SKIP_SET_1 SKIP_MYRIAD; #endif CASE(test_maxpool_2d_precomputed_pads) -#if INF_ENGINE_VER_MAJOR_EQ(2021040000) +#if SKIP_SET_1 SKIP_MYRIAD; #endif CASE(test_maxpool_2d_precomputed_same_upper) -#if INF_ENGINE_VER_MAJOR_EQ(2021040000) +#if SKIP_SET_1 SKIP_MYRIAD; #endif CASE(test_maxpool_2d_precomputed_strides) -#if INF_ENGINE_VER_MAJOR_EQ(2021040000) +#if SKIP_SET_1 SKIP_MYRIAD; #endif CASE(test_maxpool_2d_same_lower) -#if INF_ENGINE_VER_MAJOR_EQ(2021040000) +#if SKIP_SET_1 SKIP; #endif CASE(test_maxpool_2d_same_upper) -#if INF_ENGINE_VER_MAJOR_EQ(2021040000) +#if SKIP_SET_1 SKIP_MYRIAD; #endif CASE(test_maxpool_2d_strides) -#if INF_ENGINE_VER_MAJOR_EQ(2021040000) +#if SKIP_SET_1 SKIP_MYRIAD; #endif CASE(test_maxpool_2d_uint8) -#if INF_ENGINE_VER_MAJOR_EQ(2021040000) +#if SKIP_SET_1 SKIP; #endif CASE(test_maxpool_3d_default) -#if INF_ENGINE_VER_MAJOR_EQ(2021040000) +#if SKIP_SET_1 SKIP_NON_CPU; #endif CASE(test_maxpool_with_argmax_2d_precomputed_pads) -#if INF_ENGINE_VER_MAJOR_EQ(2021040000) +#if SKIP_SET_1 SKIP; #endif CASE(test_maxpool_with_argmax_2d_precomputed_strides) -#if INF_ENGINE_VER_MAJOR_EQ(2021040000) +#if SKIP_SET_1 SKIP; #endif CASE(test_maxunpool_export_with_output_shape) -#if INF_ENGINE_VER_MAJOR_EQ(2021040000) +#if SKIP_SET_1 SKIP; #endif CASE(test_maxunpool_export_without_output_shape) -#if INF_ENGINE_VER_MAJOR_EQ(2021040000) +#if SKIP_SET_1 SKIP; #endif CASE(test_mean_example) @@ -1041,13 +1047,13 @@ CASE(test_momentum_multiple) CASE(test_mul) // no filter CASE(test_mul_bcast) -#if INF_ENGINE_VER_MAJOR_EQ(2021040000) +#if SKIP_SET_1 SKIP; #endif CASE(test_mul_example) // no filter CASE(test_mul_uint8) -#if INF_ENGINE_VER_MAJOR_EQ(2021040000) +#if SKIP_SET_1 SKIP; #endif CASE(test_mvn) @@ -1717,12 +1723,12 @@ CASE(test_slice_negative_axes) CASE(test_slice_start_out_of_bounds) // no filter CASE(test_softmax_axis_0) -#if INF_ENGINE_VER_MAJOR_EQ(2021040000) +#if SKIP_SET_1 SKIP_OPENCL; SKIP_OPENCL_FP16; #endif CASE(test_softmax_axis_0_expanded) -#if INF_ENGINE_VER_MAJOR_EQ(2021040000) +#if SKIP_SET_1 SKIP_OPENCL; SKIP_OPENCL_FP16; #endif @@ -1735,7 +1741,7 @@ CASE(test_softmax_axis_2) CASE(test_softmax_axis_2_expanded) // no filter CASE(test_softmax_default_axis) -#if INF_ENGINE_VER_MAJOR_EQ(2021040000) +#if SKIP_SET_1 SKIP; #endif CASE(test_softmax_default_axis_expanded) @@ -1745,12 +1751,12 @@ CASE(test_softmax_example) CASE(test_softmax_example_expanded) // no filter CASE(test_softmax_large_number) -#if INF_ENGINE_VER_MAJOR_EQ(2021040000) +#if SKIP_SET_1 SKIP_OPENCL_FP16; SKIP_MYRIAD; #endif CASE(test_softmax_large_number_expanded) -#if INF_ENGINE_VER_MAJOR_EQ(2021040000) +#if SKIP_SET_1 SKIP_OPENCL_FP16; SKIP_MYRIAD; #endif @@ -1807,13 +1813,13 @@ CASE(test_strnormalizer_nostopwords_nochangecase) CASE(test_sub) // no filter CASE(test_sub_bcast) -#if INF_ENGINE_VER_MAJOR_EQ(2021040000) +#if SKIP_SET_1 SKIP; #endif CASE(test_sub_example) // no filter CASE(test_sub_uint8) -#if INF_ENGINE_VER_MAJOR_EQ(2021040000) +#if SKIP_SET_1 SKIP; #endif CASE(test_sum_example) @@ -1949,7 +1955,7 @@ CASE(test_unsqueeze_two_axes) CASE(test_unsqueeze_unsorted_axes) // no filter CASE(test_upsample_nearest) -#if INF_ENGINE_VER_MAJOR_EQ(2021040000) +#if SKIP_SET_1 SKIP; #endif CASE(test_where_example)