diff --git a/modules/dnn/src/layers/avgpool_layer.cpp b/modules/dnn/src/layers/avgpool_layer.cpp index 60f4800b85..20cc8d0977 100644 --- a/modules/dnn/src/layers/avgpool_layer.cpp +++ b/modules/dnn/src/layers/avgpool_layer.cpp @@ -587,9 +587,17 @@ public: setParamsFrom(params); auto_pad = getAutoPadding(params); kernel_shape = params.getVector("kernel_size"); + if (kernel_shape.empty() && params.has("kernel_shape")) + kernel_shape = params.getVector("kernel_shape"); strides = params.getVector("stride"); + if (strides.empty() && params.has("strides")) + strides = params.getVector("strides"); dilations = params.getVector("dilation"); + if (dilations.empty() && params.has("dilations")) + dilations = params.getVector("dilations"); pads = params.getVector("pad"); + if (pads.empty() && params.has("pads")) + pads = params.getVector("pads"); ceil_mode = params.get("ceil_mode", false); count_include_pad = params.get("count_include_pad", false); } diff --git a/modules/dnn/test/test_onnx_conformance_layer_parser_denylist.inl.hpp b/modules/dnn/test/test_onnx_conformance_layer_parser_denylist.inl.hpp index 4ee1caf2fe..501b342b3d 100644 --- a/modules/dnn/test/test_onnx_conformance_layer_parser_denylist.inl.hpp +++ b/modules/dnn/test/test_onnx_conformance_layer_parser_denylist.inl.hpp @@ -18,12 +18,6 @@ "test_ai_onnx_ml_tree_ensemble_single_tree", "test_attention_4d_diff_heads_mask4d_padded_kv", // needs the nonpad_kv_seqlen input (padded-KV variant) which is not supported yet "test_averagepool_2d_ceil_last_window_starts_on_pad", -"test_averagepool_2d_dilations", -"test_averagepool_3d_dilations_large_count_include_pad_is_0_ceil_mode_is_False", -"test_averagepool_3d_dilations_large_count_include_pad_is_0_ceil_mode_is_True", -"test_averagepool_3d_dilations_large_count_include_pad_is_1_ceil_mode_is_False", -"test_averagepool_3d_dilations_large_count_include_pad_is_1_ceil_mode_is_True", -"test_averagepool_3d_dilations_small", "test_basic_deform_conv_with_padding", "test_basic_deform_conv_without_padding", "test_batchnorm_epsilon_training_mode", // ---- same as above ---