Fix build (#1937)

Fix visitor in ACL soft backend which diverged with trunk version
Fix code style in IVisitor

Signed-off-by: Efimov Alexander <a.efimov@samsung.com>

diff --git a/contrib/nnc/include/core/modelIR/Visitor.h b/contrib/nnc/include/core/modelIR/Visitor.h
index 15f2d53..9f2a684 100644 (file)
--- a/contrib/nnc/include/core/modelIR/Visitor.h
+++ b/contrib/nnc/include/core/modelIR/Visitor.h
@@ -50,24 +50,24 @@ namespace ops
  */
 class IVisitor {
  public:
-  virtual void visit(INode *node, ops::ConcatOp &op) = 0;
-  virtual void visit(INode *node, ops::Conv2DOp &op) = 0;
-  virtual void visit(INode *node, ops::DepthwiseConv2DOp &op) = 0;
-  virtual void visit(INode *node, ops::SoftmaxOp &op) = 0;
-  virtual void visit(INode *node, ops::PoolOp &op) = 0;
-  virtual void visit(INode *node, ops::FullyConnectedOp &op) = 0;
-  virtual void visit(INode *node, ops::CappedReluOp &op) = 0;
-  virtual void visit(INode *node, ops::BiasAddOp &op) = 0;
-  virtual void visit(INode *node, ops::VariableOp &op) = 0;
-  virtual void visit(INode *node, ops::ReluOp &op) = 0;
-  virtual void visit(INode *node, ops::ReshapeOp &op) = 0;
-  virtual void visit(INode *node, ops::ScaleOp &op) = 0;
-  virtual void visit(INode *node, ops::BatchNormOp &op) = 0;
-  virtual void visit(INode *node, ops::DropoutOp &op) = 0;
-  virtual void visit(INode *node, ops::TanhOp &op) = 0;
-  virtual void visit(INode *node, ops::ElementwiseOp &op) = 0;
-  virtual void visit(INode *node, ops::DeConv2DOp &op) = 0;
-  virtual void visit(INode *node, ops::EluOp &op) = 0;
+  virtual void visit(INode* node, ops::ConcatOp& op) = 0;
+  virtual void visit(INode* node, ops::Conv2DOp& op) = 0;
+  virtual void visit(INode* node, ops::DepthwiseConv2DOp& op) = 0;
+  virtual void visit(INode* node, ops::SoftmaxOp& op) = 0;
+  virtual void visit(INode* node, ops::PoolOp& op) = 0;
+  virtual void visit(INode* node, ops::FullyConnectedOp& op) = 0;
+  virtual void visit(INode* node, ops::CappedReluOp& op) = 0;
+  virtual void visit(INode* node, ops::BiasAddOp& op) = 0;
+  virtual void visit(INode* node, ops::VariableOp& op) = 0;
+  virtual void visit(INode* node, ops::ReluOp& op) = 0;
+  virtual void visit(INode* node, ops::ReshapeOp& op) = 0;
+  virtual void visit(INode* node, ops::ScaleOp& op) = 0;
+  virtual void visit(INode* node, ops::BatchNormOp& op) = 0;
+  virtual void visit(INode* node, ops::DropoutOp& op) = 0;
+  virtual void visit(INode* node, ops::TanhOp& op) = 0;
+  virtual void visit(INode* node, ops::ElementwiseOp& op) = 0;
+  virtual void visit(INode* node, ops::DeConv2DOp& op) = 0;
+  virtual void visit(INode* node, ops::EluOp& op) = 0;
 
   virtual ~IVisitor() = default;
 };
@@ -81,24 +81,24 @@ class IVisitor {
  */
 class Visitor: public IVisitor{
 public:
-    void visit(INode *node, ops::ConcatOp &op) override;
-    void visit(INode *node, ops::Conv2DOp &op) override;
-    void visit(INode *node, ops::DepthwiseConv2DOp &op) override;
-    void visit(INode *node, ops::SoftmaxOp &op) override;
-    void visit(INode *node, ops::PoolOp &op) override;
-    void visit(INode *node, ops::FullyConnectedOp &op) override;
-    void visit(INode *node, ops::CappedReluOp &op) override;
-    void visit(INode *node, ops::BiasAddOp &op) override;
-    void visit(INode *node, ops::VariableOp &op) override;
-    void visit(INode *node, ops::ReluOp &op) override;
-    void visit(INode *node, ops::ReshapeOp &op) override;
-    void visit(INode *node, ops::ScaleOp &op) override;
-    void visit(INode *node, ops::BatchNormOp &op) override;
-    void visit(INode *node, ops::DropoutOp &op) override;
-    void visit(INode *node, ops::TanhOp &op) override;
-    void visit(INode *node, ops::ElementwiseOp &op) override;
-    void visit(INode *node, ops::DeConv2DOp &op) override;
-    void visit(INode *node, ops::EluOp &op) override;
+    void visit(INode* node, ops::ConcatOp& op) override;
+    void visit(INode* node, ops::Conv2DOp& op) override;
+    void visit(INode* node, ops::DepthwiseConv2DOp& op) override;
+    void visit(INode* node, ops::SoftmaxOp& op) override;
+    void visit(INode* node, ops::PoolOp& op) override;
+    void visit(INode* node, ops::FullyConnectedOp& op) override;
+    void visit(INode* node, ops::CappedReluOp& op) override;
+    void visit(INode* node, ops::BiasAddOp& op) override;
+    void visit(INode* node, ops::VariableOp& op) override;
+    void visit(INode* node, ops::ReluOp& op) override;
+    void visit(INode* node, ops::ReshapeOp& op) override;
+    void visit(INode* node, ops::ScaleOp& op) override;
+    void visit(INode* node, ops::BatchNormOp& op) override;
+    void visit(INode* node, ops::DropoutOp& op) override;
+    void visit(INode* node, ops::TanhOp& op) override;
+    void visit(INode* node, ops::ElementwiseOp& op) override;
+    void visit(INode* node, ops::DeConv2DOp& op) override;
+    void visit(INode* node, ops::EluOp& op) override;
 
     ~Visitor() override = default;
 

diff --git a/contrib/nnc/include/passes/acl_soft_backend/AclCppOpGenerator.h b/contrib/nnc/include/passes/acl_soft_backend/AclCppOpGenerator.h
index bc132a0..c75b681 100644 (file)
--- a/contrib/nnc/include/passes/acl_soft_backend/AclCppOpGenerator.h
+++ b/contrib/nnc/include/passes/acl_soft_backend/AclCppOpGenerator.h
@@ -17,7 +17,7 @@
 #ifndef _NNC_ACL_CPP_OP_GENERATOR_H_
 #define _NNC_ACL_CPP_OP_GENERATOR_H_
 
-#include "core/modelIR/visitor.h"
+#include "core/modelIR/Visitor.h"
 #include "core/modelIR/TensorVariant.h"
 #include "core/modelIR/operations/operation.h"
 #include "core/modelIR/graph.h"
@@ -64,6 +64,8 @@ public:
   void visit(mir::INode* node, mir::ops::DropoutOp& op) override;
   void visit(mir::INode* node, mir::ops::TanhOp& op) override;
   void visit(mir::INode* node, mir::ops::ElementwiseOp& op) override;
+  void visit(mir::INode* node, mir::ops::DeConv2DOp& op) override;
+  void visit(mir::INode* node, mir::ops::EluOp& op) override;
 
 private:
   using AF = ArtifactFactory;

diff --git a/contrib/nnc/passes/acl_soft_backend/AclCppOpGenerator.cpp b/contrib/nnc/passes/acl_soft_backend/AclCppOpGenerator.cpp
index 4a6dc23..84dc2ee 100644 (file)
--- a/contrib/nnc/passes/acl_soft_backend/AclCppOpGenerator.cpp
+++ b/contrib/nnc/passes/acl_soft_backend/AclCppOpGenerator.cpp
@@ -142,6 +142,12 @@ void AclCppOpGenerator::visit(INode* node, ops::TanhOp& op) {
 void AclCppOpGenerator::visit(INode* node, ops::ElementwiseOp& op) {
 }
 
+void AclCppOpGenerator::visit(INode* node, ops::DeConv2DOp& op) {
+}
+
+void AclCppOpGenerator::visit(INode* node, ops::EluOp& op) {
+}
+
 string AclCppOpGenerator::tensorName(INode* node) const {
   string tensor_name;