[mir] Make Shape constructor explicit (#7239)
authorСергей Баранников/AI Tools Lab /SRR/Engineer/삼성전자 <s.barannikov@samsung.com>
Thu, 5 Sep 2019 16:18:05 +0000 (19:18 +0300)
committerAlexander Efimov/AI Tools Lab/./Samsung Electronics <a.efimov@samsung.com>
Thu, 5 Sep 2019 16:18:05 +0000 (19:18 +0300)
Make `Shape` constructor explicit again.

Signed-off-by: Sergei Barannikov <s.barannikov@samsung.com>
compiler/mir/include/mir/Shape.h
compiler/mir/src/IrDotDumper.cpp

index 18fa812..f3082e8 100644 (file)
@@ -40,8 +40,7 @@ public:
 
   Shape(std::initializer_list<int32_t> &&dims) : _dims(std::move(dims)) {}
 
-  // TODO Make it 'explicit'.
-  Shape(const std::vector<int32_t> &dims) : _dims(std::begin(dims), std::end(dims)) {}
+  explicit Shape(const std::vector<int32_t> &dims) : _dims(std::begin(dims), std::end(dims)) {}
 
   int32_t rank() const { return static_cast<int32_t>(_dims.size()); }
 
index d4eab84..a58cd5a 100644 (file)
@@ -84,7 +84,7 @@ void IrDotDumper::visit(ops::Conv2DOp &op)
                       .withType("Conv2D")
                       .withInShapes(getInputShapes(op))
                       .withOutShapes(getOutputShapes(op))
-                      .withStride(op.getStrides())
+                      .withStride(Shape(op.getStrides()))
                       .withShape("Padding before", Shape(op.getPaddingBefore()))
                       .withShape("Padding after", Shape(op.getPaddingAfter()));
 
@@ -97,7 +97,7 @@ void IrDotDumper::visit(ops::DepthwiseConv2DOp &op)
                       .withType("DepthwiseConv2D")
                       .withInShapes(getInputShapes(op))
                       .withOutShapes(getOutputShapes(op))
-                      .withStride(op.getStrides())
+                      .withStride(Shape(op.getStrides()))
                       .withShape("Padding before", Shape(op.getPaddingBefore()))
                       .withShape("Padding after", Shape(op.getPaddingAfter()));
 
@@ -198,7 +198,7 @@ void IrDotDumper::visit(ops::DeConv2DOp &op)
                        .withInShapes(getInputShapes(op))
                        .withOutShapes(getOutputShapes(op))
                        .withPadType(op.getPaddingType())
-                       .withStride(op.getStrides());
+                       .withStride(Shape(op.getStrides()));
 
   _dot_builder.updateWithOp(&op, node_info);
 }