From e5354cda6649c295b6c23363a7ce8d6971d3c6d1 Mon Sep 17 00:00:00 2001 From: Alex Marin Date: Wed, 5 Feb 2025 15:05:04 -0800 Subject: [PATCH 1/9] Enable averagepool tests --- .../onnx_backend_test_series_filters.jsonc | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/onnxruntime/test/testdata/onnx_backend_test_series_filters.jsonc b/onnxruntime/test/testdata/onnx_backend_test_series_filters.jsonc index 272ea37fcc70c..a794922fea4ba 100644 --- a/onnxruntime/test/testdata/onnx_backend_test_series_filters.jsonc +++ b/onnxruntime/test/testdata/onnx_backend_test_series_filters.jsonc @@ -145,20 +145,20 @@ "^test_shufflenet", "^test_squeezenet", // TODO: enable these tests when integrating with ONNX 1.14 for ORT 1.15 release - "^test_averagepool_1d_default*", - "^test_averagepool_2d_ceil*", - "^test_averagepool_2d_default*", - "^test_averagepool_2d_dilations*", - "^test_averagepool_2d_pads_count_include_pad*", - "^test_averagepool_2d_pads*", - "^test_averagepool_2d_precomputed_pads_count_include_pad*", - "^test_averagepool_2d_precomputed_pads*", - "^test_averagepool_2d_precomputed_same_upper*", - "^test_averagepool_2d_precomputed_strides*", - "^test_averagepool_2d_same_lower*", - "^test_averagepool_2d_same_upper*", - "^test_averagepool_2d_strides*", - "^test_averagepool_3d_default*", + // "^test_averagepool_1d_default*", + // "^test_averagepool_2d_ceil*", + // "^test_averagepool_2d_default*", + // "^test_averagepool_2d_dilations*", + // "^test_averagepool_2d_pads_count_include_pad*", + // "^test_averagepool_2d_pads*", + // "^test_averagepool_2d_precomputed_pads_count_include_pad*", + // "^test_averagepool_2d_precomputed_pads*", + // "^test_averagepool_2d_precomputed_same_upper*", + // "^test_averagepool_2d_precomputed_strides*", + // "^test_averagepool_2d_same_lower*", + // "^test_averagepool_2d_same_upper*", + // "^test_averagepool_2d_strides*", + // "^test_averagepool_3d_default*", "^test_constant_pad_axes*", "^test_constant_pad*", "^test_edge_pad*", From 5687516a061c03d2acb51d9c284c62b2738eb927 Mon Sep 17 00:00:00 2001 From: Alex Marin Date: Thu, 6 Feb 2025 04:57:33 -0800 Subject: [PATCH 2/9] remove all averagepool occurrences from the failing tests array --- .../onnx_backend_test_series_filters.jsonc | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/onnxruntime/test/testdata/onnx_backend_test_series_filters.jsonc b/onnxruntime/test/testdata/onnx_backend_test_series_filters.jsonc index a794922fea4ba..377500db1289c 100644 --- a/onnxruntime/test/testdata/onnx_backend_test_series_filters.jsonc +++ b/onnxruntime/test/testdata/onnx_backend_test_series_filters.jsonc @@ -144,21 +144,6 @@ "^test_resnet50", "^test_shufflenet", "^test_squeezenet", - // TODO: enable these tests when integrating with ONNX 1.14 for ORT 1.15 release - // "^test_averagepool_1d_default*", - // "^test_averagepool_2d_ceil*", - // "^test_averagepool_2d_default*", - // "^test_averagepool_2d_dilations*", - // "^test_averagepool_2d_pads_count_include_pad*", - // "^test_averagepool_2d_pads*", - // "^test_averagepool_2d_precomputed_pads_count_include_pad*", - // "^test_averagepool_2d_precomputed_pads*", - // "^test_averagepool_2d_precomputed_same_upper*", - // "^test_averagepool_2d_precomputed_strides*", - // "^test_averagepool_2d_same_lower*", - // "^test_averagepool_2d_same_upper*", - // "^test_averagepool_2d_strides*", - // "^test_averagepool_3d_default*", "^test_constant_pad_axes*", "^test_constant_pad*", "^test_edge_pad*", @@ -196,8 +181,7 @@ "^test_reshape_reordered_last_dims*", "^test_reshape_zero_and_negative_dim*", "^test_reshape_zero_dim*", - // TODO: fialures with Windows GPU CI Pipeline that are introduced with ONNX opset 19. Need to be fixed before ORT 1.15 release. - "^test_averagepool_*", + // TODO: failures with Windows GPU CI Pipeline that are introduced with ONNX opset 19. Need to be fixed before ORT 1.15 release. "^test_wrap_pad_cuda", "^test_resize_downsample_scales_cubic_A_n0p5_exclude_outside_cuda", "^test_resize_downsample_scales_cubic_antialias_cuda", @@ -333,7 +317,6 @@ "current_failing_tests_DNNL": [ "^test_range_float_type_positive_delta_expanded", "^test_range_int32_type_negative_delta_expanded", - "^test_averagepool_2d_ceil", "^test_maxpool_2d_ceil", "^test_maxpool_2d_dilations", "^test_maxpool_2d_uint8", From 4f45a7663b9eac870f0bbb011403f9742aed5465 Mon Sep 17 00:00:00 2001 From: Alex Marin Date: Thu, 6 Feb 2025 13:25:10 -0800 Subject: [PATCH 3/9] ignore failing test --- onnxruntime/test/testdata/onnx_backend_test_series_filters.jsonc | 1 + 1 file changed, 1 insertion(+) diff --git a/onnxruntime/test/testdata/onnx_backend_test_series_filters.jsonc b/onnxruntime/test/testdata/onnx_backend_test_series_filters.jsonc index 377500db1289c..36645b79d6577 100644 --- a/onnxruntime/test/testdata/onnx_backend_test_series_filters.jsonc +++ b/onnxruntime/test/testdata/onnx_backend_test_series_filters.jsonc @@ -144,6 +144,7 @@ "^test_resnet50", "^test_shufflenet", "^test_squeezenet", + "^test_averagepool_3d_dilations_large_count_include_pad_is_1_ceil_mode_is_True_cpu", "^test_constant_pad_axes*", "^test_constant_pad*", "^test_edge_pad*", From d2a66791fad7aad31d3ed4a1f88dec2390cbce28 Mon Sep 17 00:00:00 2001 From: Alex Marin Date: Thu, 6 Feb 2025 15:15:02 -0800 Subject: [PATCH 4/9] exclude failing test --- onnxruntime/test/testdata/onnx_backend_test_series_filters.jsonc | 1 + 1 file changed, 1 insertion(+) diff --git a/onnxruntime/test/testdata/onnx_backend_test_series_filters.jsonc b/onnxruntime/test/testdata/onnx_backend_test_series_filters.jsonc index 36645b79d6577..d53f22c7da3cc 100644 --- a/onnxruntime/test/testdata/onnx_backend_test_series_filters.jsonc +++ b/onnxruntime/test/testdata/onnx_backend_test_series_filters.jsonc @@ -145,6 +145,7 @@ "^test_shufflenet", "^test_squeezenet", "^test_averagepool_3d_dilations_large_count_include_pad_is_1_ceil_mode_is_True_cpu", + "^test_averagepool_3d_dilations_large_count_include_pad_is_1_ceil_mode_is_False_cpu", "^test_constant_pad_axes*", "^test_constant_pad*", "^test_edge_pad*", From 2c0dc8666f9ff066c32650e81c19162a57c582a8 Mon Sep 17 00:00:00 2001 From: Alex Marin Date: Thu, 6 Feb 2025 16:46:47 -0800 Subject: [PATCH 5/9] exclude failing tests --- .../test/testdata/onnx_backend_test_series_filters.jsonc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/onnxruntime/test/testdata/onnx_backend_test_series_filters.jsonc b/onnxruntime/test/testdata/onnx_backend_test_series_filters.jsonc index d53f22c7da3cc..bc2a190520bec 100644 --- a/onnxruntime/test/testdata/onnx_backend_test_series_filters.jsonc +++ b/onnxruntime/test/testdata/onnx_backend_test_series_filters.jsonc @@ -146,6 +146,8 @@ "^test_squeezenet", "^test_averagepool_3d_dilations_large_count_include_pad_is_1_ceil_mode_is_True_cpu", "^test_averagepool_3d_dilations_large_count_include_pad_is_1_ceil_mode_is_False_cpu", + "^test_averagepool_3d_dilations_large_count_include_pad_is_0_ceil_mode_is_True_cpu", + "^test_averagepool_3d_dilations_large_count_include_pad_is_0_ceil_mode_is_False_cpu", "^test_constant_pad_axes*", "^test_constant_pad*", "^test_edge_pad*", From 48dd0d5af1f7d85c977cd3d1aec326d18593d250 Mon Sep 17 00:00:00 2001 From: Alex Marin Date: Fri, 7 Feb 2025 02:52:21 -0800 Subject: [PATCH 6/9] exclude failing tests --- .../test/testdata/onnx_backend_test_series_filters.jsonc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/onnxruntime/test/testdata/onnx_backend_test_series_filters.jsonc b/onnxruntime/test/testdata/onnx_backend_test_series_filters.jsonc index bc2a190520bec..0c4e83c9da8a7 100644 --- a/onnxruntime/test/testdata/onnx_backend_test_series_filters.jsonc +++ b/onnxruntime/test/testdata/onnx_backend_test_series_filters.jsonc @@ -148,6 +148,8 @@ "^test_averagepool_3d_dilations_large_count_include_pad_is_1_ceil_mode_is_False_cpu", "^test_averagepool_3d_dilations_large_count_include_pad_is_0_ceil_mode_is_True_cpu", "^test_averagepool_3d_dilations_large_count_include_pad_is_0_ceil_mode_is_False_cpu", + "^test_averagepool_3d_dilations_large_count_include_pad_is_1_ceil_mode_is_True_cuda", + "^test_averagepool_3d_dilations_large_count_include_pad_is_1_ceil_mode_is_False_cuda", "^test_constant_pad_axes*", "^test_constant_pad*", "^test_edge_pad*", From 9660c31ec4faa4c5a427c4f3b02b6759f879f495 Mon Sep 17 00:00:00 2001 From: Alex Marin Date: Mon, 10 Feb 2025 11:00:05 -0800 Subject: [PATCH 7/9] exclude failing tests --- .../test/testdata/onnx_backend_test_series_filters.jsonc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/onnxruntime/test/testdata/onnx_backend_test_series_filters.jsonc b/onnxruntime/test/testdata/onnx_backend_test_series_filters.jsonc index 0c4e83c9da8a7..f2685bd24ccf7 100644 --- a/onnxruntime/test/testdata/onnx_backend_test_series_filters.jsonc +++ b/onnxruntime/test/testdata/onnx_backend_test_series_filters.jsonc @@ -150,6 +150,8 @@ "^test_averagepool_3d_dilations_large_count_include_pad_is_0_ceil_mode_is_False_cpu", "^test_averagepool_3d_dilations_large_count_include_pad_is_1_ceil_mode_is_True_cuda", "^test_averagepool_3d_dilations_large_count_include_pad_is_1_ceil_mode_is_False_cuda", + "^test_averagepool_2d_dilations_cpu", + "^test_averagepool_3d_dilations_small_cpu", "^test_constant_pad_axes*", "^test_constant_pad*", "^test_edge_pad*", From 194528427090342389cd6bf1306b24a68ff39fa4 Mon Sep 17 00:00:00 2001 From: Alex Marin Date: Tue, 11 Feb 2025 11:07:03 -0800 Subject: [PATCH 8/9] reenable 2 failing tests --- .../test/testdata/onnx_backend_test_series_filters.jsonc | 2 -- 1 file changed, 2 deletions(-) diff --git a/onnxruntime/test/testdata/onnx_backend_test_series_filters.jsonc b/onnxruntime/test/testdata/onnx_backend_test_series_filters.jsonc index f2685bd24ccf7..ad66b8891e7b0 100644 --- a/onnxruntime/test/testdata/onnx_backend_test_series_filters.jsonc +++ b/onnxruntime/test/testdata/onnx_backend_test_series_filters.jsonc @@ -144,8 +144,6 @@ "^test_resnet50", "^test_shufflenet", "^test_squeezenet", - "^test_averagepool_3d_dilations_large_count_include_pad_is_1_ceil_mode_is_True_cpu", - "^test_averagepool_3d_dilations_large_count_include_pad_is_1_ceil_mode_is_False_cpu", "^test_averagepool_3d_dilations_large_count_include_pad_is_0_ceil_mode_is_True_cpu", "^test_averagepool_3d_dilations_large_count_include_pad_is_0_ceil_mode_is_False_cpu", "^test_averagepool_3d_dilations_large_count_include_pad_is_1_ceil_mode_is_True_cuda", From c6871b915174e8f9d8995bad5849588a1647ee3f Mon Sep 17 00:00:00 2001 From: Alex Marin Date: Thu, 13 Feb 2025 09:30:08 -0800 Subject: [PATCH 9/9] replace skipped test with one that passes locally --- .../test/testdata/onnx_backend_test_series_filters.jsonc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/onnxruntime/test/testdata/onnx_backend_test_series_filters.jsonc b/onnxruntime/test/testdata/onnx_backend_test_series_filters.jsonc index 73510dcb09b50..6e611d44da122 100644 --- a/onnxruntime/test/testdata/onnx_backend_test_series_filters.jsonc +++ b/onnxruntime/test/testdata/onnx_backend_test_series_filters.jsonc @@ -144,7 +144,8 @@ "^test_resnet50", "^test_shufflenet", "^test_squeezenet", - "^test_averagepool_3d_dilations_large_count_include_pad_is_0_ceil_mode_is_True_cpu", + "^test_averagepool_3d_dilations_large_count_include_pad_is_1_ceil_mode_is_True_cpu", + "^test_averagepool_3d_dilations_large_count_include_pad_is_1_ceil_mode_is_False_cpu", "^test_averagepool_3d_dilations_large_count_include_pad_is_0_ceil_mode_is_False_cpu", "^test_averagepool_3d_dilations_large_count_include_pad_is_1_ceil_mode_is_True_cuda", "^test_averagepool_3d_dilations_large_count_include_pad_is_1_ceil_mode_is_False_cuda",