[neurun] Rename operation get/setter for in/output (#2486)

Rename operation for operation input/output's getter and setter

- `val inputs()` to `getInputs`
- `void inputs(val)` to `setInputs`
- `val outputs()` to `getOutputs`
- `void outputs(val)` to `setOutputs`

If there is multiple methods with same name, and one of them is
overriden, the compiler cannot find the other methods. For more,
please refer to https://stackoverflow.com/questions/15451020/can-i-override-only-one-method-in-inheritence

For the actual usage of our case, please refer to #2479.

Signed-off-by: Hanjoung Lee <hanjoung.lee@samsung.com>

diff --git a/runtimes/neurun/src/execution.h b/runtimes/neurun/src/execution.h
index 7ed1486..4c4c5c2 100644 (file)
--- a/runtimes/neurun/src/execution.h
+++ b/runtimes/neurun/src/execution.h
@@ -10,8 +10,8 @@ struct ANeuralNetworksExecution
 public:
   ANeuralNetworksExecution(const std::shared_ptr<const neurun::codegen::Plan> &plan) : _plan{plan}
   {
-    _sources.resize(_plan->model().inputs().size());
-    _sinks.resize(_plan->model().outputs().size());
+    _sources.resize(_plan->model().getInputs().size());
+    _sinks.resize(_plan->model().getOutputs().size());
   }
 
 public:

diff --git a/runtimes/neurun/src/frontend/execution.cc b/runtimes/neurun/src/frontend/execution.cc
index 047c814..eb34203 100644 (file)
--- a/runtimes/neurun/src/frontend/execution.cc
+++ b/runtimes/neurun/src/frontend/execution.cc
@@ -54,7 +54,7 @@ int ANeuralNetworksExecution_setInput(ANeuralNetworksExecution *execution, int32
   // TODO Remove this assumption
   neurun::graph::operand::IO::Index input_index{index};
 
-  const auto operand_index = execution->plan().model().inputs().at(input_index);
+  const auto operand_index = execution->plan().model().getInputs().at(input_index);
 
   if (operands.at(operand_index).shape().rank() == 2)
   {
@@ -100,7 +100,7 @@ int ANeuralNetworksExecution_setOutput(ANeuralNetworksExecution *execution, int3
   // TODO Remove this assumption
   neurun::graph::operand::IO::Index output_index{index};
 
-  const auto operand_index = execution->plan().model().outputs().at(output_index);
+  const auto operand_index = execution->plan().model().getOutputs().at(output_index);
 
   if (operands.at(operand_index).shape().rank() == 2)
   {
@@ -143,13 +143,13 @@ int ANeuralNetworksExecution_startCompute(ANeuralNetworksExecution *execution,
   const auto &model = plan.model();
 
   // Set input(s)
-  for (uint32_t n = 0; n < model.inputs().size(); ++n)
+  for (uint32_t n = 0; n < model.getInputs().size(); ++n)
   {
     auto setter = [&](::arm_compute::ITensor &tensor) { execution->source(n).push(tensor); };
 
     neurun::graph::operand::IO::Index input_index{n};
 
-    ::neurun::graph::operand::Index index{model.inputs().at(input_index)};
+    ::neurun::graph::operand::Index index{model.getInputs().at(input_index)};
     auto objects = plan.operands().at(index);
 
     for (auto object : objects)
@@ -166,13 +166,13 @@ int ANeuralNetworksExecution_startCompute(ANeuralNetworksExecution *execution,
   }
 
   // Get output(s)
-  for (uint32_t n = 0; n < model.outputs().size(); ++n)
+  for (uint32_t n = 0; n < model.getOutputs().size(); ++n)
   {
     auto getter = [&](::arm_compute::ITensor &tensor) { execution->sink(n).pull(tensor); };
 
     neurun::graph::operand::IO::Index output_index{n};
 
-    ::neurun::graph::operand::Index index{model.outputs().at(output_index)};
+    ::neurun::graph::operand::Index index{model.getOutputs().at(output_index)};
     auto objects = plan.operands().at(index);
 
     for (auto object : objects)

diff --git a/runtimes/neurun/src/graph/Graph.cc b/runtimes/neurun/src/graph/Graph.cc
index c3987a4..0012a68 100644 (file)
--- a/runtimes/neurun/src/graph/Graph.cc
+++ b/runtimes/neurun/src/graph/Graph.cc
@@ -115,14 +115,14 @@ void Graph::PostDfsIterator<is_const>::iterate(GraphRef graph, const IterFn &fn)
       return;
     visited[index.asInt()] = true;
 
-    auto outputs = node.outputs();
+    auto outputs = node.getOutputs();
     for (auto output : outputs.list())
     {
       // TODO Fix traversing algorithm
       //      Every time need to search for operations that has `outgoing` as incoming from all
       //      operations but we can hold that info cached
       graph._operations.iterate([&](const operation::Index &cand_index, NodeRef cand_node) -> void {
-        auto inputs = cand_node.inputs();
+        auto inputs = cand_node.getInputs();
         for (auto input : inputs.list())
         {
           if (output == input)

diff --git a/runtimes/neurun/src/graph/Graph.h b/runtimes/neurun/src/graph/Graph.h
index cec6ff7..c8fd80b 100644 (file)
--- a/runtimes/neurun/src/graph/Graph.h
+++ b/runtimes/neurun/src/graph/Graph.h
@@ -77,8 +77,8 @@ public:
 
   // Accessors
 public:
-  const operand::IndexSet &inputs() const { return _inputs; }
-  const operand::IndexSet &outputs() const { return _outputs; }
+  const operand::IndexSet &getInputs() const { return _inputs; }
+  const operand::IndexSet &getOutputs() const { return _outputs; }
   const operand::Set &operands() const { return _operands; }
   operand::Set &operands() { return _operands; } // TODO Remove this non-const accessor
   const operation::Set &operations() const { return _operations; }

diff --git a/runtimes/neurun/src/graph/operation/AvgPool2D.cc b/runtimes/neurun/src/graph/operation/AvgPool2D.cc
index a2997ec..b3962b8 100644 (file)
--- a/runtimes/neurun/src/graph/operation/AvgPool2D.cc
+++ b/runtimes/neurun/src/graph/operation/AvgPool2D.cc
@@ -17,7 +17,7 @@ namespace Implicit
 
 void Node::accept(NodeVisitor &&v) const { v.visit(*this); }
 
-void Node::inputs(const operand::IndexSet &indexes)
+void Node::setInputs(const operand::IndexSet &indexes)
 {
   assert(indexes.size() == 1);
 
@@ -25,7 +25,7 @@ void Node::inputs(const operand::IndexSet &indexes)
   _op->param().ifm_index = indexes.at(index).asInt();
 }
 
-void Node::outputs(const operand::IndexSet &indexes)
+void Node::setOutputs(const operand::IndexSet &indexes)
 {
   assert(indexes.size() == 1);
 

diff --git a/runtimes/neurun/src/graph/operation/AvgPool2D.h b/runtimes/neurun/src/graph/operation/AvgPool2D.h
index b639e8c..cbae095 100644 (file)
--- a/runtimes/neurun/src/graph/operation/AvgPool2D.h
+++ b/runtimes/neurun/src/graph/operation/AvgPool2D.h
@@ -28,10 +28,10 @@ public:
   virtual void accept(NodeVisitor &&) const override;
 
 public:
-  virtual operand::IndexSet inputs() const override { return {_op->param().ifm_index}; }
-  virtual operand::IndexSet outputs() const override { return {_op->param().ofm_index}; }
-  virtual void inputs(const operand::IndexSet &indexes) override;
-  virtual void outputs(const operand::IndexSet &indexes) override;
+  virtual operand::IndexSet getInputs() const override { return {_op->param().ifm_index}; }
+  virtual operand::IndexSet getOutputs() const override { return {_op->param().ofm_index}; }
+  virtual void setInputs(const operand::IndexSet &indexes) override;
+  virtual void setOutputs(const operand::IndexSet &indexes) override;
   virtual const ::internal::tflite::op::Node *op() const override { return _op.get(); }
 
 private:

diff --git a/runtimes/neurun/src/graph/operation/Concat.cc b/runtimes/neurun/src/graph/operation/Concat.cc
index 3732247..1a08893 100644 (file)
--- a/runtimes/neurun/src/graph/operation/Concat.cc
+++ b/runtimes/neurun/src/graph/operation/Concat.cc
@@ -15,7 +15,7 @@ namespace Concat
 
 void Node::accept(NodeVisitor &&v) const { v.visit(*this); }
 
-operand::IndexSet Node::inputs() const
+operand::IndexSet Node::getInputs() const
 {
   operand::IndexSet set;
   for (auto index : _op->param().ifm_indexes)
@@ -26,7 +26,7 @@ operand::IndexSet Node::inputs() const
   return set;
 }
 
-void Node::inputs(const operand::IndexSet &indexes)
+void Node::setInputs(const operand::IndexSet &indexes)
 {
   std::vector<int32_t> inds;
   for (auto index : indexes.list())
@@ -36,7 +36,7 @@ void Node::inputs(const operand::IndexSet &indexes)
   _op->param().ifm_indexes = inds;
 }
 
-void Node::outputs(const operand::IndexSet &indexes)
+void Node::setOutputs(const operand::IndexSet &indexes)
 {
   assert(indexes.size() == 1);
 

diff --git a/runtimes/neurun/src/graph/operation/Concat.h b/runtimes/neurun/src/graph/operation/Concat.h
index c417aca..6c8e1bc 100644 (file)
--- a/runtimes/neurun/src/graph/operation/Concat.h
+++ b/runtimes/neurun/src/graph/operation/Concat.h
@@ -24,10 +24,10 @@ public:
   virtual void accept(NodeVisitor &&) const override;
 
 public:
-  virtual operand::IndexSet inputs() const override;
-  virtual operand::IndexSet outputs() const override { return {_op->param().ofm_index}; }
-  virtual void inputs(const operand::IndexSet &indexes) override;
-  virtual void outputs(const operand::IndexSet &indexes) override;
+  virtual operand::IndexSet getInputs() const override;
+  virtual operand::IndexSet getOutputs() const override { return {_op->param().ofm_index}; }
+  virtual void setInputs(const operand::IndexSet &indexes) override;
+  virtual void setOutputs(const operand::IndexSet &indexes) override;
   virtual const ::internal::tflite::op::Node *op() const override { return _op.get(); }
 
 private:

diff --git a/runtimes/neurun/src/graph/operation/Conv2D.cc b/runtimes/neurun/src/graph/operation/Conv2D.cc
index d88c0d2..a158ef5 100644 (file)
--- a/runtimes/neurun/src/graph/operation/Conv2D.cc
+++ b/runtimes/neurun/src/graph/operation/Conv2D.cc
@@ -17,7 +17,7 @@ namespace Implicit
 
 void Node::accept(NodeVisitor &&v) const { v.visit(*this); }
 
-void Node::inputs(const operand::IndexSet &indexes)
+void Node::setInputs(const operand::IndexSet &indexes)
 {
   assert(indexes.size() == 1);
 
@@ -25,7 +25,7 @@ void Node::inputs(const operand::IndexSet &indexes)
   _op->param().ifm_index = indexes.at(index).asInt();
 }
 
-void Node::outputs(const operand::IndexSet &indexes)
+void Node::setOutputs(const operand::IndexSet &indexes)
 {
   assert(indexes.size() == 1);
 

diff --git a/runtimes/neurun/src/graph/operation/Conv2D.h b/runtimes/neurun/src/graph/operation/Conv2D.h
index 09c9b2d..9a562bf 100644 (file)
--- a/runtimes/neurun/src/graph/operation/Conv2D.h
+++ b/runtimes/neurun/src/graph/operation/Conv2D.h
@@ -26,13 +26,13 @@ public:
   virtual void accept(NodeVisitor &&) const override;
 
 public:
-  virtual operand::IndexSet inputs() const override
+  virtual operand::IndexSet getInputs() const override
   {
     return {_op->param().ifm_index, _op->param().ker_index, _op->param().bias_index};
   }
-  virtual operand::IndexSet outputs() const override { return {_op->param().ofm_index}; }
-  virtual void inputs(const operand::IndexSet &indexes) override;
-  virtual void outputs(const operand::IndexSet &indexes) override;
+  virtual operand::IndexSet getOutputs() const override { return {_op->param().ofm_index}; }
+  virtual void setInputs(const operand::IndexSet &indexes) override;
+  virtual void setOutputs(const operand::IndexSet &indexes) override;
   virtual const ::internal::tflite::op::Node *op() const override { return _op.get(); }
 
 private:

diff --git a/runtimes/neurun/src/graph/operation/FullyConnected.cc b/runtimes/neurun/src/graph/operation/FullyConnected.cc
index d39f01b..dff87d2 100644 (file)
--- a/runtimes/neurun/src/graph/operation/FullyConnected.cc
+++ b/runtimes/neurun/src/graph/operation/FullyConnected.cc
@@ -15,7 +15,7 @@ namespace FullyConnected
 
 void Node::accept(NodeVisitor &&v) const { v.visit(*this); }
 
-void Node::inputs(const operand::IndexSet &indexes)
+void Node::setInputs(const operand::IndexSet &indexes)
 {
   assert(indexes.size() == 1);
 
@@ -23,7 +23,7 @@ void Node::inputs(const operand::IndexSet &indexes)
   _op->param().input_index = indexes.at(index).asInt();
 }
 
-void Node::outputs(const operand::IndexSet &indexes)
+void Node::setOutputs(const operand::IndexSet &indexes)
 {
   assert(indexes.size() == 1);
 

diff --git a/runtimes/neurun/src/graph/operation/FullyConnected.h b/runtimes/neurun/src/graph/operation/FullyConnected.h
index 6e7adeb..537e329 100644 (file)
--- a/runtimes/neurun/src/graph/operation/FullyConnected.h
+++ b/runtimes/neurun/src/graph/operation/FullyConnected.h
@@ -24,13 +24,13 @@ public:
   virtual void accept(NodeVisitor &&) const override;
 
 public:
-  virtual operand::IndexSet inputs() const override
+  virtual operand::IndexSet getInputs() const override
   {
     return {_op->param().input_index, _op->param().weight_index, _op->param().bias_index};
   }
-  virtual operand::IndexSet outputs() const override { return {_op->param().output_index}; }
-  virtual void inputs(const operand::IndexSet &indexes) override;
-  virtual void outputs(const operand::IndexSet &indexes) override;
+  virtual operand::IndexSet getOutputs() const override { return {_op->param().output_index}; }
+  virtual void setInputs(const operand::IndexSet &indexes) override;
+  virtual void setOutputs(const operand::IndexSet &indexes) override;
   virtual const ::internal::tflite::op::Node *op() const override { return _op.get(); }
 
 private:

diff --git a/runtimes/neurun/src/graph/operation/MaxPool2D.cc b/runtimes/neurun/src/graph/operation/MaxPool2D.cc
index c56571f..3759d93 100644 (file)
--- a/runtimes/neurun/src/graph/operation/MaxPool2D.cc
+++ b/runtimes/neurun/src/graph/operation/MaxPool2D.cc
@@ -17,7 +17,7 @@ namespace Implicit
 
 void Node::accept(NodeVisitor &&v) const { v.visit(*this); }
 
-void Node::inputs(const operand::IndexSet &indexes)
+void Node::setInputs(const operand::IndexSet &indexes)
 {
   assert(indexes.size() == 1);
 
@@ -25,7 +25,7 @@ void Node::inputs(const operand::IndexSet &indexes)
   _op->param().ifm_index = indexes.at(index).asInt();
 }
 
-void Node::outputs(const operand::IndexSet &indexes)
+void Node::setOutputs(const operand::IndexSet &indexes)
 {
   assert(indexes.size() == 1);
 

diff --git a/runtimes/neurun/src/graph/operation/MaxPool2D.h b/runtimes/neurun/src/graph/operation/MaxPool2D.h
index 8b0ab22..35a2c83 100644 (file)
--- a/runtimes/neurun/src/graph/operation/MaxPool2D.h
+++ b/runtimes/neurun/src/graph/operation/MaxPool2D.h
@@ -28,10 +28,10 @@ public:
   virtual void accept(NodeVisitor &&) const override;
 
 public:
-  virtual operand::IndexSet inputs() const override { return {_op->param().ifm_index}; }
-  virtual operand::IndexSet outputs() const override { return {_op->param().ofm_index}; }
-  virtual void inputs(const operand::IndexSet &indexes) override;
-  virtual void outputs(const operand::IndexSet &indexes) override;
+  virtual operand::IndexSet getInputs() const override { return {_op->param().ifm_index}; }
+  virtual operand::IndexSet getOutputs() const override { return {_op->param().ofm_index}; }
+  virtual void setInputs(const operand::IndexSet &indexes) override;
+  virtual void setOutputs(const operand::IndexSet &indexes) override;
   virtual const ::internal::tflite::op::Node *op() const override { return _op.get(); }
 
 private:

diff --git a/runtimes/neurun/src/graph/operation/NOP.cc b/runtimes/neurun/src/graph/operation/NOP.cc
index cb96bda..643be8c 100644 (file)
--- a/runtimes/neurun/src/graph/operation/NOP.cc
+++ b/runtimes/neurun/src/graph/operation/NOP.cc
@@ -13,7 +13,7 @@ namespace NOP
 
 void Node::accept(NodeVisitor &&v) const { v.visit(*this); }
 
-operand::IndexSet Node::inputs() const
+operand::IndexSet Node::getInputs() const
 {
   operand::IndexSet set;
   for (auto index : _op->param().ifm_indexes)
@@ -24,7 +24,7 @@ operand::IndexSet Node::inputs() const
   return set;
 }
 
-operand::IndexSet Node::outputs() const
+operand::IndexSet Node::getOutputs() const
 {
   operand::IndexSet set;
   for (auto index : _op->param().ofm_indexes)
@@ -35,7 +35,7 @@ operand::IndexSet Node::outputs() const
   return set;
 }
 
-void Node::inputs(const operand::IndexSet &indexes)
+void Node::setInputs(const operand::IndexSet &indexes)
 {
   std::vector<int32_t> inds;
   for (auto index : indexes.list())
@@ -45,7 +45,7 @@ void Node::inputs(const operand::IndexSet &indexes)
   _op->param().ifm_indexes = inds;
 }
 
-void Node::outputs(const operand::IndexSet &indexes)
+void Node::setOutputs(const operand::IndexSet &indexes)
 {
   std::vector<int32_t> inds;
   for (auto index : indexes.list())

diff --git a/runtimes/neurun/src/graph/operation/NOP.h b/runtimes/neurun/src/graph/operation/NOP.h
index 6f909bc..e367aab 100644 (file)
--- a/runtimes/neurun/src/graph/operation/NOP.h
+++ b/runtimes/neurun/src/graph/operation/NOP.h
@@ -24,10 +24,10 @@ public:
   virtual void accept(NodeVisitor &&) const override;
 
 public:
-  virtual operand::IndexSet inputs() const override;
-  virtual operand::IndexSet outputs() const override;
-  virtual void inputs(const operand::IndexSet &indexes) override;
-  virtual void outputs(const operand::IndexSet &indexes) override;
+  virtual operand::IndexSet getInputs() const override;
+  virtual operand::IndexSet getOutputs() const override;
+  virtual void setInputs(const operand::IndexSet &indexes) override;
+  virtual void setOutputs(const operand::IndexSet &indexes) override;
   virtual const ::internal::tflite::op::Node *op() const override { return _op.get(); }
 
 private:

diff --git a/runtimes/neurun/src/graph/operation/Node.h b/runtimes/neurun/src/graph/operation/Node.h
index cd33bc8..318234a 100644 (file)
--- a/runtimes/neurun/src/graph/operation/Node.h
+++ b/runtimes/neurun/src/graph/operation/Node.h
@@ -26,11 +26,11 @@ public:
   virtual void accept(NodeVisitor &&) const = 0;
 
 public:
-  virtual operand::IndexSet inputs() const = 0;
-  virtual operand::IndexSet outputs() const = 0;
+  virtual operand::IndexSet getInputs() const = 0;
+  virtual operand::IndexSet getOutputs() const = 0;
   // It's for only input/output tensors but const data.
-  virtual void inputs(const operand::IndexSet &indexes) = 0;
-  virtual void outputs(const operand::IndexSet &indexes) = 0;
+  virtual void setInputs(const operand::IndexSet &indexes) = 0;
+  virtual void setOutputs(const operand::IndexSet &indexes) = 0;
   virtual const ::internal::tflite::op::Node *op() const = 0;
 
 public:

diff --git a/runtimes/neurun/src/graph/operation/Reshape.cc b/runtimes/neurun/src/graph/operation/Reshape.cc
index 6c60eff..b0dc394 100644 (file)
--- a/runtimes/neurun/src/graph/operation/Reshape.cc
+++ b/runtimes/neurun/src/graph/operation/Reshape.cc
@@ -15,7 +15,7 @@ namespace Reshape
 
 void Node::accept(NodeVisitor &&v) const { v.visit(*this); }
 
-void Node::inputs(const operand::IndexSet &indexes)
+void Node::setInputs(const operand::IndexSet &indexes)
 {
   assert(indexes.size() == 1);
 
@@ -23,7 +23,7 @@ void Node::inputs(const operand::IndexSet &indexes)
   _op->param().input_index = indexes.at(index).asInt();
 }
 
-void Node::outputs(const operand::IndexSet &indexes)
+void Node::setOutputs(const operand::IndexSet &indexes)
 {
   assert(indexes.size() == 1);
 

diff --git a/runtimes/neurun/src/graph/operation/Reshape.h b/runtimes/neurun/src/graph/operation/Reshape.h
index 56d2898..ac9faa8 100644 (file)
--- a/runtimes/neurun/src/graph/operation/Reshape.h
+++ b/runtimes/neurun/src/graph/operation/Reshape.h
@@ -24,13 +24,13 @@ public:
   virtual void accept(NodeVisitor &&) const override;
 
 public:
-  virtual operand::IndexSet inputs() const override
+  virtual operand::IndexSet getInputs() const override
   {
     return {_op->param().input_index, _op->param().shape_index};
   }
-  virtual operand::IndexSet outputs() const override { return {_op->param().output_index}; }
-  virtual void inputs(const operand::IndexSet &indexes) override;
-  virtual void outputs(const operand::IndexSet &indexes) override;
+  virtual operand::IndexSet getOutputs() const override { return {_op->param().output_index}; }
+  virtual void setInputs(const operand::IndexSet &indexes) override;
+  virtual void setOutputs(const operand::IndexSet &indexes) override;
   virtual const ::internal::tflite::op::Node *op() const override { return _op.get(); }
 
 private:

diff --git a/runtimes/neurun/src/graph/operation/Softmax.cc b/runtimes/neurun/src/graph/operation/Softmax.cc
index 026fb6e..a7824d4 100644 (file)
--- a/runtimes/neurun/src/graph/operation/Softmax.cc
+++ b/runtimes/neurun/src/graph/operation/Softmax.cc
@@ -15,7 +15,7 @@ namespace Softmax
 
 void Node::accept(NodeVisitor &&v) const { v.visit(*this); }
 
-void Node::inputs(const operand::IndexSet &indexes)
+void Node::setInputs(const operand::IndexSet &indexes)
 {
   assert(indexes.size() == 1);
 
@@ -23,7 +23,7 @@ void Node::inputs(const operand::IndexSet &indexes)
   _op->param().input_index = indexes.at(index).asInt();
 }
 
-void Node::outputs(const operand::IndexSet &indexes)
+void Node::setOutputs(const operand::IndexSet &indexes)
 {
   assert(indexes.size() == 1);
 

diff --git a/runtimes/neurun/src/graph/operation/Softmax.h b/runtimes/neurun/src/graph/operation/Softmax.h
index 2d2f74f..b1d255c 100644 (file)
--- a/runtimes/neurun/src/graph/operation/Softmax.h
+++ b/runtimes/neurun/src/graph/operation/Softmax.h
@@ -24,10 +24,10 @@ public:
   virtual void accept(NodeVisitor &&) const override;
 
 public:
-  virtual operand::IndexSet inputs() const override { return {_op->param().input_index}; }
-  virtual operand::IndexSet outputs() const override { return {_op->param().output_index}; }
-  virtual void inputs(const operand::IndexSet &indexes) override;
-  virtual void outputs(const operand::IndexSet &indexes) override;
+  virtual operand::IndexSet getInputs() const override { return {_op->param().input_index}; }
+  virtual operand::IndexSet getOutputs() const override { return {_op->param().output_index}; }
+  virtual void setInputs(const operand::IndexSet &indexes) override;
+  virtual void setOutputs(const operand::IndexSet &indexes) override;
   virtual const ::internal::tflite::op::Node *op() const override { return _op.get(); }
 
 private:

diff --git a/runtimes/neurun/src/graph/verifier/IVerifier.cc b/runtimes/neurun/src/graph/verifier/IVerifier.cc
index 6493d49..461084e 100644 (file)
--- a/runtimes/neurun/src/graph/verifier/IVerifier.cc
+++ b/runtimes/neurun/src/graph/verifier/IVerifier.cc
@@ -25,14 +25,14 @@ bool DAGChecker::verify(const Graph &graph) const
     visited[index.value()] = true;
     on_stack[index.value()] = true;
 
-    auto outputs = node.outputs();
+    auto outputs = node.getOutputs();
     for (auto output : outputs.list())
     {
       // TODO Fix traversing algorithm
       //      Every time need to search for operations that has `outgoing` as incoming from all
       //      operations but we can hold that info cached
       operations.iterate([&](const operation::Index &cand_index, const operation::Node &cand_node) {
-        auto inputs = cand_node.inputs();
+        auto inputs = cand_node.getInputs();
         for (auto input : inputs.list())
         {
           if (output == input)

diff --git a/runtimes/neurun/test/graph/Graph.cc b/runtimes/neurun/test/graph/Graph.cc
index d690e55..cd2a342 100644 (file)
--- a/runtimes/neurun/test/graph/Graph.cc
+++ b/runtimes/neurun/test/graph/Graph.cc
@@ -20,17 +20,17 @@ TEST(Graph, inputs_and_outputs)
   graph.addOutput({index11});
   graph.addOutput({index12});
 
-  ASSERT_EQ(graph.inputs().size(), 2);
-  ASSERT_EQ(graph.outputs().size(), 3);
+  ASSERT_EQ(graph.getInputs().size(), 2);
+  ASSERT_EQ(graph.getOutputs().size(), 3);
 
   ::neurun::graph::operand::IO::Index io_index0{0};
   ::neurun::graph::operand::IO::Index io_index1{1};
   ::neurun::graph::operand::IO::Index io_index2{2};
 
-  ASSERT_EQ(graph.inputs().at(io_index0), 0);
-  ASSERT_EQ(graph.inputs().at(io_index1), 1);
+  ASSERT_EQ(graph.getInputs().at(io_index0), 0);
+  ASSERT_EQ(graph.getInputs().at(io_index1), 1);
 
-  ASSERT_EQ(graph.outputs().at(io_index0), 10);
-  ASSERT_EQ(graph.outputs().at(io_index1), 11);
-  ASSERT_EQ(graph.outputs().at(io_index2), 12);
+  ASSERT_EQ(graph.getOutputs().at(io_index0), 10);
+  ASSERT_EQ(graph.getOutputs().at(io_index1), 11);
+  ASSERT_EQ(graph.getOutputs().at(io_index2), 12);
 }

diff --git a/runtimes/neurun/test/graph/operation/Set.cc b/runtimes/neurun/test/graph/operation/Set.cc
index f533c6a..ced5bd2 100644 (file)
--- a/runtimes/neurun/test/graph/operation/Set.cc
+++ b/runtimes/neurun/test/graph/operation/Set.cc
@@ -15,10 +15,10 @@ public:
   virtual void accept(neurun::graph::operation::NodeVisitor &&) const override {}
 
 public:
-  virtual neurun::graph::operand::IndexSet inputs() const { return {1, 2, 3, 4}; }
-  virtual neurun::graph::operand::IndexSet outputs() const { return {1, 2, 3}; }
-  virtual void inputs(const neurun::graph::operand::IndexSet &indexes) override {}
-  virtual void outputs(const neurun::graph::operand::IndexSet &indexes) override {}
+  virtual neurun::graph::operand::IndexSet getInputs() const { return {1, 2, 3, 4}; }
+  virtual neurun::graph::operand::IndexSet getOutputs() const { return {1, 2, 3}; }
+  virtual void setInputs(const neurun::graph::operand::IndexSet &indexes) override {}
+  virtual void setOutputs(const neurun::graph::operand::IndexSet &indexes) override {}
   virtual const ::internal::tflite::op::Node *op() const { return nullptr; }
 };
 
@@ -27,6 +27,6 @@ TEST(graph_operation_Set, operation_test)
   Set set;
   set.append(std::unique_ptr<Node>(new TestNode()));
   Index idx{0u};
-  ASSERT_EQ(set.at(idx).inputs().size(), 4);
-  ASSERT_EQ(set.at(idx).outputs().size(), 3);
+  ASSERT_EQ(set.at(idx).getInputs().size(), 4);
+  ASSERT_EQ(set.at(idx).getOutputs().size(), 3);
 }

diff --git a/runtimes/neurun/test/graph/operation/SetIO.cc b/runtimes/neurun/test/graph/operation/SetIO.cc
index 46bf1c9..9ca1f93 100644 (file)
--- a/runtimes/neurun/test/graph/operation/SetIO.cc
+++ b/runtimes/neurun/test/graph/operation/SetIO.cc
@@ -35,10 +35,10 @@ TEST(graph_operation_setIO, operation_setIO_conv)
   auto conv = nnfw::make_unique<GraphNode>(
       nnfw::make_unique<Node>(Param(7, params.data(), 1, &outoperand)));
 
-  ASSERT_EQ(conv->inputs().at(Index{0}).asInt(), params[0]);
-  conv->inputs({8});
-  ASSERT_NE(conv->inputs().at(Index{0}).asInt(), params[0]);
-  ASSERT_EQ(conv->inputs().at(Index{0}).asInt(), 8);
+  ASSERT_EQ(conv->getInputs().at(Index{0}).asInt(), params[0]);
+  conv->setInputs({8});
+  ASSERT_NE(conv->getInputs().at(Index{0}).asInt(), params[0]);
+  ASSERT_EQ(conv->getInputs().at(Index{0}).asInt(), 8);
 }
 
 TEST(graph_operation_setIO, operation_setIO_concat)
@@ -64,13 +64,13 @@ TEST(graph_operation_setIO, operation_setIO_concat)
   auto concat = nnfw::make_unique<GraphNode>(
       nnfw::make_unique<Node>(Param(7, params.data(), 1, &outoperand)));
 
-  ASSERT_EQ(concat->inputs().size(), 6);
-  ASSERT_EQ(concat->inputs().at(Index{0}).asInt(), params[0]);
+  ASSERT_EQ(concat->getInputs().size(), 6);
+  ASSERT_EQ(concat->getInputs().at(Index{0}).asInt(), params[0]);
 
-  concat->inputs({80, 6, 9, 11});
-  ASSERT_EQ(concat->inputs().size(), 4);
-  ASSERT_NE(concat->inputs().at(Index{0}).asInt(), params[0]);
-  ASSERT_EQ(concat->inputs().at(Index{0}).asInt(), 80);
-  ASSERT_EQ(concat->inputs().at(Index{2}).asInt(), 9);
-  ASSERT_THROW(concat->inputs().at(Index{5}), std::out_of_range);
+  concat->setInputs({80, 6, 9, 11});
+  ASSERT_EQ(concat->getInputs().size(), 4);
+  ASSERT_NE(concat->getInputs().at(Index{0}).asInt(), params[0]);
+  ASSERT_EQ(concat->getInputs().at(Index{0}).asInt(), 80);
+  ASSERT_EQ(concat->getInputs().at(Index{2}).asInt(), 9);
+  ASSERT_THROW(concat->getInputs().at(Index{5}), std::out_of_range);
 }

diff --git a/runtimes/neurun/test/graph/verifier/Verifier.cc b/runtimes/neurun/test/graph/verifier/Verifier.cc
index bf27339..55b0dae 100644 (file)
--- a/runtimes/neurun/test/graph/verifier/Verifier.cc
+++ b/runtimes/neurun/test/graph/verifier/Verifier.cc
@@ -18,10 +18,10 @@ public:
   virtual void accept(neurun::graph::operation::NodeVisitor &&) const override {}
 
 public:
-  virtual neurun::graph::operand::IndexSet inputs() const override { return {_input}; }
-  virtual neurun::graph::operand::IndexSet outputs() const override { return {_output}; }
-  virtual void inputs(const neurun::graph::operand::IndexSet &indexes) override {}
-  virtual void outputs(const neurun::graph::operand::IndexSet &indexes) override {}
+  virtual neurun::graph::operand::IndexSet getInputs() const override { return {_input}; }
+  virtual neurun::graph::operand::IndexSet getOutputs() const override { return {_output}; }
+  virtual void setInputs(const neurun::graph::operand::IndexSet &indexes) override {}
+  virtual void setOutputs(const neurun::graph::operand::IndexSet &indexes) override {}
   virtual const ::internal::tflite::op::Node *op() const override { return nullptr; }
 
 private: