[mir_caffe2] Change type of strides argument (#7174)
authorСергей Баранников/AI Tools Lab /SRR/Engineer/삼성전자 <s.barannikov@samsung.com>
Wed, 4 Sep 2019 15:34:59 +0000 (18:34 +0300)
committerAlexander Efimov/AI Tools Lab/./Samsung Electronics <a.efimov@samsung.com>
Wed, 4 Sep 2019 15:34:59 +0000 (18:34 +0300)
Change the type of `strides` argument of `Conv2D` and `DepthwiseConv2D` operations to `vector<int32_t>`.

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

index fdf509a..af3825e 100644 (file)
@@ -352,7 +352,7 @@ Caffe2OpCreator::convertConv(const std::vector<mir::Operation::Output *> &inputs
                              const ::caffe2::OperatorDef &op)
 {
   // dilation order: h w (not used)
-  Shape stride_shape(getStrides(op));
+  std::vector<std::int32_t> strides = getStrides(op);
 
   std::vector<int32_t> pad_before, pad_after;
   std::tie(pad_before, pad_after) = getPadding(op);
@@ -374,8 +374,8 @@ Caffe2OpCreator::convertConv(const std::vector<mir::Operation::Output *> &inputs
     // TODO handle properly kernel with layer multiplier
     auto transposed_tensor = mir::transposeTensor<0, 1, 3, 2>(kernel_tensor);
     auto kernel = createOp<ops::ConstantOp>(transposed_tensor)->getOutput(0);
-    result = createOp<ops::DepthwiseConv2DOp>(inputs[0], kernel, stride_shape, pad_before,
-                                              pad_after, DataFormat::NCHW)
+    result = createOp<ops::DepthwiseConv2DOp>(inputs[0], kernel, strides, pad_before, pad_after,
+                                              DataFormat::NCHW)
                  ->getOutput(0);
   }
   else
@@ -385,9 +385,9 @@ Caffe2OpCreator::convertConv(const std::vector<mir::Operation::Output *> &inputs
       kernel_tensor = fixGroupedKernel(num_groups, kernel_tensor);
     kernel_tensor = transposeTensor<3, 0, 1, 2>(kernel_tensor);
     auto kernel = createOp<ops::ConstantOp>(kernel_tensor)->getOutput(0);
-    result = createOp<ops::Conv2DOp>(inputs[0], kernel, stride_shape, pad_before, pad_after,
-                                     DataFormat::NCHW)
-                 ->getOutput(0);
+    result =
+        createOp<ops::Conv2DOp>(inputs[0], kernel, strides, pad_before, pad_after, DataFormat::NCHW)
+            ->getOutput(0);
   }
 
   if (op.input_size() > 2)