From c36657c7a5c401ec1d9cc3adffc35bfb651434f3 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Vladimir=20Plazun/AI=20Tools=20Lab=20/SRR/Engineer/?= =?utf8?q?=EC=82=BC=EC=84=B1=EC=A0=84=EC=9E=90?= Date: Tue, 10 Jul 2018 13:55:38 +0300 Subject: [PATCH] Fix IrNode to actually call visitor->visit() (#574) Previously disabled due to missing visitor operation acceptors Signed-off-by: Vladimir Plazun --- .../nnc/libs/core/include/nnc/core/IR/model/graph/ir_node.h | 3 +-- .../nnc/libs/core/src/core/IR/model/graph/ir_node.test.cpp | 12 +++--------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/contrib/nnc/libs/core/include/nnc/core/IR/model/graph/ir_node.h b/contrib/nnc/libs/core/include/nnc/core/IR/model/graph/ir_node.h index 33760c4..b9e3a47 100644 --- a/contrib/nnc/libs/core/include/nnc/core/IR/model/graph/ir_node.h +++ b/contrib/nnc/libs/core/include/nnc/core/IR/model/graph/ir_node.h @@ -112,8 +112,7 @@ public: void accept(Visitor *v) override { - //TODO: enable this when at least one Visitor operation declared - // v->visit(this, *static_cast(_props.op)); + v->visit(this, *static_cast(_props.op)); } ~Node() override { diff --git a/contrib/nnc/libs/core/src/core/IR/model/graph/ir_node.test.cpp b/contrib/nnc/libs/core/src/core/IR/model/graph/ir_node.test.cpp index cd0f857..ec52cd5 100644 --- a/contrib/nnc/libs/core/src/core/IR/model/graph/ir_node.test.cpp +++ b/contrib/nnc/libs/core/src/core/IR/model/graph/ir_node.test.cpp @@ -1,21 +1,15 @@ #include "nnc/core/IR/model/operations/operation.h" +#include "nnc/core/IR/model/operations/reshape_op.h" #include "nnc/core/IR/model/graph/ir_node.h" #include "nncc/core/ADT/feature/Shape.h" - #include - -class DummyOperation : public nncc::contrib::core::IR::model::OpDescription { - public: - DummyOperation() : OpDescription(1, 1) {} -}; - TEST(IRNode, ConnectionTest) { using namespace nncc::contrib::core::IR::model; - auto node1 = Node::createNode("node1", 0); - auto node2 = Node::createNode("node2", 1); + auto node1 = Node::createNode("node1", 0); + auto node2 = Node::createNode("node2", 1); node2->connectInputTo(0, node1->getOutput(0)); -- 2.7.4