From 1613d30544742b646e015660df76325740fcb9c2 Mon Sep 17 00:00:00 2001 From: rogday Date: Thu, 2 Dec 2021 20:11:11 +0300 Subject: [PATCH] Merge pull request #21159 from rogday:ceil_mode fix ceil_mode for Average/MaxPooling * fix ceil_mode * add a comment --- modules/dnn/src/onnx/onnx_importer.cpp | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/modules/dnn/src/onnx/onnx_importer.cpp b/modules/dnn/src/onnx/onnx_importer.cpp index 9f7895c7dd..f776bdc5da 100644 --- a/modules/dnn/src/onnx/onnx_importer.cpp +++ b/modules/dnn/src/onnx/onnx_importer.cpp @@ -612,11 +612,24 @@ void ONNXImporter::handleNode(const opencv_onnx::NodeProto& node_proto) } } +void setCeilMode(LayerParams& layerParams) +{ + // auto_pad attribute is deprecated and uses ceil + if (layerParams.has("pad_mode")) + { + layerParams.set("ceil_mode", true); + } + else if (!layerParams.has("ceil_mode")) + { + layerParams.set("ceil_mode", false); + } +} + void ONNXImporter::parseMaxPool(LayerParams& layerParams, const opencv_onnx::NodeProto& node_proto) { layerParams.type = "Pooling"; layerParams.set("pool", "MAX"); - layerParams.set("ceil_mode", layerParams.has("pad_mode")); + setCeilMode(layerParams); addLayer(layerParams, node_proto); } @@ -624,7 +637,7 @@ void ONNXImporter::parseAveragePool(LayerParams& layerParams, const opencv_onnx: { layerParams.type = "Pooling"; layerParams.set("pool", "AVE"); - layerParams.set("ceil_mode", layerParams.has("pad_mode")); + setCeilMode(layerParams); layerParams.set("ave_pool_padded_area", framework_name == "pytorch"); addLayer(layerParams, node_proto); }