[mir_onnx] Switch GlobalAveragePool converter to AvgPool2DOp (#7049)
authorСергей Баранников/AI Tools Lab /SRR/Engineer/삼성전자 <s.barannikov@samsung.com>
Fri, 30 Aug 2019 07:14:22 +0000 (16:14 +0900)
committer박종현/On-Device Lab(SR)/Staff Engineer/삼성전자 <jh1302.park@samsung.com>
Fri, 30 Aug 2019 07:14:22 +0000 (16:14 +0900)
Switch from `PoolOp` to `AvgPool2DOp` in `GlobalAveragePool` converter. The former one is deprecated.

Signed-off-by: Sergei Barannikov <s.barannikov@samsung.com>
compiler/mir-onnx-importer/Op/GlobalAveragePool.cpp

index 048c5af..4b2e43b 100644 (file)
@@ -18,7 +18,7 @@
 
 #include "ONNXHelpers.h"
 
-#include "mir/ops/PoolOp.h"
+#include "mir/ops/AvgPool2DOp.h"
 
 namespace mir_onnx
 {
@@ -44,11 +44,9 @@ void GlobalAveragePoolNodeConverter::convert(const onnx::NodeProto &onnx_node,
   const std::vector<std::int32_t> padding_after{0, 0};
 
   input = convertONNXToMIR(graph, input);
-  auto result =
-      createOp<mir::ops::PoolOp>(graph, input, mir::ops::PoolOp::PoolingType::AVG,
-                                 mir::Shape(window_size), mir::Shape(strides), padding_before,
-                                 padding_after, mir::ops::PoolOp::BorderType::ZEROFILLED)
-          ->getOutput(0);
+  auto result = createOp<mir::ops::AvgPool2DOp>(graph, input, window_size, strides, padding_before,
+                                                padding_after, true, mir::DataFormat::NHWC)
+                    ->getOutput(0);
   result = convertMIRToONNX(graph, result);
 
   context->setNodeOutputs(onnx_node, {result});