summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author이한종/On-Device Lab(SR)/Engineer/삼성전자 <hanjoung.lee@samsung.com>2019-04-17 06:16:19 (GMT)
committer오형석/On-Device Lab(SR)/Staff Engineer/삼성전자 <hseok82.oh@samsung.com>2019-04-17 06:16:19 (GMT)
commitcef66a00b77d1d0183b67d235986a1bd688c0702 (patch)
tree446a149bc772eada2ab344a9c5276b78507a009f
parentb3be82384c100a735e7a4231fe899ba663c8edd9 (diff)
downloadnnfw-cef66a00b77d1d0183b67d235986a1bd688c0702.zip
nnfw-cef66a00b77d1d0183b67d235986a1bd688c0702.tar.gz
nnfw-cef66a00b77d1d0183b67d235986a1bd688c0702.tar.bz2
[neurun] Rename operation::Node as Operation (#5013)
This is for reducing namespace operation. Signed-off-by: Hanjoung Lee <hanjoung.lee@samsung.com>
-rw-r--r--runtimes/neurun/core/include/backend/IStageGenerator.h4
-rw-r--r--runtimes/neurun/core/include/graph/Graph.h8
-rw-r--r--runtimes/neurun/core/include/model/Operation.h (renamed from runtimes/neurun/core/include/model/operation/Node.h)25
-rw-r--r--runtimes/neurun/core/include/model/operation/AbsNode.h4
-rw-r--r--runtimes/neurun/core/include/model/operation/AddNode.h4
-rw-r--r--runtimes/neurun/core/include/model/operation/ArgMaxNode.h4
-rw-r--r--runtimes/neurun/core/include/model/operation/AvgPool2DNode.h4
-rw-r--r--runtimes/neurun/core/include/model/operation/CastNode.h4
-rw-r--r--runtimes/neurun/core/include/model/operation/ComparisonNode.h4
-rw-r--r--runtimes/neurun/core/include/model/operation/ConcatNode.h4
-rw-r--r--runtimes/neurun/core/include/model/operation/Conv2DNode.h4
-rw-r--r--runtimes/neurun/core/include/model/operation/DepthToSpaceNode.h4
-rw-r--r--runtimes/neurun/core/include/model/operation/DepthwiseConv2DNode.h4
-rw-r--r--runtimes/neurun/core/include/model/operation/DequantizeNode.h4
-rw-r--r--runtimes/neurun/core/include/model/operation/DivNode.h4
-rw-r--r--runtimes/neurun/core/include/model/operation/EmbeddingLookupNode.h4
-rw-r--r--runtimes/neurun/core/include/model/operation/ExpNode.h4
-rw-r--r--runtimes/neurun/core/include/model/operation/FloorNode.h4
-rw-r--r--runtimes/neurun/core/include/model/operation/FullyConnectedNode.h4
-rw-r--r--runtimes/neurun/core/include/model/operation/GatherNode.h4
-rw-r--r--runtimes/neurun/core/include/model/operation/HashtableLookupNode.h4
-rw-r--r--runtimes/neurun/core/include/model/operation/L2NormalizationNode.h4
-rw-r--r--runtimes/neurun/core/include/model/operation/L2Pool2DNode.h4
-rw-r--r--runtimes/neurun/core/include/model/operation/LocalResponseNormalizationNode.h4
-rw-r--r--runtimes/neurun/core/include/model/operation/LogicalAndNode.h4
-rw-r--r--runtimes/neurun/core/include/model/operation/LogicalNotNode.h4
-rw-r--r--runtimes/neurun/core/include/model/operation/LogicalOrNode.h4
-rw-r--r--runtimes/neurun/core/include/model/operation/LogisticNode.h4
-rw-r--r--runtimes/neurun/core/include/model/operation/MaxPool2DNode.h4
-rw-r--r--runtimes/neurun/core/include/model/operation/MeanNode.h4
-rw-r--r--runtimes/neurun/core/include/model/operation/MulNode.h4
-rw-r--r--runtimes/neurun/core/include/model/operation/NegNode.h4
-rw-r--r--runtimes/neurun/core/include/model/operation/PReLUNode.h4
-rw-r--r--runtimes/neurun/core/include/model/operation/PermuteNode.h4
-rw-r--r--runtimes/neurun/core/include/model/operation/RSQRTNode.h4
-rw-r--r--runtimes/neurun/core/include/model/operation/ReLU1Node.h4
-rw-r--r--runtimes/neurun/core/include/model/operation/ReLU6Node.h4
-rw-r--r--runtimes/neurun/core/include/model/operation/ReLUNode.h4
-rw-r--r--runtimes/neurun/core/include/model/operation/ReduceMaxNode.h6
-rw-r--r--runtimes/neurun/core/include/model/operation/ReduceMinNode.h6
-rw-r--r--runtimes/neurun/core/include/model/operation/ReduceSumNode.h4
-rw-r--r--runtimes/neurun/core/include/model/operation/ReshapeNode.h4
-rw-r--r--runtimes/neurun/core/include/model/operation/ResizeBilinearNode.h4
-rw-r--r--runtimes/neurun/core/include/model/operation/SQRTNode.h4
-rw-r--r--runtimes/neurun/core/include/model/operation/Set.h14
-rw-r--r--runtimes/neurun/core/include/model/operation/SoftmaxNode.h4
-rw-r--r--runtimes/neurun/core/include/model/operation/SpaceToDepthNode.h4
-rw-r--r--runtimes/neurun/core/include/model/operation/SquaredDifferenceNode.h4
-rw-r--r--runtimes/neurun/core/include/model/operation/SqueezeNode.h4
-rw-r--r--runtimes/neurun/core/include/model/operation/StridedSliceNode.h4
-rw-r--r--runtimes/neurun/core/include/model/operation/SubNode.h4
-rw-r--r--runtimes/neurun/core/include/model/operation/Subgraph.h10
-rw-r--r--runtimes/neurun/core/include/model/operation/SubgraphContext.h2
-rw-r--r--runtimes/neurun/core/include/model/operation/TanhNode.h4
-rw-r--r--runtimes/neurun/core/include/model/operation/TopKV2Node.h4
-rw-r--r--runtimes/neurun/core/include/model/operation/TransposeConvNode.h4
-rw-r--r--runtimes/neurun/core/include/model/operation/TransposeNode.h4
-rw-r--r--runtimes/neurun/core/src/compiler/Compiler.cc13
-rw-r--r--runtimes/neurun/core/src/compiler/OperationValidator.h2
-rw-r--r--runtimes/neurun/core/src/compiler/ParamChecker.cc7
-rw-r--r--runtimes/neurun/core/src/compiler/ParamChecker.h2
-rw-r--r--runtimes/neurun/core/src/compiler/SubTensorAnalyzer.h2
-rw-r--r--runtimes/neurun/core/src/dumper/dot/DotBuilder.h4
-rw-r--r--runtimes/neurun/core/src/dumper/dot/DotDumper.cc2
-rw-r--r--runtimes/neurun/core/src/dumper/dot/DotNodeInfo.cc2
-rw-r--r--runtimes/neurun/core/src/dumper/dot/DotNodeInfo.h6
-rw-r--r--runtimes/neurun/core/src/exec/DataflowExecutor.cc3
-rw-r--r--runtimes/neurun/core/src/graph/Graph.cc41
-rw-r--r--runtimes/neurun/core/src/graph/dumper/Dumper.h2
-rw-r--r--runtimes/neurun/core/src/graph/pass/OperationPass.cc4
-rw-r--r--runtimes/neurun/core/src/graph/pass/OperationPass.h4
-rw-r--r--runtimes/neurun/core/src/graph/verifier/Verifier.cc9
-rw-r--r--runtimes/neurun/core/src/linear/Linear.cc2
-rw-r--r--runtimes/neurun/core/src/linear/Linear.h2
-rw-r--r--runtimes/neurun/core/src/model/Operation.cc (renamed from runtimes/neurun/core/src/model/operation/Node.cc)21
-rw-r--r--runtimes/neurun/core/src/model/operation/AbsNode.cc2
-rw-r--r--runtimes/neurun/core/src/model/operation/AddNode.cc2
-rw-r--r--runtimes/neurun/core/src/model/operation/ArgMaxNode.cc2
-rw-r--r--runtimes/neurun/core/src/model/operation/AvgPool2DNode.cc2
-rw-r--r--runtimes/neurun/core/src/model/operation/CastNode.cc2
-rw-r--r--runtimes/neurun/core/src/model/operation/ComparisonNode.cc2
-rw-r--r--runtimes/neurun/core/src/model/operation/ConcatNode.cc2
-rw-r--r--runtimes/neurun/core/src/model/operation/Conv2DNode.cc2
-rw-r--r--runtimes/neurun/core/src/model/operation/DepthToSpaceNode.cc2
-rw-r--r--runtimes/neurun/core/src/model/operation/DepthwiseConv2DNode.cc2
-rw-r--r--runtimes/neurun/core/src/model/operation/DequantizeNode.cc2
-rw-r--r--runtimes/neurun/core/src/model/operation/DivNode.cc2
-rw-r--r--runtimes/neurun/core/src/model/operation/EmbeddingLookupNode.cc2
-rw-r--r--runtimes/neurun/core/src/model/operation/ExpNode.cc2
-rw-r--r--runtimes/neurun/core/src/model/operation/FloorNode.cc2
-rw-r--r--runtimes/neurun/core/src/model/operation/FullyConnectedNode.cc2
-rw-r--r--runtimes/neurun/core/src/model/operation/GatherNode.cc2
-rw-r--r--runtimes/neurun/core/src/model/operation/HashtableLookupNode.cc2
-rw-r--r--runtimes/neurun/core/src/model/operation/L2NormalizationNode.cc2
-rw-r--r--runtimes/neurun/core/src/model/operation/L2Pool2DNode.cc2
-rw-r--r--runtimes/neurun/core/src/model/operation/LocalResponseNormalizationNode.cc2
-rw-r--r--runtimes/neurun/core/src/model/operation/LogicalAndNode.cc2
-rw-r--r--runtimes/neurun/core/src/model/operation/LogicalNotNode.cc2
-rw-r--r--runtimes/neurun/core/src/model/operation/LogicalOrNode.cc2
-rw-r--r--runtimes/neurun/core/src/model/operation/LogisticNode.cc2
-rw-r--r--runtimes/neurun/core/src/model/operation/MaxPool2DNode.cc2
-rw-r--r--runtimes/neurun/core/src/model/operation/MeanNode.cc2
-rw-r--r--runtimes/neurun/core/src/model/operation/MulNode.cc2
-rw-r--r--runtimes/neurun/core/src/model/operation/NegNode.cc2
-rw-r--r--runtimes/neurun/core/src/model/operation/PReLUNode.cc2
-rw-r--r--runtimes/neurun/core/src/model/operation/PermuteNode.cc2
-rw-r--r--runtimes/neurun/core/src/model/operation/RSQRTNode.cc2
-rw-r--r--runtimes/neurun/core/src/model/operation/ReLU1Node.cc2
-rw-r--r--runtimes/neurun/core/src/model/operation/ReLU6Node.cc2
-rw-r--r--runtimes/neurun/core/src/model/operation/ReLUNode.cc2
-rw-r--r--runtimes/neurun/core/src/model/operation/ReduceMaxNode.cc2
-rw-r--r--runtimes/neurun/core/src/model/operation/ReduceMinNode.cc2
-rw-r--r--runtimes/neurun/core/src/model/operation/ReduceSumNode.cc2
-rw-r--r--runtimes/neurun/core/src/model/operation/ReshapeNode.cc2
-rw-r--r--runtimes/neurun/core/src/model/operation/ResizeBilinearNode.cc2
-rw-r--r--runtimes/neurun/core/src/model/operation/SQRTNode.cc2
-rw-r--r--runtimes/neurun/core/src/model/operation/Set.cc10
-rw-r--r--runtimes/neurun/core/src/model/operation/SoftmaxNode.cc2
-rw-r--r--runtimes/neurun/core/src/model/operation/SpaceToDepthNode.cc2
-rw-r--r--runtimes/neurun/core/src/model/operation/SquaredDifferenceNode.cc2
-rw-r--r--runtimes/neurun/core/src/model/operation/SqueezeNode.cc2
-rw-r--r--runtimes/neurun/core/src/model/operation/StridedSliceNode.cc2
-rw-r--r--runtimes/neurun/core/src/model/operation/SubNode.cc2
-rw-r--r--runtimes/neurun/core/src/model/operation/Subgraph.cc2
-rw-r--r--runtimes/neurun/core/src/model/operation/SubgraphContext.cc2
-rw-r--r--runtimes/neurun/core/src/model/operation/TanhNode.cc2
-rw-r--r--runtimes/neurun/core/src/model/operation/TopKV2Node.cc2
-rw-r--r--runtimes/neurun/core/src/model/operation/TransposeConvNode.cc2
-rw-r--r--runtimes/neurun/core/src/model/operation/TransposeNode.cc2
-rw-r--r--runtimes/neurun/frontend/nnapi/wrapper/OperationFactory.cc6
-rw-r--r--runtimes/neurun/frontend/nnapi/wrapper/OperationFactory.h12
-rw-r--r--runtimes/neurun/frontend/nnapi/wrapper/model.cc6
-rw-r--r--runtimes/neurun/test/graph/MockNode.h6
-rw-r--r--runtimes/neurun/test/graph/operation/Set.cc4
-rw-r--r--runtimes/neurun/test/graph/verifier/Verifier.cc2
135 files changed, 276 insertions, 275 deletions
diff --git a/runtimes/neurun/core/include/backend/IStageGenerator.h b/runtimes/neurun/core/include/backend/IStageGenerator.h
index 487a1b7..aca49c8 100644
--- a/runtimes/neurun/core/include/backend/IStageGenerator.h
+++ b/runtimes/neurun/core/include/backend/IStageGenerator.h
@@ -34,7 +34,7 @@ namespace neurun
namespace backend
{
-class IStageGenerator : model::operation::NodeVisitor
+class IStageGenerator : model::NodeVisitor
{
public:
virtual ~IStageGenerator() = default;
@@ -58,7 +58,7 @@ protected:
}
public:
- std::unique_ptr<IStage> generate(const model::operation::Node &node)
+ std::unique_ptr<IStage> generate(const model::Operation &node)
{
// TODO Remove directly dependency for classes not interface
_return = nnfw::cpp14::make_unique<StageSequence>();
diff --git a/runtimes/neurun/core/include/graph/Graph.h b/runtimes/neurun/core/include/graph/Graph.h
index cbf1eca..c4b4ffb 100644
--- a/runtimes/neurun/core/include/graph/Graph.h
+++ b/runtimes/neurun/core/include/graph/Graph.h
@@ -19,7 +19,7 @@
#include <functional>
-#include "model/operation/Node.h"
+#include "model/Operation.h"
#include "model/Model.h"
#include "graph/LowerInfoMap.h"
#include "model/operation/Subgraph.h"
@@ -71,8 +71,8 @@ public:
public:
using GraphRef = typename std::conditional<is_const, const Graph &, Graph &>::type;
using IndexRef = const model::OperationIndex &;
- using NodeRef = typename std::conditional<is_const, const model::operation::Node &,
- model::operation::Node &>::type;
+ using NodeRef =
+ typename std::conditional<is_const, const model::Operation &, model::Operation &>::type;
using IterFn = std::function<void(IndexRef, NodeRef)>;
public:
@@ -115,7 +115,7 @@ public:
public:
model::operand::Index addOperand(const model::operand::Shape &shape,
const model::operand::TypeInfo &type);
- model::OperationIndex addOperation(std::unique_ptr<model::operation::Node> &&node);
+ model::OperationIndex addOperation(std::unique_ptr<model::Operation> &&node);
void setOperandValue(const model::operand::Index &ind,
std::unique_ptr<model::operand::Data> &&data);
void addInput(const model::operand::Index &ind);
diff --git a/runtimes/neurun/core/include/model/operation/Node.h b/runtimes/neurun/core/include/model/Operation.h
index 732bafd..4eaeff8 100644
--- a/runtimes/neurun/core/include/model/operation/Node.h
+++ b/runtimes/neurun/core/include/model/Operation.h
@@ -21,7 +21,7 @@
#include "model/operand/Object.h"
#include "model/operand/IndexSet.h"
-#include "OperandConstraint.h"
+#include "model/operation/OperandConstraint.h"
namespace neurun
{
@@ -40,10 +40,20 @@ namespace model
{
namespace operation
{
-
struct NodeVisitor;
+} // namespace operation
+} // namespace model
+} // namespace neurun
-class Node
+namespace neurun
+{
+namespace model
+{
+
+using NodeVisitor = ::neurun::model::operation::NodeVisitor;
+using OperandConstraint = ::neurun::model::operation::OperandConstraint;
+
+class Operation
{
public:
struct InitParam
@@ -55,10 +65,10 @@ public:
};
public:
- Node(OperandConstraint input_constr, const operand::IndexSet &inputs,
- const operand::IndexSet &outputs);
- Node(OperandConstraint input_constr);
- virtual ~Node();
+ Operation(OperandConstraint input_constr, const operand::IndexSet &inputs,
+ const operand::IndexSet &outputs);
+ Operation(OperandConstraint input_constr);
+ virtual ~Operation();
public:
virtual void accept(NodeVisitor &&) const = 0;
@@ -79,7 +89,6 @@ private:
operand::IndexSet _outputs;
};
-} // namespace operation
} // namespace model
} // namespace neurun
diff --git a/runtimes/neurun/core/include/model/operation/AbsNode.h b/runtimes/neurun/core/include/model/operation/AbsNode.h
index 0282448..66ab618 100644
--- a/runtimes/neurun/core/include/model/operation/AbsNode.h
+++ b/runtimes/neurun/core/include/model/operation/AbsNode.h
@@ -17,7 +17,7 @@
#ifndef __NEURUN_MODEL_OPERATION_ABS_NODE_H__
#define __NEURUN_MODEL_OPERATION_ABS_NODE_H__
-#include "model/operation/Node.h"
+#include "model/Operation.h"
namespace neurun
{
@@ -26,7 +26,7 @@ namespace model
namespace operation
{
-class AbsNode : public model::operation::Node
+class AbsNode : public model::Operation
{
public:
enum Input
diff --git a/runtimes/neurun/core/include/model/operation/AddNode.h b/runtimes/neurun/core/include/model/operation/AddNode.h
index 533f8ff..cedac70 100644
--- a/runtimes/neurun/core/include/model/operation/AddNode.h
+++ b/runtimes/neurun/core/include/model/operation/AddNode.h
@@ -17,7 +17,7 @@
#ifndef __NEURUN_MODEL_OPERATION_ADD_NODE_H__
#define __NEURUN_MODEL_OPERATION_ADD_NODE_H__
-#include "model/operation/Node.h"
+#include "model/Operation.h"
namespace neurun
{
@@ -26,7 +26,7 @@ namespace model
namespace operation
{
-class AddNode : public model::operation::Node
+class AddNode : public model::Operation
{
public:
enum Input
diff --git a/runtimes/neurun/core/include/model/operation/ArgMaxNode.h b/runtimes/neurun/core/include/model/operation/ArgMaxNode.h
index e89321c..3a83ef1 100644
--- a/runtimes/neurun/core/include/model/operation/ArgMaxNode.h
+++ b/runtimes/neurun/core/include/model/operation/ArgMaxNode.h
@@ -17,7 +17,7 @@
#ifndef __NEURUN_MODEL_OPERATION_ARG_MAX_NODE_H__
#define __NEURUN_MODEL_OPERATION_ARG_MAX_NODE_H__
-#include "model/operation/Node.h"
+#include "model/Operation.h"
namespace neurun
{
@@ -26,7 +26,7 @@ namespace model
namespace operation
{
-class ArgMaxNode : public model::operation::Node
+class ArgMaxNode : public model::Operation
{
public:
enum Input
diff --git a/runtimes/neurun/core/include/model/operation/AvgPool2DNode.h b/runtimes/neurun/core/include/model/operation/AvgPool2DNode.h
index 2118ffb..29077ab 100644
--- a/runtimes/neurun/core/include/model/operation/AvgPool2DNode.h
+++ b/runtimes/neurun/core/include/model/operation/AvgPool2DNode.h
@@ -19,7 +19,7 @@
#include <memory>
-#include "model/operation/Node.h"
+#include "model/Operation.h"
namespace neurun
{
@@ -28,7 +28,7 @@ namespace model
namespace operation
{
-class AvgPool2DNode : public model::operation::Node
+class AvgPool2DNode : public model::Operation
{
public:
enum Input
diff --git a/runtimes/neurun/core/include/model/operation/CastNode.h b/runtimes/neurun/core/include/model/operation/CastNode.h
index 56277d2..336119e 100644
--- a/runtimes/neurun/core/include/model/operation/CastNode.h
+++ b/runtimes/neurun/core/include/model/operation/CastNode.h
@@ -17,7 +17,7 @@
#ifndef __NEURUN_MODEL_OPERATION_CAST_NODE_H__
#define __NEURUN_MODEL_OPERATION_CAST_NODE_H__
-#include "model/operation/Node.h"
+#include "model/Operation.h"
namespace neurun
{
@@ -26,7 +26,7 @@ namespace model
namespace operation
{
-class CastNode : public model::operation::Node
+class CastNode : public model::Operation
{
public:
enum Input
diff --git a/runtimes/neurun/core/include/model/operation/ComparisonNode.h b/runtimes/neurun/core/include/model/operation/ComparisonNode.h
index 8778b6c..46d97af 100644
--- a/runtimes/neurun/core/include/model/operation/ComparisonNode.h
+++ b/runtimes/neurun/core/include/model/operation/ComparisonNode.h
@@ -17,7 +17,7 @@
#ifndef __NEURUN_MODEL_OPERATION_COMPARISON_NODE_H__
#define __NEURUN_MODEL_OPERATION_COMPARISON_NODE_H__
-#include "model/operation/Node.h"
+#include "model/Operation.h"
namespace neurun
{
@@ -26,7 +26,7 @@ namespace model
namespace operation
{
-class ComparisonNode : public model::operation::Node
+class ComparisonNode : public model::Operation
{
public:
enum Input
diff --git a/runtimes/neurun/core/include/model/operation/ConcatNode.h b/runtimes/neurun/core/include/model/operation/ConcatNode.h
index 2d87abb..3c8ba7a 100644
--- a/runtimes/neurun/core/include/model/operation/ConcatNode.h
+++ b/runtimes/neurun/core/include/model/operation/ConcatNode.h
@@ -19,7 +19,7 @@
#include <memory>
-#include "model/operation/Node.h"
+#include "model/Operation.h"
namespace neurun
{
@@ -28,7 +28,7 @@ namespace model
namespace operation
{
-class ConcatNode : public model::operation::Node
+class ConcatNode : public model::Operation
{
public:
struct Param
diff --git a/runtimes/neurun/core/include/model/operation/Conv2DNode.h b/runtimes/neurun/core/include/model/operation/Conv2DNode.h
index 3204545..bf6a0a2 100644
--- a/runtimes/neurun/core/include/model/operation/Conv2DNode.h
+++ b/runtimes/neurun/core/include/model/operation/Conv2DNode.h
@@ -19,7 +19,7 @@
#include <memory>
-#include "model/operation/Node.h"
+#include "model/Operation.h"
namespace neurun
{
@@ -28,7 +28,7 @@ namespace model
namespace operation
{
-class Conv2DNode : public model::operation::Node
+class Conv2DNode : public model::Operation
{
public:
enum Input
diff --git a/runtimes/neurun/core/include/model/operation/DepthToSpaceNode.h b/runtimes/neurun/core/include/model/operation/DepthToSpaceNode.h
index bdd5c0c..0427cfd 100644
--- a/runtimes/neurun/core/include/model/operation/DepthToSpaceNode.h
+++ b/runtimes/neurun/core/include/model/operation/DepthToSpaceNode.h
@@ -19,7 +19,7 @@
#include <memory>
-#include "model/operation/Node.h"
+#include "model/Operation.h"
namespace neurun
{
@@ -28,7 +28,7 @@ namespace model
namespace operation
{
-class DepthToSpaceNode : public model::operation::Node
+class DepthToSpaceNode : public model::Operation
{
public:
enum Input
diff --git a/runtimes/neurun/core/include/model/operation/DepthwiseConv2DNode.h b/runtimes/neurun/core/include/model/operation/DepthwiseConv2DNode.h
index ff06352..b2ef8e5 100644
--- a/runtimes/neurun/core/include/model/operation/DepthwiseConv2DNode.h
+++ b/runtimes/neurun/core/include/model/operation/DepthwiseConv2DNode.h
@@ -19,7 +19,7 @@
#include <memory>
-#include "model/operation/Node.h"
+#include "model/Operation.h"
namespace neurun
{
@@ -28,7 +28,7 @@ namespace model
namespace operation
{
-class DepthwiseConv2DNode : public model::operation::Node
+class DepthwiseConv2DNode : public model::Operation
{
public:
enum Input
diff --git a/runtimes/neurun/core/include/model/operation/DequantizeNode.h b/runtimes/neurun/core/include/model/operation/DequantizeNode.h
index 87f3114..47e2d18 100644
--- a/runtimes/neurun/core/include/model/operation/DequantizeNode.h
+++ b/runtimes/neurun/core/include/model/operation/DequantizeNode.h
@@ -17,7 +17,7 @@
#ifndef __NEURUN_MODEL_OPERATION_DEQUANTIZE_NODE_H__
#define __NEURUN_MODEL_OPERATION_DEQUANTIZE_NODE_H__
-#include "model/operation/Node.h"
+#include "model/Operation.h"
namespace neurun
{
@@ -26,7 +26,7 @@ namespace model
namespace operation
{
-class DequantizeNode : public model::operation::Node
+class DequantizeNode : public model::Operation
{
public:
enum Input
diff --git a/runtimes/neurun/core/include/model/operation/DivNode.h b/runtimes/neurun/core/include/model/operation/DivNode.h
index e33b0c7..e63ba23 100644
--- a/runtimes/neurun/core/include/model/operation/DivNode.h
+++ b/runtimes/neurun/core/include/model/operation/DivNode.h
@@ -17,7 +17,7 @@
#ifndef __NEURUN_MODEL_OPERATION_DIV_NODE_H__
#define __NEURUN_MODEL_OPERATION_DIV_NODE_H__
-#include "model/operation/Node.h"
+#include "model/Operation.h"
namespace neurun
{
@@ -26,7 +26,7 @@ namespace model
namespace operation
{
-class DivNode : public model::operation::Node
+class DivNode : public model::Operation
{
public:
enum Input
diff --git a/runtimes/neurun/core/include/model/operation/EmbeddingLookupNode.h b/runtimes/neurun/core/include/model/operation/EmbeddingLookupNode.h
index 3934cfa..b6bbb9c 100644
--- a/runtimes/neurun/core/include/model/operation/EmbeddingLookupNode.h
+++ b/runtimes/neurun/core/include/model/operation/EmbeddingLookupNode.h
@@ -17,7 +17,7 @@
#ifndef __NEURUN_MODEL_OPERATION_EMBEDDING_LOOKUP_NODE_H__
#define __NEURUN_MODEL_OPERATION_EMBEDDING_LOOKUP_NODE_H__
-#include "model/operation/Node.h"
+#include "model/Operation.h"
namespace neurun
{
@@ -26,7 +26,7 @@ namespace model
namespace operation
{
-class EmbeddingLookupNode : public model::operation::Node
+class EmbeddingLookupNode : public model::Operation
{
public:
enum Input
diff --git a/runtimes/neurun/core/include/model/operation/ExpNode.h b/runtimes/neurun/core/include/model/operation/ExpNode.h
index 4217146..d28309e 100644
--- a/runtimes/neurun/core/include/model/operation/ExpNode.h
+++ b/runtimes/neurun/core/include/model/operation/ExpNode.h
@@ -17,7 +17,7 @@
#ifndef __NEURUN_MODEL_OPERATION_EXP_NODE_H__
#define __NEURUN_MODEL_OPERATION_EXP_NODE_H__
-#include "model/operation/Node.h"
+#include "model/Operation.h"
namespace neurun
{
@@ -26,7 +26,7 @@ namespace model
namespace operation
{
-class ExpNode : public model::operation::Node
+class ExpNode : public model::Operation
{
public:
enum Input
diff --git a/runtimes/neurun/core/include/model/operation/FloorNode.h b/runtimes/neurun/core/include/model/operation/FloorNode.h
index 403ea6a..8b4f891 100644
--- a/runtimes/neurun/core/include/model/operation/FloorNode.h
+++ b/runtimes/neurun/core/include/model/operation/FloorNode.h
@@ -19,7 +19,7 @@
#include <memory>
-#include "model/operation/Node.h"
+#include "model/Operation.h"
namespace neurun
{
@@ -28,7 +28,7 @@ namespace model
namespace operation
{
-class FloorNode : public model::operation::Node
+class FloorNode : public model::Operation
{
public:
enum Input
diff --git a/runtimes/neurun/core/include/model/operation/FullyConnectedNode.h b/runtimes/neurun/core/include/model/operation/FullyConnectedNode.h
index 08256e4..2ea91ca 100644
--- a/runtimes/neurun/core/include/model/operation/FullyConnectedNode.h
+++ b/runtimes/neurun/core/include/model/operation/FullyConnectedNode.h
@@ -19,7 +19,7 @@
#include <memory>
-#include "model/operation/Node.h"
+#include "model/Operation.h"
namespace neurun
{
@@ -28,7 +28,7 @@ namespace model
namespace operation
{
-class FullyConnectedNode : public model::operation::Node
+class FullyConnectedNode : public model::Operation
{
public:
enum Input
diff --git a/runtimes/neurun/core/include/model/operation/GatherNode.h b/runtimes/neurun/core/include/model/operation/GatherNode.h
index 711632c..e7e5f8e 100644
--- a/runtimes/neurun/core/include/model/operation/GatherNode.h
+++ b/runtimes/neurun/core/include/model/operation/GatherNode.h
@@ -19,7 +19,7 @@
#include <memory>
-#include "model/operation/Node.h"
+#include "model/Operation.h"
namespace neurun
{
@@ -28,7 +28,7 @@ namespace model
namespace operation
{
-class GatherNode : public model::operation::Node
+class GatherNode : public model::Operation
{
public:
enum Input
diff --git a/runtimes/neurun/core/include/model/operation/HashtableLookupNode.h b/runtimes/neurun/core/include/model/operation/HashtableLookupNode.h
index 8977bff..62436ac 100644
--- a/runtimes/neurun/core/include/model/operation/HashtableLookupNode.h
+++ b/runtimes/neurun/core/include/model/operation/HashtableLookupNode.h
@@ -17,7 +17,7 @@
#ifndef __NEURUN_MODEL_OPERATION_HASHTABLE_LOOKUP_NODE_H__
#define __NEURUN_MODEL_OPERATION_HASHTABLE_LOOKUP_NODE_H__
-#include "model/operation/Node.h"
+#include "model/Operation.h"
namespace neurun
{
@@ -26,7 +26,7 @@ namespace model
namespace operation
{
-class HashtableLookupNode : public model::operation::Node
+class HashtableLookupNode : public model::Operation
{
public:
enum Input
diff --git a/runtimes/neurun/core/include/model/operation/L2NormalizationNode.h b/runtimes/neurun/core/include/model/operation/L2NormalizationNode.h
index 56adf59..08cc706 100644
--- a/runtimes/neurun/core/include/model/operation/L2NormalizationNode.h
+++ b/runtimes/neurun/core/include/model/operation/L2NormalizationNode.h
@@ -17,7 +17,7 @@
#ifndef __NEURUN_MODEL_OPERATION_L2_NORMALIZATION_NODE_H__
#define __NEURUN_MODEL_OPERATION_L2_NORMALIZATION_NODE_H__
-#include "model/operation/Node.h"
+#include "model/Operation.h"
namespace neurun
{
@@ -26,7 +26,7 @@ namespace model
namespace operation
{
-class L2NormalizationNode : public model::operation::Node
+class L2NormalizationNode : public model::Operation
{
public:
enum Input
diff --git a/runtimes/neurun/core/include/model/operation/L2Pool2DNode.h b/runtimes/neurun/core/include/model/operation/L2Pool2DNode.h
index 0dd17c1..96ebe77 100644
--- a/runtimes/neurun/core/include/model/operation/L2Pool2DNode.h
+++ b/runtimes/neurun/core/include/model/operation/L2Pool2DNode.h
@@ -19,7 +19,7 @@
#include <memory>
-#include "model/operation/Node.h"
+#include "model/Operation.h"
namespace neurun
{
@@ -28,7 +28,7 @@ namespace model
namespace operation
{
-class L2Pool2DNode : public model::operation::Node
+class L2Pool2DNode : public model::Operation
{
public:
enum Input
diff --git a/runtimes/neurun/core/include/model/operation/LocalResponseNormalizationNode.h b/runtimes/neurun/core/include/model/operation/LocalResponseNormalizationNode.h
index 2f821cb..274fc5c 100644
--- a/runtimes/neurun/core/include/model/operation/LocalResponseNormalizationNode.h
+++ b/runtimes/neurun/core/include/model/operation/LocalResponseNormalizationNode.h
@@ -19,7 +19,7 @@
#include <memory>
-#include "model/operation/Node.h"
+#include "model/Operation.h"
namespace neurun
{
@@ -28,7 +28,7 @@ namespace model
namespace operation
{
-class LocalResponseNormalizationNode : public model::operation::Node
+class LocalResponseNormalizationNode : public model::Operation
{
public:
enum Input
diff --git a/runtimes/neurun/core/include/model/operation/LogicalAndNode.h b/runtimes/neurun/core/include/model/operation/LogicalAndNode.h
index 39b71c3..45a4c13 100644
--- a/runtimes/neurun/core/include/model/operation/LogicalAndNode.h
+++ b/runtimes/neurun/core/include/model/operation/LogicalAndNode.h
@@ -17,7 +17,7 @@
#ifndef __NEURUN_MODEL_OPERATION_LOGICAL_AND_NODE_H__
#define __NEURUN_MODEL_OPERATION_LOGICAL_AND_NODE_H__
-#include "model/operation/Node.h"
+#include "model/Operation.h"
namespace neurun
{
@@ -26,7 +26,7 @@ namespace model
namespace operation
{
-class LogicalAndNode : public model::operation::Node
+class LogicalAndNode : public model::Operation
{
public:
enum Input
diff --git a/runtimes/neurun/core/include/model/operation/LogicalNotNode.h b/runtimes/neurun/core/include/model/operation/LogicalNotNode.h
index 4d61518..7ea327b 100644
--- a/runtimes/neurun/core/include/model/operation/LogicalNotNode.h
+++ b/runtimes/neurun/core/include/model/operation/LogicalNotNode.h
@@ -17,7 +17,7 @@
#ifndef __NEURUN_MODEL_OPERATION_LOGICAL_NOT_NODE_H__
#define __NEURUN_MODEL_OPERATION_LOGICAL_NOT_NODE_H__
-#include "model/operation/Node.h"
+#include "model/Operation.h"
namespace neurun
{
@@ -26,7 +26,7 @@ namespace model
namespace operation
{
-class LogicalNotNode : public model::operation::Node
+class LogicalNotNode : public model::Operation
{
public:
enum Input
diff --git a/runtimes/neurun/core/include/model/operation/LogicalOrNode.h b/runtimes/neurun/core/include/model/operation/LogicalOrNode.h
index 4b8088e..91bf15b 100644
--- a/runtimes/neurun/core/include/model/operation/LogicalOrNode.h
+++ b/runtimes/neurun/core/include/model/operation/LogicalOrNode.h
@@ -17,7 +17,7 @@
#ifndef __NEURUN_MODEL_OPERATION_LOGICAL_OR_NODE_H__
#define __NEURUN_MODEL_OPERATION_LOGICAL_OR_NODE_H__
-#include "model/operation/Node.h"
+#include "model/Operation.h"
namespace neurun
{
@@ -26,7 +26,7 @@ namespace model
namespace operation
{
-class LogicalOrNode : public model::operation::Node
+class LogicalOrNode : public model::Operation
{
public:
enum Input
diff --git a/runtimes/neurun/core/include/model/operation/LogisticNode.h b/runtimes/neurun/core/include/model/operation/LogisticNode.h
index 4a86199..ad8992f 100644
--- a/runtimes/neurun/core/include/model/operation/LogisticNode.h
+++ b/runtimes/neurun/core/include/model/operation/LogisticNode.h
@@ -17,7 +17,7 @@
#ifndef __NEURUN_MODEL_OPERATION_LOGISTIC_NODE_H__
#define __NEURUN_MODEL_OPERATION_LOGISTIC_NODE_H__
-#include "model/operation/Node.h"
+#include "model/Operation.h"
namespace neurun
{
@@ -26,7 +26,7 @@ namespace model
namespace operation
{
-class LogisticNode : public model::operation::Node
+class LogisticNode : public model::Operation
{
public:
enum Input
diff --git a/runtimes/neurun/core/include/model/operation/MaxPool2DNode.h b/runtimes/neurun/core/include/model/operation/MaxPool2DNode.h
index 3841abb..ef859e9 100644
--- a/runtimes/neurun/core/include/model/operation/MaxPool2DNode.h
+++ b/runtimes/neurun/core/include/model/operation/MaxPool2DNode.h
@@ -19,7 +19,7 @@
#include <memory>
-#include "model/operation/Node.h"
+#include "model/Operation.h"
namespace neurun
{
@@ -28,7 +28,7 @@ namespace model
namespace operation
{
-class MaxPool2DNode : public model::operation::Node
+class MaxPool2DNode : public model::Operation
{
public:
enum Input
diff --git a/runtimes/neurun/core/include/model/operation/MeanNode.h b/runtimes/neurun/core/include/model/operation/MeanNode.h
index 3c9368f..6d1c846 100644
--- a/runtimes/neurun/core/include/model/operation/MeanNode.h
+++ b/runtimes/neurun/core/include/model/operation/MeanNode.h
@@ -17,7 +17,7 @@
#ifndef __NEURUN_MODEL_OPERATION_MEAN_NODE_H__
#define __NEURUN_MODEL_OPERATION_MEAN_NODE_H__
-#include "model/operation/Node.h"
+#include "model/Operation.h"
namespace neurun
{
@@ -26,7 +26,7 @@ namespace model
namespace operation
{
-class MeanNode : public model::operation::Node
+class MeanNode : public model::Operation
{
public:
enum Input
diff --git a/runtimes/neurun/core/include/model/operation/MulNode.h b/runtimes/neurun/core/include/model/operation/MulNode.h
index 2092138..ef73e39 100644
--- a/runtimes/neurun/core/include/model/operation/MulNode.h
+++ b/runtimes/neurun/core/include/model/operation/MulNode.h
@@ -17,7 +17,7 @@
#ifndef __NEURUN_MODEL_OPERATION_MUL_NODE_H__
#define __NEURUN_MODEL_OPERATION_MUL_NODE_H__
-#include "model/operation/Node.h"
+#include "model/Operation.h"
namespace neurun
{
@@ -26,7 +26,7 @@ namespace model
namespace operation
{
-class MulNode : public model::operation::Node
+class MulNode : public model::Operation
{
public:
enum Input
diff --git a/runtimes/neurun/core/include/model/operation/NegNode.h b/runtimes/neurun/core/include/model/operation/NegNode.h
index bea2309..73a04a2 100644
--- a/runtimes/neurun/core/include/model/operation/NegNode.h
+++ b/runtimes/neurun/core/include/model/operation/NegNode.h
@@ -17,7 +17,7 @@
#ifndef __NEURUN_MODEL_OPERATION_NEG_NODE_H__
#define __NEURUN_MODEL_OPERATION_NEG_NODE_H__
-#include "model/operation/Node.h"
+#include "model/Operation.h"
namespace neurun
{
@@ -26,7 +26,7 @@ namespace model
namespace operation
{
-class NegNode : public model::operation::Node
+class NegNode : public model::Operation
{
public:
enum Input
diff --git a/runtimes/neurun/core/include/model/operation/PReLUNode.h b/runtimes/neurun/core/include/model/operation/PReLUNode.h
index c07c45b..259d026 100644
--- a/runtimes/neurun/core/include/model/operation/PReLUNode.h
+++ b/runtimes/neurun/core/include/model/operation/PReLUNode.h
@@ -17,7 +17,7 @@
#ifndef __NEURUN_MODEL_OPERATION_PRELU_NODE_H__
#define __NEURUN_MODEL_OPERATION_PRELU_NODE_H__
-#include "model/operation/Node.h"
+#include "model/Operation.h"
namespace neurun
{
@@ -26,7 +26,7 @@ namespace model
namespace operation
{
-class PReLUNode : public model::operation::Node
+class PReLUNode : public model::Operation
{
public:
enum Input
diff --git a/runtimes/neurun/core/include/model/operation/PermuteNode.h b/runtimes/neurun/core/include/model/operation/PermuteNode.h
index dffd2c1..81803a4 100644
--- a/runtimes/neurun/core/include/model/operation/PermuteNode.h
+++ b/runtimes/neurun/core/include/model/operation/PermuteNode.h
@@ -17,7 +17,7 @@
#ifndef __NEURUN_MODEL_OPERATION_PERMUTE_NODE_H__
#define __NEURUN_MODEL_OPERATION_PERMUTE_NODE_H__
-#include "model/operation/Node.h"
+#include "model/Operation.h"
namespace neurun
{
@@ -34,7 +34,7 @@ namespace model
namespace operation
{
-class PermuteNode : public model::operation::Node
+class PermuteNode : public model::Operation
{
public:
enum class Type
diff --git a/runtimes/neurun/core/include/model/operation/RSQRTNode.h b/runtimes/neurun/core/include/model/operation/RSQRTNode.h
index a75e591..d8a2367 100644
--- a/runtimes/neurun/core/include/model/operation/RSQRTNode.h
+++ b/runtimes/neurun/core/include/model/operation/RSQRTNode.h
@@ -17,7 +17,7 @@
#ifndef __NEURUN_MODEL_OPERATION_RSQRT_NODE_H__
#define __NEURUN_MODEL_OPERATION_RSQRT_NODE_H__
-#include "model/operation/Node.h"
+#include "model/Operation.h"
namespace neurun
{
@@ -26,7 +26,7 @@ namespace model
namespace operation
{
-class RSQRTNode : public model::operation::Node
+class RSQRTNode : public model::Operation
{
public:
enum Input
diff --git a/runtimes/neurun/core/include/model/operation/ReLU1Node.h b/runtimes/neurun/core/include/model/operation/ReLU1Node.h
index 5697c9f..e075a64 100644
--- a/runtimes/neurun/core/include/model/operation/ReLU1Node.h
+++ b/runtimes/neurun/core/include/model/operation/ReLU1Node.h
@@ -17,7 +17,7 @@
#ifndef __NEURUN_MODEL_OPERATION_ReLU1_NODE_H__
#define __NEURUN_MODEL_OPERATION_ReLU1_NODE_H__
-#include "model/operation/Node.h"
+#include "model/Operation.h"
namespace neurun
{
@@ -26,7 +26,7 @@ namespace model
namespace operation
{
-class ReLU1Node : public model::operation::Node
+class ReLU1Node : public model::Operation
{
public:
enum Input
diff --git a/runtimes/neurun/core/include/model/operation/ReLU6Node.h b/runtimes/neurun/core/include/model/operation/ReLU6Node.h
index 69ebff3..3074668 100644
--- a/runtimes/neurun/core/include/model/operation/ReLU6Node.h
+++ b/runtimes/neurun/core/include/model/operation/ReLU6Node.h
@@ -17,7 +17,7 @@
#ifndef __NEURUN_MODEL_OPERATION_ReLU6_NODE_H__
#define __NEURUN_MODEL_OPERATION_ReLU6_NODE_H__
-#include "model/operation/Node.h"
+#include "model/Operation.h"
namespace neurun
{
@@ -26,7 +26,7 @@ namespace model
namespace operation
{
-class ReLU6Node : public model::operation::Node
+class ReLU6Node : public model::Operation
{
public:
enum Input
diff --git a/runtimes/neurun/core/include/model/operation/ReLUNode.h b/runtimes/neurun/core/include/model/operation/ReLUNode.h
index ce45855..d11d7ea 100644
--- a/runtimes/neurun/core/include/model/operation/ReLUNode.h
+++ b/runtimes/neurun/core/include/model/operation/ReLUNode.h
@@ -17,7 +17,7 @@
#ifndef __NEURUN_MODEL_OPERATION_RELU_NODE_H__
#define __NEURUN_MODEL_OPERATION_RELU_NODE_H__
-#include "model/operation/Node.h"
+#include "model/Operation.h"
namespace neurun
{
@@ -26,7 +26,7 @@ namespace model
namespace operation
{
-class ReLUNode : public model::operation::Node
+class ReLUNode : public model::Operation
{
public:
enum Input
diff --git a/runtimes/neurun/core/include/model/operation/ReduceMaxNode.h b/runtimes/neurun/core/include/model/operation/ReduceMaxNode.h
index c7f51b4..950cb46 100644
--- a/runtimes/neurun/core/include/model/operation/ReduceMaxNode.h
+++ b/runtimes/neurun/core/include/model/operation/ReduceMaxNode.h
@@ -19,7 +19,7 @@
#include <memory>
-#include "model/operation/Node.h"
+#include "model/Operation.h"
namespace neurun
{
@@ -28,10 +28,10 @@ namespace model
namespace operation
{
-class ReduceMaxNode : public model::operation::Node
+class ReduceMaxNode : public model::Operation
{
public:
- ReduceMaxNode(const model::operation::Node::InitParam &init_param);
+ ReduceMaxNode(const model::Operation::InitParam &init_param);
enum Input
{
INPUT = 0
diff --git a/runtimes/neurun/core/include/model/operation/ReduceMinNode.h b/runtimes/neurun/core/include/model/operation/ReduceMinNode.h
index 4bb561c..2ec3540 100644
--- a/runtimes/neurun/core/include/model/operation/ReduceMinNode.h
+++ b/runtimes/neurun/core/include/model/operation/ReduceMinNode.h
@@ -19,7 +19,7 @@
#include <memory>
-#include "model/operation/Node.h"
+#include "model/Operation.h"
namespace neurun
{
@@ -28,10 +28,10 @@ namespace model
namespace operation
{
-class ReduceMinNode : public model::operation::Node
+class ReduceMinNode : public model::Operation
{
public:
- ReduceMinNode(const model::operation::Node::InitParam &init_param);
+ ReduceMinNode(const model::Operation::InitParam &init_param);
enum Input
{
INPUT = 0
diff --git a/runtimes/neurun/core/include/model/operation/ReduceSumNode.h b/runtimes/neurun/core/include/model/operation/ReduceSumNode.h
index 2ae108d..e953caa 100644
--- a/runtimes/neurun/core/include/model/operation/ReduceSumNode.h
+++ b/runtimes/neurun/core/include/model/operation/ReduceSumNode.h
@@ -17,7 +17,7 @@
#ifndef __NEURUN_MODEL_OPERATION_REDUCE_SUM_NODE_H__
#define __NEURUN_MODEL_OPERATION_REDUCE_SUM_NODE_H__
-#include "model/operation/Node.h"
+#include "model/Operation.h"
namespace neurun
{
@@ -26,7 +26,7 @@ namespace model
namespace operation
{
-class ReduceSumNode : public model::operation::Node
+class ReduceSumNode : public model::Operation
{
public:
enum Input
diff --git a/runtimes/neurun/core/include/model/operation/ReshapeNode.h b/runtimes/neurun/core/include/model/operation/ReshapeNode.h
index b49edbb..9e28c77 100644
--- a/runtimes/neurun/core/include/model/operation/ReshapeNode.h
+++ b/runtimes/neurun/core/include/model/operation/ReshapeNode.h
@@ -19,7 +19,7 @@
#include <memory>
-#include "model/operation/Node.h"
+#include "model/Operation.h"
namespace neurun
{
@@ -28,7 +28,7 @@ namespace model
namespace operation
{
-class ReshapeNode : public model::operation::Node
+class ReshapeNode : public model::Operation
{
public:
enum Input
diff --git a/runtimes/neurun/core/include/model/operation/ResizeBilinearNode.h b/runtimes/neurun/core/include/model/operation/ResizeBilinearNode.h
index f29adb2..3284572 100644
--- a/runtimes/neurun/core/include/model/operation/ResizeBilinearNode.h
+++ b/runtimes/neurun/core/include/model/operation/ResizeBilinearNode.h
@@ -19,7 +19,7 @@
#include <memory>
-#include "model/operation/Node.h"
+#include "model/Operation.h"
namespace neurun
{
@@ -28,7 +28,7 @@ namespace model
namespace operation
{
-class ResizeBilinearNode : public model::operation::Node
+class ResizeBilinearNode : public model::Operation
{
public:
enum Input
diff --git a/runtimes/neurun/core/include/model/operation/SQRTNode.h b/runtimes/neurun/core/include/model/operation/SQRTNode.h
index a52e50d..9ae50cf 100644
--- a/runtimes/neurun/core/include/model/operation/SQRTNode.h
+++ b/runtimes/neurun/core/include/model/operation/SQRTNode.h
@@ -17,7 +17,7 @@
#ifndef __NEURUN_MODEL_OPERATION_SQRT_NODE_H__
#define __NEURUN_MODEL_OPERATION_SQRT_NODE_H__
-#include "model/operation/Node.h"
+#include "model/Operation.h"
namespace neurun
{
@@ -26,7 +26,7 @@ namespace model
namespace operation
{
-class SQRTNode : public model::operation::Node
+class SQRTNode : public model::Operation
{
public:
enum Input
diff --git a/runtimes/neurun/core/include/model/operation/Set.h b/runtimes/neurun/core/include/model/operation/Set.h
index ce8839d..7be8466 100644
--- a/runtimes/neurun/core/include/model/operation/Set.h
+++ b/runtimes/neurun/core/include/model/operation/Set.h
@@ -20,7 +20,7 @@
#include <memory>
#include "model/OperationIndex.h"
-#include "Node.h"
+#include "model/Operation.h"
#include <unordered_map>
@@ -37,22 +37,22 @@ public:
Set() : _index_count(0) {}
public:
- OperationIndex append(std::unique_ptr<Node> &&node);
+ OperationIndex append(std::unique_ptr<Operation> &&node);
void remove(const OperationIndex &index) { _nodes.erase(index); };
public:
- const Node &at(const OperationIndex &) const;
- Node &at(const OperationIndex &);
+ const Operation &at(const OperationIndex &) const;
+ Operation &at(const OperationIndex &);
bool exist(const OperationIndex &) const;
uint32_t size() const { return _nodes.size(); }
- void iterate(const std::function<void(const OperationIndex &, const Node &)> &fn) const;
- void iterate(const std::function<void(const OperationIndex &, Node &)> &fn);
+ void iterate(const std::function<void(const OperationIndex &, const Operation &)> &fn) const;
+ void iterate(const std::function<void(const OperationIndex &, Operation &)> &fn);
private:
const OperationIndex generateIndex();
private:
- std::unordered_map<OperationIndex, std::unique_ptr<Node>> _nodes;
+ std::unordered_map<OperationIndex, std::unique_ptr<Operation>> _nodes;
OperationIndex _index_count;
};
diff --git a/runtimes/neurun/core/include/model/operation/SoftmaxNode.h b/runtimes/neurun/core/include/model/operation/SoftmaxNode.h
index 3f30d5b..031a9b3 100644
--- a/runtimes/neurun/core/include/model/operation/SoftmaxNode.h
+++ b/runtimes/neurun/core/include/model/operation/SoftmaxNode.h
@@ -19,7 +19,7 @@
#include <memory>
-#include "model/operation/Node.h"
+#include "model/Operation.h"
namespace neurun
{
@@ -28,7 +28,7 @@ namespace model
namespace operation
{
-class SoftmaxNode : public model::operation::Node
+class SoftmaxNode : public model::Operation
{
public:
enum Input
diff --git a/runtimes/neurun/core/include/model/operation/SpaceToDepthNode.h b/runtimes/neurun/core/include/model/operation/SpaceToDepthNode.h
index e7bcd91..18af69b 100644
--- a/runtimes/neurun/core/include/model/operation/SpaceToDepthNode.h
+++ b/runtimes/neurun/core/include/model/operation/SpaceToDepthNode.h
@@ -19,7 +19,7 @@
#include <memory>
-#include "model/operation/Node.h"
+#include "model/Operation.h"
namespace neurun
{
@@ -28,7 +28,7 @@ namespace model
namespace operation
{
-class SpaceToDepthNode : public model::operation::Node
+class SpaceToDepthNode : public model::Operation
{
public:
enum Input
diff --git a/runtimes/neurun/core/include/model/operation/SquaredDifferenceNode.h b/runtimes/neurun/core/include/model/operation/SquaredDifferenceNode.h
index 4f7fb6a..4265bda 100644
--- a/runtimes/neurun/core/include/model/operation/SquaredDifferenceNode.h
+++ b/runtimes/neurun/core/include/model/operation/SquaredDifferenceNode.h
@@ -17,7 +17,7 @@
#ifndef __NEURUN_MODEL_OPERATION_SQUARED_DIFFERENCE_NODE_H__
#define __NEURUN_MODEL_OPERATION_SQUARED_DIFFERENCE_NODE_H__
-#include "model/operation/Node.h"
+#include "model/Operation.h"
namespace neurun
{
@@ -26,7 +26,7 @@ namespace model
namespace operation
{
-class SquaredDifferenceNode : public model::operation::Node
+class SquaredDifferenceNode : public model::Operation
{
public:
enum Input
diff --git a/runtimes/neurun/core/include/model/operation/SqueezeNode.h b/runtimes/neurun/core/include/model/operation/SqueezeNode.h
index f0abf82..95ad2bd 100644
--- a/runtimes/neurun/core/include/model/operation/SqueezeNode.h
+++ b/runtimes/neurun/core/include/model/operation/SqueezeNode.h
@@ -17,7 +17,7 @@
#ifndef __NEURUN_MODEL_OPERATION_SQUEEZE_NODE_H__
#define __NEURUN_MODEL_OPERATION_SQUEEZE_NODE_H__
-#include "model/operation/Node.h"
+#include "model/Operation.h"
namespace neurun
{
@@ -26,7 +26,7 @@ namespace model
namespace operation
{
-class SqueezeNode : public model::operation::Node
+class SqueezeNode : public model::Operation
{
public:
enum Input
diff --git a/runtimes/neurun/core/include/model/operation/StridedSliceNode.h b/runtimes/neurun/core/include/model/operation/StridedSliceNode.h
index 54eeae5..449b0aa 100644
--- a/runtimes/neurun/core/include/model/operation/StridedSliceNode.h
+++ b/runtimes/neurun/core/include/model/operation/StridedSliceNode.h
@@ -19,7 +19,7 @@
#include <memory>
-#include "model/operation/Node.h"
+#include "model/Operation.h"
namespace neurun
{
@@ -28,7 +28,7 @@ namespace model
namespace operation
{
-class StridedSliceNode : public model::operation::Node
+class StridedSliceNode : public model::Operation
{
public:
enum Input
diff --git a/runtimes/neurun/core/include/model/operation/SubNode.h b/runtimes/neurun/core/include/model/operation/SubNode.h
index 874af0c..c931f95 100644
--- a/runtimes/neurun/core/include/model/operation/SubNode.h
+++ b/runtimes/neurun/core/include/model/operation/SubNode.h
@@ -17,7 +17,7 @@
#ifndef __NEURUN_MODEL_OPERATION_SUB_NODE_H__
#define __NEURUN_MODEL_OPERATION_SUB_NODE_H__
-#include "model/operation/Node.h"
+#include "model/Operation.h"
namespace neurun
{
@@ -26,7 +26,7 @@ namespace model
namespace operation
{
-class SubNode : public model::operation::Node
+class SubNode : public model::Operation
{
public:
enum Input
diff --git a/runtimes/neurun/core/include/model/operation/Subgraph.h b/runtimes/neurun/core/include/model/operation/Subgraph.h
index 15aff96..09c9556 100644
--- a/runtimes/neurun/core/include/model/operation/Subgraph.h
+++ b/runtimes/neurun/core/include/model/operation/Subgraph.h
@@ -22,7 +22,7 @@
#include <memory>
#include "model/OperationIndex.h"
-#include "Node.h"
+#include "model/Operation.h"
namespace neurun
{
@@ -37,15 +37,15 @@ namespace operation
struct Element
{
OperationIndex index;
- const Node *node;
+ const Operation *node;
- Element(const OperationIndex *i, const Node *n) : index{*i}, node{n}
+ Element(const OperationIndex *i, const Operation *n) : index{*i}, node{n}
{
// DO NOTHING
}
};
-class Subgraph : public Node
+class Subgraph : public Operation
{
public:
Subgraph();
@@ -57,7 +57,7 @@ public:
virtual std::string getName(void) const override { return "Subgraph"; }
public:
- void appendOperation(const OperationIndex &index, const Node &node)
+ void appendOperation(const OperationIndex &index, const Operation &node)
{
_operations.emplace_back(&index, &node);
}
diff --git a/runtimes/neurun/core/include/model/operation/SubgraphContext.h b/runtimes/neurun/core/include/model/operation/SubgraphContext.h
index 4a0e0e2..92fbca7 100644
--- a/runtimes/neurun/core/include/model/operation/SubgraphContext.h
+++ b/runtimes/neurun/core/include/model/operation/SubgraphContext.h
@@ -39,7 +39,7 @@ public:
public:
OperationIndex append(std::unique_ptr<Subgraph> &&subg);
- OperationIndex append(const OperationIndex &index, const Node &node);
+ OperationIndex append(const OperationIndex &index, const Operation &node);
void remove(const OperationIndex &index) { _subgs.erase(index); };
public:
diff --git a/runtimes/neurun/core/include/model/operation/TanhNode.h b/runtimes/neurun/core/include/model/operation/TanhNode.h
index 087bb12..8dd8762 100644
--- a/runtimes/neurun/core/include/model/operation/TanhNode.h
+++ b/runtimes/neurun/core/include/model/operation/TanhNode.h
@@ -17,7 +17,7 @@
#ifndef __NEURUN_MODEL_OPERATION_TANH_NODE_H__
#define __NEURUN_MODEL_OPERATION_TANH_NODE_H__
-#include "model/operation/Node.h"
+#include "model/Operation.h"
namespace neurun
{
@@ -26,7 +26,7 @@ namespace model
namespace operation
{
-class TanhNode : public model::operation::Node
+class TanhNode : public model::Operation
{
public:
enum Input
diff --git a/runtimes/neurun/core/include/model/operation/TopKV2Node.h b/runtimes/neurun/core/include/model/operation/TopKV2Node.h
index eb99a51..8551f07 100644
--- a/runtimes/neurun/core/include/model/operation/TopKV2Node.h
+++ b/runtimes/neurun/core/include/model/operation/TopKV2Node.h
@@ -19,7 +19,7 @@
#include <memory>
-#include "model/operation/Node.h"
+#include "model/Operation.h"
namespace neurun
{
@@ -28,7 +28,7 @@ namespace model
namespace operation
{
-class TopKV2Node : public model::operation::Node
+class TopKV2Node : public model::Operation
{
public:
enum Input
diff --git a/runtimes/neurun/core/include/model/operation/TransposeConvNode.h b/runtimes/neurun/core/include/model/operation/TransposeConvNode.h
index efb6bbc..4da89d6 100644
--- a/runtimes/neurun/core/include/model/operation/TransposeConvNode.h
+++ b/runtimes/neurun/core/include/model/operation/TransposeConvNode.h
@@ -19,7 +19,7 @@
#include <memory>
-#include "model/operation/Node.h"
+#include "model/Operation.h"
namespace neurun
{
@@ -28,7 +28,7 @@ namespace model
namespace operation
{
-class TransposeConvNode : public model::operation::Node
+class TransposeConvNode : public model::Operation
{
public:
enum Input
diff --git a/runtimes/neurun/core/include/model/operation/TransposeNode.h b/runtimes/neurun/core/include/model/operation/TransposeNode.h
index 6661568..06bec19 100644
--- a/runtimes/neurun/core/include/model/operation/TransposeNode.h
+++ b/runtimes/neurun/core/include/model/operation/TransposeNode.h
@@ -17,7 +17,7 @@
#ifndef __NEURUN_MODEL_OPERATION_TRANSPOSE_NODE_H__
#define __NEURUN_MODEL_OPERATION_TRANSPOSE_NODE_H__
-#include "model/operation/Node.h"
+#include "model/Operation.h"
#include <utility>
@@ -28,7 +28,7 @@ namespace model
namespace operation
{
-class TransposeNode : public model::operation::Node
+class TransposeNode : public model::Operation
{
public:
enum Input
diff --git a/runtimes/neurun/core/src/compiler/Compiler.cc b/runtimes/neurun/core/src/compiler/Compiler.cc
index 6ab5672..6d3143a 100644
--- a/runtimes/neurun/core/src/compiler/Compiler.cc
+++ b/runtimes/neurun/core/src/compiler/Compiler.cc
@@ -151,14 +151,13 @@ std::shared_ptr<exec::IExecutor> Compiler::createDataflowExecutor(graph::Graph &
auto operand_context = std::make_shared<OperandContext>();
std::unordered_map<model::OperationIndex, std::unique_ptr<backend::IStage>> stages;
- model.operations().iterate(
- [&](const model::OperationIndex &index, const model::operation::Node &node) {
- auto backend = model.getLowerInfo(index)->backend();
+ model.operations().iterate([&](const model::OperationIndex &index, const model::Operation &node) {
+ auto backend = model.getLowerInfo(index)->backend();
- // Generate Stage
- auto stage_gen = backend->stage_gen();
- stages[index] = stage_gen->generate(node);
- });
+ // Generate Stage
+ auto stage_gen = backend->stage_gen();
+ stages[index] = stage_gen->generate(node);
+ });
backend::TensorBuilderSet tensor_builders;
diff --git a/runtimes/neurun/core/src/compiler/OperationValidator.h b/runtimes/neurun/core/src/compiler/OperationValidator.h
index 0194881..f93cc76 100644
--- a/runtimes/neurun/core/src/compiler/OperationValidator.h
+++ b/runtimes/neurun/core/src/compiler/OperationValidator.h
@@ -35,7 +35,7 @@ namespace neurun
namespace compiler
{
-class OperationValidator : public model::operation::NodeVisitor
+class OperationValidator : public model::NodeVisitor
{
public:
OperationValidator(const neurun::model::operand::Set &ctx) : _ctx{ctx} {}
diff --git a/runtimes/neurun/core/src/compiler/ParamChecker.cc b/runtimes/neurun/core/src/compiler/ParamChecker.cc
index b17d35b..28f877d 100644
--- a/runtimes/neurun/core/src/compiler/ParamChecker.cc
+++ b/runtimes/neurun/core/src/compiler/ParamChecker.cc
@@ -27,10 +27,9 @@ using Usage = neurun::model::operand::Usage;
void ParamChecker::operator()()
{
- _model->operations().iterate(
- [&](const model::OperationIndex &, const model::operation::Node &node) {
- node.accept(std::move(*this));
- });
+ _model->operations().iterate([&](const model::OperationIndex &, const model::Operation &node) {
+ node.accept(std::move(*this));
+ });
}
void ParamChecker::visit(const model::operation::AddNode &node)
diff --git a/runtimes/neurun/core/src/compiler/ParamChecker.h b/runtimes/neurun/core/src/compiler/ParamChecker.h
index 449afcb..c3dfd45 100644
--- a/runtimes/neurun/core/src/compiler/ParamChecker.h
+++ b/runtimes/neurun/core/src/compiler/ParamChecker.h
@@ -38,7 +38,7 @@ namespace neurun
namespace compiler
{
-class ParamChecker : public model::operation::NodeVisitor
+class ParamChecker : public model::NodeVisitor
{
public:
/**
diff --git a/runtimes/neurun/core/src/compiler/SubTensorAnalyzer.h b/runtimes/neurun/core/src/compiler/SubTensorAnalyzer.h
index ef4fea0..a6f5224 100644
--- a/runtimes/neurun/core/src/compiler/SubTensorAnalyzer.h
+++ b/runtimes/neurun/core/src/compiler/SubTensorAnalyzer.h
@@ -45,7 +45,7 @@ namespace compiler
/**
* @brief Class to analyze tensor subsumption
*/
-class SubTensorAnalyzer : public model::operation::NodeVisitor
+class SubTensorAnalyzer : public model::NodeVisitor
{
public:
/**
diff --git a/runtimes/neurun/core/src/dumper/dot/DotBuilder.h b/runtimes/neurun/core/src/dumper/dot/DotBuilder.h
index 01781bd..81ba943 100644
--- a/runtimes/neurun/core/src/dumper/dot/DotBuilder.h
+++ b/runtimes/neurun/core/src/dumper/dot/DotBuilder.h
@@ -22,13 +22,13 @@
#include "model/OperationIndex.h"
#include "model/operand/Index.h"
-#include "model/operation/Node.h"
+#include "model/Operation.h"
#include "model/operand/Object.h"
#include "DotNodeInfo.h"
#include "DotOperandInfo.h"
-using Node = neurun::model::operation::Node;
+using Operation = neurun::model::Operation;
using Object = neurun::model::operand::Object;
namespace neurun
diff --git a/runtimes/neurun/core/src/dumper/dot/DotDumper.cc b/runtimes/neurun/core/src/dumper/dot/DotDumper.cc
index d97027d..a590fd6 100644
--- a/runtimes/neurun/core/src/dumper/dot/DotDumper.cc
+++ b/runtimes/neurun/core/src/dumper/dot/DotDumper.cc
@@ -39,7 +39,7 @@ void DotDumper::dumpIfNeeded(const std::string &tag)
auto &operations = _graph.operations();
auto &operands = _graph.operands();
- operations.iterate([&](const model::OperationIndex &index, const model::operation::Node &node) {
+ operations.iterate([&](const model::OperationIndex &index, const model::Operation &node) {
neurun::dumper::dot::DotNodeInfo node_info(_graph, index, node);
for (auto output : node.getOutputs())
diff --git a/runtimes/neurun/core/src/dumper/dot/DotNodeInfo.cc b/runtimes/neurun/core/src/dumper/dot/DotNodeInfo.cc
index 39ad83b..a3228a1 100644
--- a/runtimes/neurun/core/src/dumper/dot/DotNodeInfo.cc
+++ b/runtimes/neurun/core/src/dumper/dot/DotNodeInfo.cc
@@ -36,7 +36,7 @@ const std::string DotNodeInfo::BG_COLORS[8] = {"1", "2", "5", "6", "3", "4", "7"
DotNodeInfo::DotNodeInfo(const neurun::graph::Graph &graph,
const neurun::model::OperationIndex &index,
- const neurun::model::operation::Node &node)
+ const neurun::model::Operation &node)
: _index(index), _node(node), _lower_info(graph.getLowerInfo(index))
{
addBackendLabel();
diff --git a/runtimes/neurun/core/src/dumper/dot/DotNodeInfo.h b/runtimes/neurun/core/src/dumper/dot/DotNodeInfo.h
index c187088..431f6a5 100644
--- a/runtimes/neurun/core/src/dumper/dot/DotNodeInfo.h
+++ b/runtimes/neurun/core/src/dumper/dot/DotNodeInfo.h
@@ -18,7 +18,7 @@
#define __NEURUN_DUMPER_DOT_DOT_NODE_INFO_H__
#include "IDotInfo.h"
-#include "model/operation/Node.h"
+#include "model/Operation.h"
#include "model/OperationIndex.h"
namespace neurun
@@ -45,7 +45,7 @@ public:
public:
DotNodeInfo(const neurun::graph::Graph &graph, const neurun::model::OperationIndex &index,
- const neurun::model::operation::Node &node);
+ const neurun::model::Operation &node);
public:
std::string index_str() const override;
@@ -59,7 +59,7 @@ private:
private:
neurun::model::OperationIndex _index;
- const neurun::model::operation::Node &_node;
+ const neurun::model::Operation &_node;
const neurun::graph::operation::LowerInfo *_lower_info;
std::vector<std::string> _labels;
};
diff --git a/runtimes/neurun/core/src/exec/DataflowExecutor.cc b/runtimes/neurun/core/src/exec/DataflowExecutor.cc
index 6ec3653..92d5a86 100644
--- a/runtimes/neurun/core/src/exec/DataflowExecutor.cc
+++ b/runtimes/neurun/core/src/exec/DataflowExecutor.cc
@@ -56,8 +56,7 @@ DataflowExecutor::DataflowExecutor(const std::shared_ptr<const model::Model> &mo
VERBOSE(DataflowExecutor) << "Constructing Dataflow Executor" << std::endl;
// Create jobs
- _model->operations.iterate([&](const model::OperationIndex &index,
- const model::operation::Node &node) {
+ _model->operations.iterate([&](const model::OperationIndex &index, const model::Operation &node) {
VERBOSE(DataflowExecutor) << "Add a job #" << index.value() << std::endl;
_finished_jobs.emplace_back(nnfw::cpp14::make_unique<Job>(index, _code_map.at(index).get(),
node.getInputs(), node.getOutputs()));
diff --git a/runtimes/neurun/core/src/graph/Graph.cc b/runtimes/neurun/core/src/graph/Graph.cc
index 6c491ad..18e3e9b 100644
--- a/runtimes/neurun/core/src/graph/Graph.cc
+++ b/runtimes/neurun/core/src/graph/Graph.cc
@@ -49,7 +49,7 @@ model::operand::Index Graph::addOperand(const model::operand::Shape &shape,
return _model->operands.append(shape, type);
}
-model::OperationIndex Graph::addOperation(std::unique_ptr<model::operation::Node> &&node)
+model::OperationIndex Graph::addOperation(std::unique_ptr<model::Operation> &&node)
{
assert(isBuildingPhase());
return _model->operations.append(std::move(node));
@@ -110,25 +110,24 @@ void Graph::lower(void)
_backend_resolver = nnfw::cpp14::make_unique<compiler::BackendResolver>(_model->operands);
_lower_info_map = nnfw::cpp14::make_unique<LowerInfoMap>();
- _model->operations.iterate(
- [&](const model::OperationIndex &index, model::operation::Node &node) {
- auto backend = _backend_resolver->getBackend(typeid(node));
+ _model->operations.iterate([&](const model::OperationIndex &index, model::Operation &node) {
+ auto backend = _backend_resolver->getBackend(typeid(node));
- // Operation LowerInfo
- setLowerInfo(index, nnfw::cpp14::make_unique<graph::operation::LowerInfo>(backend));
+ // Operation LowerInfo
+ setLowerInfo(index, nnfw::cpp14::make_unique<graph::operation::LowerInfo>(backend));
- // LowerInfo for in/output operands
- for (auto operand : node.getInputs())
- {
- auto &&lower_info = operands_lower_info.at(operand);
- lower_info->addUseBackend(backend);
- }
- for (auto operand : node.getOutputs())
- {
- auto &&lower_info = operands_lower_info.at(operand);
- lower_info->addDefBackend(backend);
- }
- });
+ // LowerInfo for in/output operands
+ for (auto operand : node.getInputs())
+ {
+ auto &&lower_info = operands_lower_info.at(operand);
+ lower_info->addUseBackend(backend);
+ }
+ for (auto operand : node.getOutputs())
+ {
+ auto &&lower_info = operands_lower_info.at(operand);
+ lower_info->addDefBackend(backend);
+ }
+ });
// NOTE This is desired way to handle model input and outputs however getDefaultBackend() is
// cpu backend dependent for now we cannot use it.
@@ -149,7 +148,7 @@ void Graph::lower(void)
// Add DefBackend constants same as UseBackend
// NOTE This assumes a constant operand is used by only one operation
- _model->operations.iterate([&](const model::OperationIndex &, model::operation::Node &node) {
+ _model->operations.iterate([&](const model::OperationIndex &, model::Operation &node) {
// LowerInfo for input operands
for (auto operand : node.getInputs())
{
@@ -259,7 +258,7 @@ std::unique_ptr<linear::Linear> Graph::linearize(void)
void Graph::initializeUseDef()
{
operations().iterate(
- [&](const model::OperationIndex &index, const model::operation::Node &node) -> void {
+ [&](const model::OperationIndex &index, const model::Operation &node) -> void {
auto outputs = node.getOutputs();
for (auto output : outputs)
{
@@ -355,7 +354,7 @@ void Graph::partition()
{
std::unique_ptr<model::operation::Subgraph> subg = nullptr;
Graph::PostDfsConstIterator().iterate(
- *this, [&](const model::OperationIndex &index, const model::operation::Node &node) {
+ *this, [&](const model::OperationIndex &index, const model::Operation &node) {
if (!subg)
subg = nnfw::cpp14::make_unique<model::operation::Subgraph>();
diff --git a/runtimes/neurun/core/src/graph/dumper/Dumper.h b/runtimes/neurun/core/src/graph/dumper/Dumper.h
index 8c079a1..6cccba9 100644
--- a/runtimes/neurun/core/src/graph/dumper/Dumper.h
+++ b/runtimes/neurun/core/src/graph/dumper/Dumper.h
@@ -26,7 +26,7 @@ namespace graph
namespace dumper
{
-class Dumper : public model::operation::NodeVisitor
+class Dumper : public model::NodeVisitor
{
public:
Dumper() = default;
diff --git a/runtimes/neurun/core/src/graph/pass/OperationPass.cc b/runtimes/neurun/core/src/graph/pass/OperationPass.cc
index 4f83362..8e67098 100644
--- a/runtimes/neurun/core/src/graph/pass/OperationPass.cc
+++ b/runtimes/neurun/core/src/graph/pass/OperationPass.cc
@@ -27,8 +27,8 @@ namespace pass
void OperationPass::run()
{
- _graph.operations().iterate([&](const model::OperationIndex &index,
- model::operation::Node &node) { callback(index, node); });
+ _graph.operations().iterate(
+ [&](const model::OperationIndex &index, model::Operation &node) { callback(index, node); });
}
} // namespace pass
diff --git a/runtimes/neurun/core/src/graph/pass/OperationPass.h b/runtimes/neurun/core/src/graph/pass/OperationPass.h
index 7bce932..d3fae76 100644
--- a/runtimes/neurun/core/src/graph/pass/OperationPass.h
+++ b/runtimes/neurun/core/src/graph/pass/OperationPass.h
@@ -25,7 +25,7 @@
#include "Pass.h"
#include "model/OperationIndex.h"
-#include "model/operation/Node.h"
+#include "model/Operation.h"
namespace neurun
{
@@ -61,7 +61,7 @@ public:
* @param i[in] Index of the operation node
* @param n[in] The operation node
*/
- virtual void callback(const model::OperationIndex &i, model::operation::Node &n) = 0;
+ virtual void callback(const model::OperationIndex &i, model::Operation &n) = 0;
};
} // namespace pass
diff --git a/runtimes/neurun/core/src/graph/verifier/Verifier.cc b/runtimes/neurun/core/src/graph/verifier/Verifier.cc
index e0d05d7..0f630c8 100644
--- a/runtimes/neurun/core/src/graph/verifier/Verifier.cc
+++ b/runtimes/neurun/core/src/graph/verifier/Verifier.cc
@@ -37,14 +37,13 @@ bool DAGChecker::verify(const Graph &graph) const
bool cyclic = false;
std::unordered_map<model::OperationIndex, bool> visited;
- operations.iterate([&](const model::OperationIndex &index, const model::operation::Node &) {
+ operations.iterate([&](const model::OperationIndex &index, const model::Operation &) {
visited[index] = false;
});
std::unordered_map<model::OperationIndex, bool> on_stack = visited; // Copy from visited
- std::function<void(const model::OperationIndex &index, const model::operation::Node &)>
- dfs_recursive =
- [&](const model::OperationIndex &index, const model::operation::Node &node) -> void {
+ std::function<void(const model::OperationIndex &index, const model::Operation &)> dfs_recursive =
+ [&](const model::OperationIndex &index, const model::Operation &node) -> void {
if (on_stack[index])
cyclic = true;
if (visited[index])
@@ -77,7 +76,7 @@ bool EdgeConsistencyChecker::verify(const Graph &graph) const
{
auto &operations = graph.operations();
uint32_t mismatches = 0;
- operations.iterate([&](const model::OperationIndex &index, const model::operation::Node &node) {
+ operations.iterate([&](const model::OperationIndex &index, const model::Operation &node) {
for (auto operand_index : node.getInputs())
{
auto &operand = graph.operands().at(operand_index);
diff --git a/runtimes/neurun/core/src/linear/Linear.cc b/runtimes/neurun/core/src/linear/Linear.cc
index dcf17c2..2ca58a5 100644
--- a/runtimes/neurun/core/src/linear/Linear.cc
+++ b/runtimes/neurun/core/src/linear/Linear.cc
@@ -48,7 +48,7 @@ Linear::Linear(const std::shared_ptr<const model::Model> &model,
}
}
-void Linear::accept(model::operation::NodeVisitor &&visitor) const
+void Linear::accept(model::NodeVisitor &&visitor) const
{
for (const auto &e : _elements)
{
diff --git a/runtimes/neurun/core/src/linear/Linear.h b/runtimes/neurun/core/src/linear/Linear.h
index a682a6f..e00bf72 100644
--- a/runtimes/neurun/core/src/linear/Linear.h
+++ b/runtimes/neurun/core/src/linear/Linear.h
@@ -64,7 +64,7 @@ public:
Linear(const Linear &linear) = delete;
public:
- void accept(model::operation::NodeVisitor &&visitor) const;
+ void accept(model::NodeVisitor &&visitor) const;
// TODO Should not return TensorBuilderSet
backend::TensorBuilderSet planTensors();
diff --git a/runtimes/neurun/core/src/model/operation/Node.cc b/runtimes/neurun/core/src/model/Operation.cc
index 9af2aa4..83d02ad 100644
--- a/runtimes/neurun/core/src/model/operation/Node.cc
+++ b/runtimes/neurun/core/src/model/Operation.cc
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include "model/operation/Node.h"
+#include "model/Operation.h"
#include <cassert>
@@ -24,37 +24,34 @@ namespace neurun
{
namespace model
{
-namespace operation
-{
-Node::Node(OperandConstraint input_constr, const operand::IndexSet &inputs,
- const operand::IndexSet &outputs)
+Operation::Operation(OperandConstraint input_constr, const operand::IndexSet &inputs,
+ const operand::IndexSet &outputs)
: _input_constr{input_constr}, _inputs{inputs}, _outputs{outputs}
{
}
-Node::Node(OperandConstraint input_constr) : _input_constr{input_constr} {}
+Operation::Operation(OperandConstraint input_constr) : _input_constr{input_constr} {}
-Node::~Node() = default;
+Operation::~Operation() = default;
-void Node::setInputs(const operand::IndexSet &indexes)
+void Operation::setInputs(const operand::IndexSet &indexes)
{
assert(_input_constr.check(indexes.size()));
_inputs = indexes;
}
-void Node::setOutputs(const operand::IndexSet &indexes) { _outputs = indexes; }
+void Operation::setOutputs(const operand::IndexSet &indexes) { _outputs = indexes; }
-void Node::replaceInput(const operand::Index &from, const operand::Index &to)
+void Operation::replaceInput(const operand::Index &from, const operand::Index &to)
{
_inputs.replace(from, to);
}
-void Node::replaceOutput(const operand::Index &from, const operand::Index &to)
+void Operation::replaceOutput(const operand::Index &from, const operand::Index &to)
{
_outputs.replace(from, to);
}
-} // namespace operation
} // namespace model
} // namespace neurun
diff --git a/runtimes/neurun/core/src/model/operation/AbsNode.cc b/runtimes/neurun/core/src/model/operation/AbsNode.cc
index 2c46592..6d26fde 100644
--- a/runtimes/neurun/core/src/model/operation/AbsNode.cc
+++ b/runtimes/neurun/core/src/model/operation/AbsNode.cc
@@ -30,7 +30,7 @@ namespace operation
void AbsNode::accept(NodeVisitor &&v) const { v.visit(*this); }
AbsNode::AbsNode(const operand::IndexSet &inputs, const operand::IndexSet &outputs)
- : model::operation::Node{OperandConstraint::createExact(1u), inputs, outputs}
+ : model::Operation{OperandConstraint::createExact(1u), inputs, outputs}
{
}
diff --git a/runtimes/neurun/core/src/model/operation/AddNode.cc b/runtimes/neurun/core/src/model/operation/AddNode.cc
index e66cd3e..b825347 100644
--- a/runtimes/neurun/core/src/model/operation/AddNode.cc
+++ b/runtimes/neurun/core/src/model/operation/AddNode.cc
@@ -31,7 +31,7 @@ void AddNode::accept(NodeVisitor &&v) const { v.visit(*this); }
AddNode::AddNode(const operand::IndexSet &inputs, const operand::IndexSet &outputs,
const Param &param)
- : model::operation::Node{OperandConstraint::createExact(2u), inputs, outputs}, _param{param}
+ : model::Operation{OperandConstraint::createExact(2u), inputs, outputs}, _param{param}
{
}
diff --git a/runtimes/neurun/core/src/model/operation/ArgMaxNode.cc b/runtimes/neurun/core/src/model/operation/ArgMaxNode.cc
index 6d9eac9..88e8452 100644
--- a/runtimes/neurun/core/src/model/operation/ArgMaxNode.cc
+++ b/runtimes/neurun/core/src/model/operation/ArgMaxNode.cc
@@ -31,7 +31,7 @@ void ArgMaxNode::accept(NodeVisitor &&v) const { v.visit(*this); }
ArgMaxNode::ArgMaxNode(const operand::IndexSet &inputs, const operand::IndexSet &outputs,
const Param &param)
- : model::operation::Node{OperandConstraint::createExact(1u), inputs, outputs}, _param{param}
+ : model::Operation{OperandConstraint::createExact(1u), inputs, outputs}, _param{param}
{
}
diff --git a/runtimes/neurun/core/src/model/operation/AvgPool2DNode.cc b/runtimes/neurun/core/src/model/operation/AvgPool2DNode.cc
index 41ae575..78a096c 100644
--- a/runtimes/neurun/core/src/model/operation/AvgPool2DNode.cc
+++ b/runtimes/neurun/core/src/model/operation/AvgPool2DNode.cc
@@ -31,7 +31,7 @@ void AvgPool2DNode::accept(NodeVisitor &&v) const { v.visit(*this); }
AvgPool2DNode::AvgPool2DNode(const operand::IndexSet &inputs, const operand::IndexSet &outputs,
const Param &param)
- : model::operation::Node{OperandConstraint::createExact(1u), inputs, outputs}, _param{param}
+ : model::Operation{OperandConstraint::createExact(1u), inputs, outputs}, _param{param}
{
}
diff --git a/runtimes/neurun/core/src/model/operation/CastNode.cc b/runtimes/neurun/core/src/model/operation/CastNode.cc
index a60ba23..32b363c 100644
--- a/runtimes/neurun/core/src/model/operation/CastNode.cc
+++ b/runtimes/neurun/core/src/model/operation/CastNode.cc
@@ -30,7 +30,7 @@ namespace operation
void CastNode::accept(NodeVisitor &&v) const { v.visit(*this); }
CastNode::CastNode(const operand::IndexSet &inputs, const operand::IndexSet &outputs)
- : model::operation::Node{OperandConstraint::createExact(1u), inputs, outputs}
+ : model::Operation{OperandConstraint::createExact(1u), inputs, outputs}
{
}
diff --git a/runtimes/neurun/core/src/model/operation/ComparisonNode.cc b/runtimes/neurun/core/src/model/operation/ComparisonNode.cc
index 4643ccd..60f9f08 100644
--- a/runtimes/neurun/core/src/model/operation/ComparisonNode.cc
+++ b/runtimes/neurun/core/src/model/operation/ComparisonNode.cc
@@ -31,7 +31,7 @@ void ComparisonNode::accept(NodeVisitor &&v) const { v.visit(*this); }
ComparisonNode::ComparisonNode(const operand::IndexSet &inputs, const operand::IndexSet &outputs,
const Param &param)
- : model::operation::Node{OperandConstraint::createExact(2u), inputs, outputs}, _param{param}
+ : model::Operation{OperandConstraint::createExact(2u), inputs, outputs}, _param{param}
{
}
diff --git a/runtimes/neurun/core/src/model/operation/ConcatNode.cc b/runtimes/neurun/core/src/model/operation/ConcatNode.cc
index bcaf440..8264f98 100644
--- a/runtimes/neurun/core/src/model/operation/ConcatNode.cc
+++ b/runtimes/neurun/core/src/model/operation/ConcatNode.cc
@@ -31,7 +31,7 @@ void ConcatNode::accept(NodeVisitor &&v) const { v.visit(*this); }
ConcatNode::ConcatNode(const operand::IndexSet &inputs, const operand::IndexSet &outputs,
const Param &param)
- : model::operation::Node{OperandConstraint::createAtLeast(1u), inputs, outputs}, _param{param}
+ : model::Operation{OperandConstraint::createAtLeast(1u), inputs, outputs}, _param{param}
{
}
diff --git a/runtimes/neurun/core/src/model/operation/Conv2DNode.cc b/runtimes/neurun/core/src/model/operation/Conv2DNode.cc
index 5f75815..a519d9c 100644
--- a/runtimes/neurun/core/src/model/operation/Conv2DNode.cc
+++ b/runtimes/neurun/core/src/model/operation/Conv2DNode.cc
@@ -31,7 +31,7 @@ void Conv2DNode::accept(NodeVisitor &&v) const { v.visit(*this); }
Conv2DNode::Conv2DNode(const operand::IndexSet &inputs, const operand::IndexSet &outputs,
const Param &param)
- : model::operation::Node{OperandConstraint::createExact(3u), inputs, outputs}, _param{param}
+ : model::Operation{OperandConstraint::createExact(3u), inputs, outputs}, _param{param}
{
}
diff --git a/runtimes/neurun/core/src/model/operation/DepthToSpaceNode.cc b/runtimes/neurun/core/src/model/operation/DepthToSpaceNode.cc
index 1b4c4e8..f314b21 100644
--- a/runtimes/neurun/core/src/model/operation/DepthToSpaceNode.cc
+++ b/runtimes/neurun/core/src/model/operation/DepthToSpaceNode.cc
@@ -31,7 +31,7 @@ void DepthToSpaceNode::accept(NodeVisitor &&v) const { v.visit(*this); }
DepthToSpaceNode::DepthToSpaceNode(const operand::IndexSet &inputs,
const operand::IndexSet &outputs, const Param &param)
- : model::operation::Node{OperandConstraint::createExact(1u), inputs, outputs}, _param{param}
+ : model::Operation{OperandConstraint::createExact(1u), inputs, outputs}, _param{param}
{
}
diff --git a/runtimes/neurun/core/src/model/operation/DepthwiseConv2DNode.cc b/runtimes/neurun/core/src/model/operation/DepthwiseConv2DNode.cc
index a0c062b..6aa7462 100644
--- a/runtimes/neurun/core/src/model/operation/DepthwiseConv2DNode.cc
+++ b/runtimes/neurun/core/src/model/operation/DepthwiseConv2DNode.cc
@@ -31,7 +31,7 @@ void DepthwiseConv2DNode::accept(NodeVisitor &&v) const { v.visit(*this); }
DepthwiseConv2DNode::DepthwiseConv2DNode(const operand::IndexSet &inputs,
const operand::IndexSet &outputs, const Param &param)
- : model::operation::Node{OperandConstraint::createExact(3u), inputs, outputs}, _param{param}
+ : model::Operation{OperandConstraint::createExact(3u), inputs, outputs}, _param{param}
{
}
diff --git a/runtimes/neurun/core/src/model/operation/DequantizeNode.cc b/runtimes/neurun/core/src/model/operation/DequantizeNode.cc
index ac777c5..66d4673 100644
--- a/runtimes/neurun/core/src/model/operation/DequantizeNode.cc
+++ b/runtimes/neurun/core/src/model/operation/DequantizeNode.cc
@@ -30,7 +30,7 @@ namespace operation
void DequantizeNode::accept(NodeVisitor &&v) const { v.visit(*this); }
DequantizeNode::DequantizeNode(const operand::IndexSet &inputs, const operand::IndexSet &outputs)
- : model::operation::Node{OperandConstraint::createExact(1u), inputs, outputs}
+ : model::Operation{OperandConstraint::createExact(1u), inputs, outputs}
{
}
diff --git a/runtimes/neurun/core/src/model/operation/DivNode.cc b/runtimes/neurun/core/src/model/operation/DivNode.cc
index 9078e54..555a9b9 100644
--- a/runtimes/neurun/core/src/model/operation/DivNode.cc
+++ b/runtimes/neurun/core/src/model/operation/DivNode.cc
@@ -31,7 +31,7 @@ void DivNode::accept(NodeVisitor &&v) const { v.visit(*this); }
DivNode::DivNode(const operand::IndexSet &inputs, const operand::IndexSet &outputs,
const Param &param)
- : model::operation::Node{OperandConstraint::createExact(2u), inputs, outputs}, _param{param}
+ : model::Operation{OperandConstraint::createExact(2u), inputs, outputs}, _param{param}
{
}
diff --git a/runtimes/neurun/core/src/model/operation/EmbeddingLookupNode.cc b/runtimes/neurun/core/src/model/operation/EmbeddingLookupNode.cc
index 0c202fa..9d14e53 100644
--- a/runtimes/neurun/core/src/model/operation/EmbeddingLookupNode.cc
+++ b/runtimes/neurun/core/src/model/operation/EmbeddingLookupNode.cc
@@ -31,7 +31,7 @@ void EmbeddingLookupNode::accept(NodeVisitor &&v) const { v.visit(*this); }
EmbeddingLookupNode::EmbeddingLookupNode(const operand::IndexSet &inputs,
const operand::IndexSet &outputs)
- : model::operation::Node{OperandConstraint::createExact(2u), inputs, outputs}
+ : model::Operation{OperandConstraint::createExact(2u), inputs, outputs}
{
}
diff --git a/runtimes/neurun/core/src/model/operation/ExpNode.cc b/runtimes/neurun/core/src/model/operation/ExpNode.cc
index 1386298..f52303c 100644
--- a/runtimes/neurun/core/src/model/operation/ExpNode.cc
+++ b/runtimes/neurun/core/src/model/operation/ExpNode.cc
@@ -30,7 +30,7 @@ namespace operation
void ExpNode::accept(NodeVisitor &&v) const { v.visit(*this); }
ExpNode::ExpNode(const operand::IndexSet &inputs, const operand::IndexSet &outputs)
- : model::operation::Node{OperandConstraint::createExact(1u), inputs, outputs}
+ : model::Operation{OperandConstraint::createExact(1u), inputs, outputs}
{
}
diff --git a/runtimes/neurun/core/src/model/operation/FloorNode.cc b/runtimes/neurun/core/src/model/operation/FloorNode.cc
index 3b315cb..234549b 100644
--- a/runtimes/neurun/core/src/model/operation/FloorNode.cc
+++ b/runtimes/neurun/core/src/model/operation/FloorNode.cc
@@ -30,7 +30,7 @@ namespace operation
void FloorNode::accept(NodeVisitor &&v) const { v.visit(*this); }
FloorNode::FloorNode(const operand::IndexSet &inputs, const operand::IndexSet &outputs)
- : model::operation::Node{OperandConstraint::createExact(1u), inputs, outputs}
+ : model::Operation{OperandConstraint::createExact(1u), inputs, outputs}
{
}
diff --git a/runtimes/neurun/core/src/model/operation/FullyConnectedNode.cc b/runtimes/neurun/core/src/model/operation/FullyConnectedNode.cc
index 9304358..5faaae0 100644
--- a/runtimes/neurun/core/src/model/operation/FullyConnectedNode.cc
+++ b/runtimes/neurun/core/src/model/operation/FullyConnectedNode.cc
@@ -31,7 +31,7 @@ void FullyConnectedNode::accept(NodeVisitor &&v) const { v.visit(*this); }
FullyConnectedNode::FullyConnectedNode(const operand::IndexSet &inputs,
const operand::IndexSet &outputs, const Param &param)
- : model::operation::Node{OperandConstraint::createExact(3u), inputs, outputs}, _param{param}
+ : model::Operation{OperandConstraint::createExact(3u), inputs, outputs}, _param{param}
{
}
diff --git a/runtimes/neurun/core/src/model/operation/GatherNode.cc b/runtimes/neurun/core/src/model/operation/GatherNode.cc
index bb1f542..e58119d 100644
--- a/runtimes/neurun/core/src/model/operation/GatherNode.cc
+++ b/runtimes/neurun/core/src/model/operation/GatherNode.cc
@@ -31,7 +31,7 @@ void GatherNode::accept(NodeVisitor &&v) const { v.visit(*this); }
GatherNode::GatherNode(const operand::IndexSet &inputs, const operand::IndexSet &outputs,
const Param &param)
- : model::operation::Node{OperandConstraint::createExact(2u), inputs, outputs}, _param{param}
+ : model::Operation{OperandConstraint::createExact(2u), inputs, outputs}, _param{param}
{
}
diff --git a/runtimes/neurun/core/src/model/operation/HashtableLookupNode.cc b/runtimes/neurun/core/src/model/operation/HashtableLookupNode.cc
index 845cc66..060ca99 100644
--- a/runtimes/neurun/core/src/model/operation/HashtableLookupNode.cc
+++ b/runtimes/neurun/core/src/model/operation/HashtableLookupNode.cc
@@ -31,7 +31,7 @@ void HashtableLookupNode::accept(NodeVisitor &&v) const { v.visit(*this); }
HashtableLookupNode::HashtableLookupNode(const operand::IndexSet &inputs,
const operand::IndexSet &outputs)
- : model::operation::Node{OperandConstraint::createExact(3u), inputs, outputs}
+ : model::Operation{OperandConstraint::createExact(3u), inputs, outputs}
{
}
diff --git a/runtimes/neurun/core/src/model/operation/L2NormalizationNode.cc b/runtimes/neurun/core/src/model/operation/L2NormalizationNode.cc
index 1ac21df..3e8a693 100644
--- a/runtimes/neurun/core/src/model/operation/L2NormalizationNode.cc
+++ b/runtimes/neurun/core/src/model/operation/L2NormalizationNode.cc
@@ -31,7 +31,7 @@ void L2NormalizationNode::accept(NodeVisitor &&v) const { v.visit(*this); }
L2NormalizationNode::L2NormalizationNode(const operand::IndexSet &inputs,
const operand::IndexSet &outputs)
- : model::operation::Node{OperandConstraint::createExact(1u), inputs, outputs}
+ : model::Operation{OperandConstraint::createExact(1u), inputs, outputs}
{
}
diff --git a/runtimes/neurun/core/src/model/operation/L2Pool2DNode.cc b/runtimes/neurun/core/src/model/operation/L2Pool2DNode.cc
index 56667de..8effa8f 100644
--- a/runtimes/neurun/core/src/model/operation/L2Pool2DNode.cc
+++ b/runtimes/neurun/core/src/model/operation/L2Pool2DNode.cc
@@ -31,7 +31,7 @@ void L2Pool2DNode::accept(NodeVisitor &&v) const { v.visit(*this); }
L2Pool2DNode::L2Pool2DNode(const operand::IndexSet &inputs, const operand::IndexSet &outputs,
const Param &param)
- : model::operation::Node{OperandConstraint::createExact(1u), inputs, outputs}, _param{param}
+ : model::Operation{OperandConstraint::createExact(1u), inputs, outputs}, _param{param}
{
}
diff --git a/runtimes/neurun/core/src/model/operation/LocalResponseNormalizationNode.cc b/runtimes/neurun/core/src/model/operation/LocalResponseNormalizationNode.cc
index da7f6af..40286d2 100644
--- a/runtimes/neurun/core/src/model/operation/LocalResponseNormalizationNode.cc
+++ b/runtimes/neurun/core/src/model/operation/LocalResponseNormalizationNode.cc
@@ -32,7 +32,7 @@ void LocalResponseNormalizationNode::accept(NodeVisitor &&v) const { v.visit(*th
LocalResponseNormalizationNode::LocalResponseNormalizationNode(const operand::IndexSet &inputs,
const operand::IndexSet &outputs,
const Param &param)
- : model::operation::Node{OperandConstraint::createExact(1u), inputs, outputs}, _param{param}
+ : model::Operation{OperandConstraint::createExact(1u), inputs, outputs}, _param{param}
{
}
diff --git a/runtimes/neurun/core/src/model/operation/LogicalAndNode.cc b/runtimes/neurun/core/src/model/operation/LogicalAndNode.cc
index 0dfdf4a..5c9f2d7 100644
--- a/runtimes/neurun/core/src/model/operation/LogicalAndNode.cc
+++ b/runtimes/neurun/core/src/model/operation/LogicalAndNode.cc
@@ -30,7 +30,7 @@ namespace operation
void LogicalAndNode::accept(NodeVisitor &&v) const { v.visit(*this); }
LogicalAndNode::LogicalAndNode(const operand::IndexSet &inputs, const operand::IndexSet &outputs)
- : model::operation::Node{OperandConstraint::createExact(2u), inputs, outputs}
+ : model::Operation{OperandConstraint::createExact(2u), inputs, outputs}
{
}
diff --git a/runtimes/neurun/core/src/model/operation/LogicalNotNode.cc b/runtimes/neurun/core/src/model/operation/LogicalNotNode.cc
index f6d5f59..78dd038 100644
--- a/runtimes/neurun/core/src/model/operation/LogicalNotNode.cc
+++ b/runtimes/neurun/core/src/model/operation/LogicalNotNode.cc
@@ -30,7 +30,7 @@ namespace operation
void LogicalNotNode::accept(NodeVisitor &&v) const { v.visit(*this); }
LogicalNotNode::LogicalNotNode(const operand::IndexSet &inputs, const operand::IndexSet &outputs)
- : model::operation::Node{OperandConstraint::createExact(1u), inputs, outputs}
+ : model::Operation{OperandConstraint::createExact(1u), inputs, outputs}
{
}
diff --git a/runtimes/neurun/core/src/model/operation/LogicalOrNode.cc b/runtimes/neurun/core/src/model/operation/LogicalOrNode.cc
index c570835..33bb8e1 100644
--- a/runtimes/neurun/core/src/model/operation/LogicalOrNode.cc
+++ b/runtimes/neurun/core/src/model/operation/LogicalOrNode.cc
@@ -30,7 +30,7 @@ namespace operation
void LogicalOrNode::accept(NodeVisitor &&v) const { v.visit(*this); }
LogicalOrNode::LogicalOrNode(const operand::IndexSet &inputs, const operand::IndexSet &outputs)
- : model::operation::Node{OperandConstraint::createExact(2u), inputs, outputs}
+ : model::Operation{OperandConstraint::createExact(2u), inputs, outputs}
{
}
diff --git a/runtimes/neurun/core/src/model/operation/LogisticNode.cc b/runtimes/neurun/core/src/model/operation/LogisticNode.cc
index ced133d..a4b35bb 100644
--- a/runtimes/neurun/core/src/model/operation/LogisticNode.cc
+++ b/runtimes/neurun/core/src/model/operation/LogisticNode.cc
@@ -30,7 +30,7 @@ namespace operation
void LogisticNode::accept(NodeVisitor &&v) const { v.visit(*this); }
LogisticNode::LogisticNode(const operand::IndexSet &inputs, const operand::IndexSet &outputs)
- : model::operation::Node{OperandConstraint::createExact(1u), inputs, outputs}
+ : model::Operation{OperandConstraint::createExact(1u), inputs, outputs}
{
}
diff --git a/runtimes/neurun/core/src/model/operation/MaxPool2DNode.cc b/runtimes/neurun/core/src/model/operation/MaxPool2DNode.cc
index 5b2efdf..bc53469 100644
--- a/runtimes/neurun/core/src/model/operation/MaxPool2DNode.cc
+++ b/runtimes/neurun/core/src/model/operation/MaxPool2DNode.cc
@@ -31,7 +31,7 @@ void MaxPool2DNode::accept(NodeVisitor &&v) const { v.visit(*this); }
MaxPool2DNode::MaxPool2DNode(const operand::IndexSet &inputs, const operand::IndexSet &outputs,
const Param &param)
- : model::operation::Node{OperandConstraint::createExact(1u), inputs, outputs}, _param{param}
+ : model::Operation{OperandConstraint::createExact(1u), inputs, outputs}, _param{param}
{
}
diff --git a/runtimes/neurun/core/src/model/operation/MeanNode.cc b/runtimes/neurun/core/src/model/operation/MeanNode.cc
index 1762143..4ce2469 100644
--- a/runtimes/neurun/core/src/model/operation/MeanNode.cc
+++ b/runtimes/neurun/core/src/model/operation/MeanNode.cc
@@ -31,7 +31,7 @@ void MeanNode::accept(NodeVisitor &&v) const { v.visit(*this); }
MeanNode::MeanNode(const operand::IndexSet &inputs, const operand::IndexSet &outputs,
const Param &param)
- : model::operation::Node{OperandConstraint::createExact(1u), inputs, outputs}, _param{param}
+ : model::Operation{OperandConstraint::createExact(1u), inputs, outputs}, _param{param}
{
}
diff --git a/runtimes/neurun/core/src/model/operation/MulNode.cc b/runtimes/neurun/core/src/model/operation/MulNode.cc
index 3254b86..dc75414 100644
--- a/runtimes/neurun/core/src/model/operation/MulNode.cc
+++ b/runtimes/neurun/core/src/model/operation/MulNode.cc
@@ -31,7 +31,7 @@ void MulNode::accept(NodeVisitor &&v) const { v.visit(*this); }
MulNode::MulNode(const operand::IndexSet &inputs, const operand::IndexSet &outputs,
const Param &param)
- : model::operation::Node{OperandConstraint::createExact(2u), inputs, outputs}, _param{param}
+ : model::Operation{OperandConstraint::createExact(2u), inputs, outputs}, _param{param}
{
}
diff --git a/runtimes/neurun/core/src/model/operation/NegNode.cc b/runtimes/neurun/core/src/model/operation/NegNode.cc
index 0382c43..f265a58 100644
--- a/runtimes/neurun/core/src/model/operation/NegNode.cc
+++ b/runtimes/neurun/core/src/model/operation/NegNode.cc
@@ -30,7 +30,7 @@ namespace operation
void NegNode::accept(NodeVisitor &&v) const { v.visit(*this); }
NegNode::NegNode(const operand::IndexSet &inputs, const operand::IndexSet &outputs)
- : model::operation::Node{OperandConstraint::createExact(1u), inputs, outputs}
+ : model::Operation{OperandConstraint::createExact(1u), inputs, outputs}
{
}
diff --git a/runtimes/neurun/core/src/model/operation/PReLUNode.cc b/runtimes/neurun/core/src/model/operation/PReLUNode.cc
index 16872b3..94653c5 100644
--- a/runtimes/neurun/core/src/model/operation/PReLUNode.cc
+++ b/runtimes/neurun/core/src/model/operation/PReLUNode.cc
@@ -30,7 +30,7 @@ namespace operation
void PReLUNode::accept(NodeVisitor &&v) const { v.visit(*this); }
PReLUNode::PReLUNode(const operand::IndexSet &inputs, const operand::IndexSet &outputs)
- : model::operation::Node{OperandConstraint::createExact(2u), inputs, outputs}
+ : model::Operation{OperandConstraint::createExact(2u), inputs, outputs}
{
}
diff --git a/runtimes/neurun/core/src/model/operation/PermuteNode.cc b/runtimes/neurun/core/src/model/operation/PermuteNode.cc
index a8232c7..0a54cfd 100644
--- a/runtimes/neurun/core/src/model/operation/PermuteNode.cc
+++ b/runtimes/neurun/core/src/model/operation/PermuteNode.cc
@@ -32,7 +32,7 @@ void PermuteNode::accept(NodeVisitor &&v) const { v.visit(*this); }
PermuteNode::PermuteNode(const operand::Index &input, const operand::Index &output, Type type,
const backend::Backend *input_backend,
const backend::Backend *output_backend)
- : model::operation::Node{OperandConstraint::createExact(1u)},
+ : model::Operation{OperandConstraint::createExact(1u)},
_param{type, input_backend, output_backend}
{
setInputs({input});
diff --git a/runtimes/neurun/core/src/model/operation/RSQRTNode.cc b/runtimes/neurun/core/src/model/operation/RSQRTNode.cc
index 8f9b17a..1edd5e1 100644
--- a/runtimes/neurun/core/src/model/operation/RSQRTNode.cc
+++ b/runtimes/neurun/core/src/model/operation/RSQRTNode.cc
@@ -30,7 +30,7 @@ namespace operation
void RSQRTNode::accept(NodeVisitor &&v) const { v.visit(*this); }
RSQRTNode::RSQRTNode(const operand::IndexSet &inputs, const operand::IndexSet &outputs)
- : model::operation::Node{OperandConstraint::createExact(1u), inputs, outputs}
+ : model::Operation{OperandConstraint::createExact(1u), inputs, outputs}
{
}
diff --git a/runtimes/neurun/core/src/model/operation/ReLU1Node.cc b/runtimes/neurun/core/src/model/operation/ReLU1Node.cc
index 2329f68..e6da511 100644
--- a/runtimes/neurun/core/src/model/operation/ReLU1Node.cc
+++ b/runtimes/neurun/core/src/model/operation/ReLU1Node.cc
@@ -30,7 +30,7 @@ namespace operation
void ReLU1Node::accept(NodeVisitor &&v) const { v.visit(*this); }
ReLU1Node::ReLU1Node(const operand::IndexSet &inputs, const operand::IndexSet &outputs)
- : model::operation::Node{OperandConstraint::createExact(1u), inputs, outputs}
+ : model::Operation{OperandConstraint::createExact(1u), inputs, outputs}
{
}
diff --git a/runtimes/neurun/core/src/model/operation/ReLU6Node.cc b/runtimes/neurun/core/src/model/operation/ReLU6Node.cc
index a3c86c5..db2c3f1 100644
--- a/runtimes/neurun/core/src/model/operation/ReLU6Node.cc
+++ b/runtimes/neurun/core/src/model/operation/ReLU6Node.cc
@@ -30,7 +30,7 @@ namespace operation
void ReLU6Node::accept(NodeVisitor &&v) const { v.visit(*this); }
ReLU6Node::ReLU6Node(const operand::IndexSet &inputs, const operand::IndexSet &outputs)
- : model::operation::Node{OperandConstraint::createExact(1u), inputs, outputs}
+ : model::Operation{OperandConstraint::createExact(1u), inputs, outputs}
{
}
diff --git a/runtimes/neurun/core/src/model/operation/ReLUNode.cc b/runtimes/neurun/core/src/model/operation/ReLUNode.cc
index 4fd49e5..de2b106 100644
--- a/runtimes/neurun/core/src/model/operation/ReLUNode.cc
+++ b/runtimes/neurun/core/src/model/operation/ReLUNode.cc
@@ -30,7 +30,7 @@ namespace operation
void ReLUNode::accept(NodeVisitor &&v) const { v.visit(*this); }
ReLUNode::ReLUNode(const operand::IndexSet &inputs, const operand::IndexSet &outputs)
- : model::operation::Node{OperandConstraint::createExact(1u), inputs, outputs}
+ : model::Operation{OperandConstraint::createExact(1u), inputs, outputs}
{
}
diff --git a/runtimes/neurun/core/src/model/operation/ReduceMaxNode.cc b/runtimes/neurun/core/src/model/operation/ReduceMaxNode.cc
index 2a5864d..e289c2c 100644
--- a/runtimes/neurun/core/src/model/operation/ReduceMaxNode.cc
+++ b/runtimes/neurun/core/src/model/operation/ReduceMaxNode.cc
@@ -31,7 +31,7 @@ void ReduceMaxNode::accept(NodeVisitor &&v) const { v.visit(*this); }
ReduceMaxNode::ReduceMaxNode(const operand::IndexSet &inputs, const operand::IndexSet &outputs,
const Param &param)
- : model::operation::Node{OperandConstraint::createExact(1u), inputs, outputs}, _param{param}
+ : model::Operation{OperandConstraint::createExact(1u), inputs, outputs}, _param{param}
{
}
diff --git a/runtimes/neurun/core/src/model/operation/ReduceMinNode.cc b/runtimes/neurun/core/src/model/operation/ReduceMinNode.cc
index 5684c4e..28ab2d0 100644
--- a/runtimes/neurun/core/src/model/operation/ReduceMinNode.cc
+++ b/runtimes/neurun/core/src/model/operation/ReduceMinNode.cc
@@ -31,7 +31,7 @@ void ReduceMinNode::accept(NodeVisitor &&v) const { v.visit(*this); }
ReduceMinNode::ReduceMinNode(const operand::IndexSet &inputs, const operand::IndexSet &outputs,
const Param &param)
- : model::operation::Node{OperandConstraint::createExact(1u), inputs, outputs}, _param{param}
+ : model::Operation{OperandConstraint::createExact(1u), inputs, outputs}, _param{param}
{
}
diff --git a/runtimes/neurun/core/src/model/operation/ReduceSumNode.cc b/runtimes/neurun/core/src/model/operation/ReduceSumNode.cc
index e2d0b45..e4764b7 100644
--- a/runtimes/neurun/core/src/model/operation/ReduceSumNode.cc
+++ b/runtimes/neurun/core/src/model/operation/ReduceSumNode.cc
@@ -31,7 +31,7 @@ void ReduceSumNode::accept(NodeVisitor &&v) const { v.visit(*this); }
ReduceSumNode::ReduceSumNode(const operand::IndexSet &inputs, const operand::IndexSet &outputs,
const Param &param)
- : model::operation::Node{OperandConstraint::createExact(1u), inputs, outputs}, _param{param}
+ : model::Operation{OperandConstraint::createExact(1u), inputs, outputs}, _param{param}
{
}
diff --git a/runtimes/neurun/core/src/model/operation/ReshapeNode.cc b/runtimes/neurun/core/src/model/operation/ReshapeNode.cc
index 4a79b49..594e283 100644
--- a/runtimes/neurun/core/src/model/operation/ReshapeNode.cc
+++ b/runtimes/neurun/core/src/model/operation/ReshapeNode.cc
@@ -30,7 +30,7 @@ namespace operation
void ReshapeNode::accept(NodeVisitor &&v) const { v.visit(*this); }
ReshapeNode::ReshapeNode(const operand::IndexSet &inputs, const operand::IndexSet &outputs)
- : model::operation::Node{OperandConstraint::createExact(1u), inputs, outputs}
+ : model::Operation{OperandConstraint::createExact(1u), inputs, outputs}
{
}
diff --git a/runtimes/neurun/core/src/model/operation/ResizeBilinearNode.cc b/runtimes/neurun/core/src/model/operation/ResizeBilinearNode.cc
index 92f1701..715c08b 100644
--- a/runtimes/neurun/core/src/model/operation/ResizeBilinearNode.cc
+++ b/runtimes/neurun/core/src/model/operation/ResizeBilinearNode.cc
@@ -31,7 +31,7 @@ void ResizeBilinearNode::accept(NodeVisitor &&v) const { v.visit(*this); }
ResizeBilinearNode::ResizeBilinearNode(const operand::IndexSet &inputs,
const operand::IndexSet &outputs, const Param &param)
- : model::operation::Node{OperandConstraint::createExact(1u), inputs, outputs}, _param{param}
+ : model::Operation{OperandConstraint::createExact(1u), inputs, outputs}, _param{param}
{
}
diff --git a/runtimes/neurun/core/src/model/operation/SQRTNode.cc b/runtimes/neurun/core/src/model/operation/SQRTNode.cc
index 6cd25ad..4db3f43 100644
--- a/runtimes/neurun/core/src/model/operation/SQRTNode.cc
+++ b/runtimes/neurun/core/src/model/operation/SQRTNode.cc
@@ -30,7 +30,7 @@ namespace operation
void SQRTNode::accept(NodeVisitor &&v) const { v.visit(*this); }
SQRTNode::SQRTNode(const operand::IndexSet &inputs, const operand::IndexSet &outputs)
- : model::operation::Node{OperandConstraint::createExact(1u), inputs, outputs}
+ : model::Operation{OperandConstraint::createExact(1u), inputs, outputs}
{
}
diff --git a/runtimes/neurun/core/src/model/operation/Set.cc b/runtimes/neurun/core/src/model/operation/Set.cc
index 84f4e3b..34627b6 100644
--- a/runtimes/neurun/core/src/model/operation/Set.cc
+++ b/runtimes/neurun/core/src/model/operation/Set.cc
@@ -32,7 +32,7 @@ const OperationIndex Set::generateIndex()
return _index_count++;
}
-OperationIndex Set::append(std::unique_ptr<Node> &&node)
+OperationIndex Set::append(std::unique_ptr<Operation> &&node)
{
auto index = generateIndex();
@@ -40,13 +40,13 @@ OperationIndex Set::append(std::unique_ptr<Node> &&node)
return index;
}
-const Node &Set::at(const OperationIndex &index) const { return *(_nodes.at(index)); }
+const Operation &Set::at(const OperationIndex &index) const { return *(_nodes.at(index)); }
-Node &Set::at(const OperationIndex &index) { return *(_nodes.at(index)); }
+Operation &Set::at(const OperationIndex &index) { return *(_nodes.at(index)); }
bool Set::exist(const OperationIndex &index) const { return _nodes.find(index) != _nodes.end(); }
-void Set::iterate(const std::function<void(const OperationIndex &, const Node &)> &fn) const
+void Set::iterate(const std::function<void(const OperationIndex &, const Operation &)> &fn) const
{
for (auto it = _nodes.begin(); it != _nodes.end(); ++it)
{
@@ -54,7 +54,7 @@ void Set::iterate(const std::function<void(const OperationIndex &, const Node &)
}
}
-void Set::iterate(const std::function<void(const OperationIndex &, Node &)> &fn)
+void Set::iterate(const std::function<void(const OperationIndex &, Operation &)> &fn)
{
for (auto it = _nodes.begin(); it != _nodes.end(); ++it)
{
diff --git a/runtimes/neurun/core/src/model/operation/SoftmaxNode.cc b/runtimes/neurun/core/src/model/operation/SoftmaxNode.cc
index 93388bd..45ae8ba 100644
--- a/runtimes/neurun/core/src/model/operation/SoftmaxNode.cc
+++ b/runtimes/neurun/core/src/model/operation/SoftmaxNode.cc
@@ -31,7 +31,7 @@ void SoftmaxNode::accept(NodeVisitor &&v) const { v.visit(*this); }
SoftmaxNode::SoftmaxNode(const operand::IndexSet &inputs, const operand::IndexSet &outputs,
const Param &param)
- : model::operation::Node{OperandConstraint::createExact(1u), inputs, outputs}, _param{param}
+ : model::Operation{OperandConstraint::createExact(1u), inputs, outputs}, _param{param}
{
}
diff --git a/runtimes/neurun/core/src/model/operation/SpaceToDepthNode.cc b/runtimes/neurun/core/src/model/operation/SpaceToDepthNode.cc
index 7cf5464..f42f6fd 100644
--- a/runtimes/neurun/core/src/model/operation/SpaceToDepthNode.cc
+++ b/runtimes/neurun/core/src/model/operation/SpaceToDepthNode.cc
@@ -31,7 +31,7 @@ void SpaceToDepthNode::accept(NodeVisitor &&v) const { v.visit(*this); }
SpaceToDepthNode::SpaceToDepthNode(const operand::IndexSet &inputs,
const operand::IndexSet &outputs, const Param &param)
- : model::operation::Node{OperandConstraint::createExact(1u), inputs, outputs}, _param{param}
+ : model::Operation{OperandConstraint::createExact(1u), inputs, outputs}, _param{param}
{
}
diff --git a/runtimes/neurun/core/src/model/operation/SquaredDifferenceNode.cc b/runtimes/neurun/core/src/model/operation/SquaredDifferenceNode.cc
index a039fdf..e47d938 100644
--- a/runtimes/neurun/core/src/model/operation/SquaredDifferenceNode.cc
+++ b/runtimes/neurun/core/src/model/operation/SquaredDifferenceNode.cc
@@ -31,7 +31,7 @@ void SquaredDifferenceNode::accept(NodeVisitor &&v) const { v.visit(*this); }
SquaredDifferenceNode::SquaredDifferenceNode(const operand::IndexSet &inputs,
const operand::IndexSet &outputs)
- : model::operation::Node{OperandConstraint::createExact(2u), inputs, outputs}
+ : model::Operation{OperandConstraint::createExact(2u), inputs, outputs}
{
}
diff --git a/runtimes/neurun/core/src/model/operation/SqueezeNode.cc b/runtimes/neurun/core/src/model/operation/SqueezeNode.cc
index 4abb3c9..aafcbd0 100644
--- a/runtimes/neurun/core/src/model/operation/SqueezeNode.cc
+++ b/runtimes/neurun/core/src/model/operation/SqueezeNode.cc
@@ -28,7 +28,7 @@ void SqueezeNode::accept(NodeVisitor &&v) const { v.visit(*this); }
SqueezeNode::SqueezeNode(const operand::IndexSet &inputs, const operand::IndexSet &outputs,
const Param &param)
- : model::operation::Node{OperandConstraint::createExact(1u), inputs, outputs}, _param(param)
+ : model::Operation{OperandConstraint::createExact(1u), inputs, outputs}, _param(param)
{
}
diff --git a/runtimes/neurun/core/src/model/operation/StridedSliceNode.cc b/runtimes/neurun/core/src/model/operation/StridedSliceNode.cc
index 924cb83..922ef34 100644
--- a/runtimes/neurun/core/src/model/operation/StridedSliceNode.cc
+++ b/runtimes/neurun/core/src/model/operation/StridedSliceNode.cc
@@ -31,7 +31,7 @@ void StridedSliceNode::accept(NodeVisitor &&v) const { v.visit(*this); }
StridedSliceNode::StridedSliceNode(const operand::IndexSet &inputs,
const operand::IndexSet &outputs, const Param &param)
- : model::operation::Node{OperandConstraint::createExact(1u), inputs, outputs}, _param{param}
+ : model::Operation{OperandConstraint::createExact(1u), inputs, outputs}, _param{param}
{
}
diff --git a/runtimes/neurun/core/src/model/operation/SubNode.cc b/runtimes/neurun/core/src/model/operation/SubNode.cc
index 8669994..fadc0bf 100644
--- a/runtimes/neurun/core/src/model/operation/SubNode.cc
+++ b/runtimes/neurun/core/src/model/operation/SubNode.cc
@@ -31,7 +31,7 @@ void SubNode::accept(NodeVisitor &&v) const { v.visit(*this); }
SubNode::SubNode(const operand::IndexSet &inputs, const operand::IndexSet &outputs,
const Param &param)
- : model::operation::Node{OperandConstraint::createExact(2u), inputs, outputs}, _param{param}
+ : model::Operation{OperandConstraint::createExact(2u), inputs, outputs}, _param{param}
{
}
diff --git a/runtimes/neurun/core/src/model/operation/Subgraph.cc b/runtimes/neurun/core/src/model/operation/Subgraph.cc
index cf70e10..0b5d411 100644
--- a/runtimes/neurun/core/src/model/operation/Subgraph.cc
+++ b/runtimes/neurun/core/src/model/operation/Subgraph.cc
@@ -25,7 +25,7 @@ namespace model
namespace operation
{
-Subgraph::Subgraph() : Node{OperandConstraint::createAny()}
+Subgraph::Subgraph() : Operation{OperandConstraint::createAny()}
{
// DO NOTHING
}
diff --git a/runtimes/neurun/core/src/model/operation/SubgraphContext.cc b/runtimes/neurun/core/src/model/operation/SubgraphContext.cc
index 20a82e1..c32dbc1 100644
--- a/runtimes/neurun/core/src/model/operation/SubgraphContext.cc
+++ b/runtimes/neurun/core/src/model/operation/SubgraphContext.cc
@@ -43,7 +43,7 @@ OperationIndex SubgraphContext::append(std::unique_ptr<Subgraph> &&subgraph)
return index;
}
-OperationIndex SubgraphContext::append(const OperationIndex &index, const Node &node)
+OperationIndex SubgraphContext::append(const OperationIndex &index, const Operation &node)
{
std::unique_ptr<Subgraph> subg = nnfw::cpp14::make_unique<model::operation::Subgraph>();
subg->appendOperation(index, node);
diff --git a/runtimes/neurun/core/src/model/operation/TanhNode.cc b/runtimes/neurun/core/src/model/operation/TanhNode.cc
index 8f1b810..2bf695b 100644
--- a/runtimes/neurun/core/src/model/operation/TanhNode.cc
+++ b/runtimes/neurun/core/src/model/operation/TanhNode.cc
@@ -30,7 +30,7 @@ namespace operation
void TanhNode::accept(NodeVisitor &&v) const { v.visit(*this); }
TanhNode::TanhNode(const operand::IndexSet &inputs, const operand::IndexSet &outputs)
- : model::operation::Node{OperandConstraint::createExact(1u), inputs, outputs}
+ : model::Operation{OperandConstraint::createExact(1u), inputs, outputs}
{
}
diff --git a/runtimes/neurun/core/src/model/operation/TopKV2Node.cc b/runtimes/neurun/core/src/model/operation/TopKV2Node.cc
index c57fe9b..c5dd3f5 100644
--- a/runtimes/neurun/core/src/model/operation/TopKV2Node.cc
+++ b/runtimes/neurun/core/src/model/operation/TopKV2Node.cc
@@ -31,7 +31,7 @@ void TopKV2Node::accept(NodeVisitor &&v) const { v.visit(*this); }
TopKV2Node::TopKV2Node(const operand::IndexSet &inputs, const operand::IndexSet &outputs,
const Param &param)
- : model::operation::Node{OperandConstraint::createExact(1u), inputs, outputs}, _param{param}
+ : model::Operation{OperandConstraint::createExact(1u), inputs, outputs}, _param{param}
{
}
diff --git a/runtimes/neurun/core/src/model/operation/TransposeConvNode.cc b/runtimes/neurun/core/src/model/operation/TransposeConvNode.cc
index b385f66..df235bd 100644
--- a/runtimes/neurun/core/src/model/operation/TransposeConvNode.cc
+++ b/runtimes/neurun/core/src/model/operation/TransposeConvNode.cc
@@ -31,7 +31,7 @@ void TransposeConvNode::accept(NodeVisitor &&v) const { v.visit(*this); }
TransposeConvNode::TransposeConvNode(const operand::IndexSet &inputs,
const operand::IndexSet &outputs, const Param &param)
- : model::operation::Node{OperandConstraint::createExact(3u), inputs, outputs}, _param{param}
+ : model::Operation{OperandConstraint::createExact(3u), inputs, outputs}, _param{param}
{
}
diff --git a/runtimes/neurun/core/src/model/operation/TransposeNode.cc b/runtimes/neurun/core/src/model/operation/TransposeNode.cc
index c931a67..02a7918 100644
--- a/runtimes/neurun/core/src/model/operation/TransposeNode.cc
+++ b/runtimes/neurun/core/src/model/operation/TransposeNode.cc
@@ -31,7 +31,7 @@ void TransposeNode::accept(NodeVisitor &&v) const { v.visit(*this); }
TransposeNode::TransposeNode(const operand::IndexSet &inputs, const operand::IndexSet &outputs,
const Param &param)
- : model::operation::Node{OperandConstraint::createExact(2u), inputs, outputs}, _param{param}
+ : model::Operation{OperandConstraint::createExact(2u), inputs, outputs}, _param{param}
{
}
diff --git a/runtimes/neurun/frontend/nnapi/wrapper/OperationFactory.cc b/runtimes/neurun/frontend/nnapi/wrapper/OperationFactory.cc
index a9a9633..b79e478 100644
--- a/runtimes/neurun/frontend/nnapi/wrapper/OperationFactory.cc
+++ b/runtimes/neurun/frontend/nnapi/wrapper/OperationFactory.cc
@@ -1235,9 +1235,9 @@ OperationFactory::OperationFactory()
};
}
-neurun::model::operation::Node *OperationFactory::create(ANeuralNetworksOperationType type,
- const OperationFactory::Param &param,
- neurun::model::operand::Set &operands)
+neurun::model::Operation *OperationFactory::create(ANeuralNetworksOperationType type,
+ const OperationFactory::Param &param,
+ neurun::model::operand::Set &operands)
{
return _map.at(type)(param, operands);
}
diff --git a/runtimes/neurun/frontend/nnapi/wrapper/OperationFactory.h b/runtimes/neurun/frontend/nnapi/wrapper/OperationFactory.h
index 19bb6a8..bca9a43 100644
--- a/runtimes/neurun/frontend/nnapi/wrapper/OperationFactory.h
+++ b/runtimes/neurun/frontend/nnapi/wrapper/OperationFactory.h
@@ -20,7 +20,7 @@
#include <unordered_map>
#include "model/operand/Set.h"
-#include "model/operation/Node.h"
+#include "model/Operation.h"
#include "NeuralNetworks.h"
#include "NeuralNetworksEx.h"
@@ -39,8 +39,8 @@ public:
};
public:
- using Generator = std::function<neurun::model::operation::Node *(const OperationFactory::Param &,
- neurun::model::operand::Set &)>;
+ using Generator = std::function<neurun::model::Operation *(const OperationFactory::Param &,
+ neurun::model::operand::Set &)>;
public:
static OperationFactory &instance();
@@ -49,9 +49,9 @@ private:
OperationFactory();
public:
- neurun::model::operation::Node *create(ANeuralNetworksOperationType,
- const OperationFactory::Param &param,
- neurun::model::operand::Set &operands);
+ neurun::model::Operation *create(ANeuralNetworksOperationType,
+ const OperationFactory::Param &param,
+ neurun::model::operand::Set &operands);
// TODO add "register" method for separating registration, possibly supporting custom-ops
private:
diff --git a/runtimes/neurun/frontend/nnapi/wrapper/model.cc b/runtimes/neurun/frontend/nnapi/wrapper/model.cc
index 8d02769..9fb16e4 100644
--- a/runtimes/neurun/frontend/nnapi/wrapper/model.cc
+++ b/runtimes/neurun/frontend/nnapi/wrapper/model.cc
@@ -105,7 +105,7 @@ bool ANeuralNetworksModel::addOperation(ANeuralNetworksOperationType type, uint3
OperationFactory::Param param{inputCount, inputs, outputCount, outputs};
auto node = factory.create(type, param, _model->operands);
- _model->operations.append(std::unique_ptr<neurun::model::operation::Node>{node});
+ _model->operations.append(std::unique_ptr<neurun::model::Operation>{node});
}
catch (const std::exception &e)
{
@@ -133,7 +133,7 @@ bool ANeuralNetworksModel::addOperationEx(ANeuralNetworksOperationTypeEx type, u
OperationFactory::Param param{inputCount, inputs, outputCount, outputs};
auto node = factory.create(type, param, _model->operands);
- _model->operations.append(std::unique_ptr<neurun::model::operation::Node>{node});
+ _model->operations.append(std::unique_ptr<neurun::model::Operation>{node});
}
catch (const std::exception &e)
{
@@ -234,7 +234,7 @@ void ANeuralNetworksModel::setOptionalOperand(const neurun::model::operand::Inde
void ANeuralNetworksModel::fillOptionalOperand(void)
{
_model->operations.iterate(
- [&](const ::neurun::model::OperationIndex &, ::neurun::model::operation::Node &node) {
+ [&](const ::neurun::model::OperationIndex &, ::neurun::model::Operation &node) {
for (auto input : node.getInputs())
{
// TODO fill default value for optional operands
diff --git a/runtimes/neurun/test/graph/MockNode.h b/runtimes/neurun/test/graph/MockNode.h
index ad18e96..e758782 100644
--- a/runtimes/neurun/test/graph/MockNode.h
+++ b/runtimes/neurun/test/graph/MockNode.h
@@ -17,7 +17,7 @@
#ifndef __NEURUN_TEST_GRAPH_MOCK_NODE_H__
#define __NEURUN_TEST_GRAPH_MOCK_NODE_H__
-#include "model/operation/Node.h"
+#include "model/Operation.h"
#include "model/operand/IndexSet.h"
namespace neurun_test
@@ -25,12 +25,12 @@ namespace neurun_test
namespace graph
{
-class SimpleMockNode : public neurun::model::operation::Node
+class SimpleMockNode : public neurun::model::Operation
{
public:
SimpleMockNode(const neurun::model::operand::IndexSet &inputs,
const neurun::model::operand::IndexSet &outputs)
- : neurun::model::operation::Node{neurun::model::operation::OperandConstraint::createAny()}
+ : neurun::model::Operation{neurun::model::operation::OperandConstraint::createAny()}
{
setInputs(inputs);
setOutputs(outputs);
diff --git a/runtimes/neurun/test/graph/operation/Set.cc b/runtimes/neurun/test/graph/operation/Set.cc
index cc4e1fb..2ef523a 100644
--- a/runtimes/neurun/test/graph/operation/Set.cc
+++ b/runtimes/neurun/test/graph/operation/Set.cc
@@ -20,14 +20,14 @@
#include "model/operation/Set.h"
using neurun::model::operation::Set;
-using neurun::model::operation::Node;
+using neurun::model::Operation;
using neurun::model::OperationIndex;
TEST(graph_operation_Set, operation_test)
{
Set set;
set.append(
- std::unique_ptr<Node>(new neurun_test::graph::SimpleMockNode({1, 2, 3, 4}, {5, 6, 7})));
+ std::unique_ptr<Operation>(new neurun_test::graph::SimpleMockNode({1, 2, 3, 4}, {5, 6, 7})));
OperationIndex idx{0u};
ASSERT_EQ(set.at(idx).getInputs().size(), 4);
ASSERT_EQ(set.at(idx).getOutputs().size(), 3);
diff --git a/runtimes/neurun/test/graph/verifier/Verifier.cc b/runtimes/neurun/test/graph/verifier/Verifier.cc
index 7836d08..e12d8a4 100644
--- a/runtimes/neurun/test/graph/verifier/Verifier.cc
+++ b/runtimes/neurun/test/graph/verifier/Verifier.cc
@@ -16,7 +16,7 @@
#include <gtest/gtest.h>
-#include "model/operation/Node.h"
+#include "model/Operation.h"
#include "graph/Graph.h"
#include "graph/verifier/Verifier.h"
#include "cpp14/memory.h"