Fix build issue #2668 (#2669)

- Build failure issued by merging of #2646: convertBlob return value changed
- Small code style changes

Signed-off-by: Sergei Barannikov <s.barannikov@samsung.com>

diff --git a/contrib/nnc/include/core/modelIR/operations/ConstantOp.h b/contrib/nnc/include/core/modelIR/operations/ConstantOp.h
index 92d22f4..46d4125 100644 (file)
--- a/contrib/nnc/include/core/modelIR/operations/ConstantOp.h
+++ b/contrib/nnc/include/core/modelIR/operations/ConstantOp.h
@@ -25,15 +25,15 @@ namespace ops {
 
 class ConstantOp : public Operation {
 public:
-  ConstantOp(const std::shared_ptr<mir::TensorVariant>& value) :
-                                            Operation(Type::constant, {}), _value(value) {
+  ConstantOp(const std::shared_ptr<mir::TensorVariant>& value)
+      : Operation(Type::constant, {}), _value(value) {
     setOutputShape(0, _value->getShape());
   }
 
-    const std::shared_ptr<mir::TensorVariant>& getValue() const { return _value; }
+  const std::shared_ptr<mir::TensorVariant>& getValue() const { return _value; }
 
 private:
-    const std::shared_ptr<mir::TensorVariant>& _value;
+  const std::shared_ptr<mir::TensorVariant>& _value;
 };
 
 } // namespace ops

diff --git a/contrib/nnc/passes/caffe_frontend/caffe_op_creator.cpp b/contrib/nnc/passes/caffe_frontend/caffe_op_creator.cpp
index 6657ec9..e149d53 100644 (file)
--- a/contrib/nnc/passes/caffe_frontend/caffe_op_creator.cpp
+++ b/contrib/nnc/passes/caffe_frontend/caffe_op_creator.cpp
@@ -547,7 +547,7 @@ std::vector<mir::IODescriptor>
 CaffeOpCreator::convertEmbed(const caffe::LayerParameter& layer,
                              const std::vector<mir::IODescriptor>& inputs) {
   const auto& params = layer.embed_param();
-  auto data = createOp<ops::ConstantOp>(layer.name() + ".weights", *convertBlob(layer.blobs(0)));
+  auto data = createOp<ops::ConstantOp>(layer.name() + ".weights", convertBlob(layer.blobs(0)));
   // FIXME Indices in Caffe have floating type, while in ModelIR they are integral.
   auto result = createOp<ops::GatherOp>(layer.name(), data->getOutput(0), inputs[0], 0);