From 78b97c3c45b2735a98bcaa17822c8ce12f4e2286 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=EC=B5=9C=EC=84=B1=EC=A7=84/=EB=8F=99=EC=9E=91=EC=A0=9C?= =?utf8?q?=EC=96=B4Lab=28SR=29/Principal=20Engineer/=EC=82=BC=EC=84=B1?= =?utf8?q?=EC=A0=84=EC=9E=90?= Date: Wed, 11 Jul 2018 17:33:13 +0900 Subject: [PATCH] Change from implicit namespace to Explicit (#1938) This commit alters namesapce name for consistency. - change form implicit to Implicit to keep consistent with Explicit. Signed-off-by: SungJin Choi --- runtimes/pure_arm_compute/src/compilation.cc | 16 ++++++++-------- runtimes/pure_arm_compute/src/internal/op/AvgPool2D.cc | 8 ++++---- runtimes/pure_arm_compute/src/internal/op/AvgPool2D.h | 4 ++-- runtimes/pure_arm_compute/src/internal/op/Conv2D.cc | 8 ++++---- runtimes/pure_arm_compute/src/internal/op/Conv2D.h | 4 ++-- .../pure_arm_compute/src/internal/op/DepthwiseConv2D.cc | 8 ++++---- .../pure_arm_compute/src/internal/op/DepthwiseConv2D.h | 4 ++-- runtimes/pure_arm_compute/src/internal/op/MaxPool2D.cc | 8 ++++---- runtimes/pure_arm_compute/src/internal/op/MaxPool2D.h | 4 ++-- runtimes/pure_arm_compute/src/internal/op/NodeVisitor.h | 8 ++++---- runtimes/pure_arm_compute/src/model.cc | 16 ++++++++-------- 11 files changed, 44 insertions(+), 44 deletions(-) diff --git a/runtimes/pure_arm_compute/src/compilation.cc b/runtimes/pure_arm_compute/src/compilation.cc index 9b87ffd..4ddd5cf 100644 --- a/runtimes/pure_arm_compute/src/compilation.cc +++ b/runtimes/pure_arm_compute/src/compilation.cc @@ -326,14 +326,14 @@ public: void visit(const ::internal::tflite::op::Sub::Node &node) override; void visit(const ::internal::tflite::op::Mul::Node &node) override; void visit(const ::internal::tflite::op::Div::Node &node) override; - void visit(const ::internal::tflite::op::Conv2D::implicit::Node &node) override; + void visit(const ::internal::tflite::op::Conv2D::Implicit::Node &node) override; void visit(const ::internal::tflite::op::Conv2D::Explicit::Node &node) override; - void visit(const ::internal::tflite::op::DepthwiseConv2D::implicit::Node &node) override; + void visit(const ::internal::tflite::op::DepthwiseConv2D::Implicit::Node &node) override; void visit(const ::internal::tflite::op::DepthwiseConv2D::Explicit::Node &node) override; void visit(const ::internal::tflite::op::Dequantize::Node &node) override; - void visit(const ::internal::tflite::op::MaxPool2D::implicit::Node &node) override; + void visit(const ::internal::tflite::op::MaxPool2D::Implicit::Node &node) override; void visit(const ::internal::tflite::op::MaxPool2D::Explicit::Node &node) override; - void visit(const ::internal::tflite::op::AvgPool2D::implicit::Node &node) override; + void visit(const ::internal::tflite::op::AvgPool2D::Implicit::Node &node) override; void visit(const ::internal::tflite::op::AvgPool2D::Explicit::Node &node) override; void visit(const ::internal::tflite::op::Concat::Node &node) override; void visit(const ::internal::tflite::op::FullyConnected::Node &node) override; @@ -674,7 +674,7 @@ void Planner::visit(const ::internal::tflite::op::Div::Node &node) _builder.addStage(stage); } -void Planner::visit(const ::internal::tflite::op::Conv2D::implicit::Node &node) +void Planner::visit(const ::internal::tflite::op::Conv2D::Implicit::Node &node) { const ::internal::tflite::operand::Index ofm_index{node.param().ofm_index}; @@ -971,7 +971,7 @@ void Planner::visit(const ::internal::tflite::op::Conv2D::Explicit::Node &node) _builder.addStage(stage); } -void Planner::visit(const ::internal::tflite::op::DepthwiseConv2D::implicit::Node &node) +void Planner::visit(const ::internal::tflite::op::DepthwiseConv2D::Implicit::Node &node) { const ::internal::tflite::operand::Index ofm_index{node.param().ofm_index}; @@ -1284,7 +1284,7 @@ void Planner::visit(const ::internal::tflite::op::Dequantize::Node &node) _builder.addStage(stage); } -void Planner::visit(const ::internal::tflite::op::MaxPool2D::implicit::Node &node) +void Planner::visit(const ::internal::tflite::op::MaxPool2D::Implicit::Node &node) { const ::internal::tflite::operand::Index ofm_index{node.param().ofm_index}; const ::internal::tflite::operand::Index ifm_index{node.param().ifm_index}; @@ -1486,7 +1486,7 @@ void Planner::visit(const ::internal::tflite::op::MaxPool2D::Explicit::Node &nod _builder.addStage(stage); } -void Planner::visit(const ::internal::tflite::op::AvgPool2D::implicit::Node &node) +void Planner::visit(const ::internal::tflite::op::AvgPool2D::Implicit::Node &node) { const ::internal::tflite::operand::Index ofm_index{node.param().ofm_index}; const ::internal::tflite::operand::Index ifm_index{node.param().ifm_index}; diff --git a/runtimes/pure_arm_compute/src/internal/op/AvgPool2D.cc b/runtimes/pure_arm_compute/src/internal/op/AvgPool2D.cc index 0e7a680..665c5c6 100644 --- a/runtimes/pure_arm_compute/src/internal/op/AvgPool2D.cc +++ b/runtimes/pure_arm_compute/src/internal/op/AvgPool2D.cc @@ -18,12 +18,12 @@ void Node::accept(NodeVisitor &&v) const { v.visit(*this); } } // namespace Explicit -namespace implicit +namespace Implicit { void Node::accept(NodeVisitor &&v) const { v.visit(*this); } -} // namespace implicit +} // namespace Implicit } // namespace AvgPool2D } // namespace op } // namespace tflite @@ -73,7 +73,7 @@ Param::Param(uint32_t inputCount, const uint32_t *inputs, uint32_t outputCount, } // namespace Explicit -namespace implicit +namespace Implicit { Param::Param(uint32_t inputCount, const uint32_t *inputs, uint32_t outputCount, @@ -101,7 +101,7 @@ Param::Param(uint32_t inputCount, const uint32_t *inputs, uint32_t outputCount, activation_index = inputs[6]; } -} // namespace implicit +} // namespace Implicit } // namespace AvgPool2D } // namespace op } // namespace tflite diff --git a/runtimes/pure_arm_compute/src/internal/op/AvgPool2D.h b/runtimes/pure_arm_compute/src/internal/op/AvgPool2D.h index e342582..594a759 100644 --- a/runtimes/pure_arm_compute/src/internal/op/AvgPool2D.h +++ b/runtimes/pure_arm_compute/src/internal/op/AvgPool2D.h @@ -62,7 +62,7 @@ private: } // namespace Explicit -namespace implicit +namespace Implicit { struct Param @@ -105,7 +105,7 @@ private: const Param _param; }; -} // namespace implicit +} // namespace Implicit } // namespace AvgPool2D } // namespace op } // namespace tflite diff --git a/runtimes/pure_arm_compute/src/internal/op/Conv2D.cc b/runtimes/pure_arm_compute/src/internal/op/Conv2D.cc index 27b6822..dacd2a9 100644 --- a/runtimes/pure_arm_compute/src/internal/op/Conv2D.cc +++ b/runtimes/pure_arm_compute/src/internal/op/Conv2D.cc @@ -18,12 +18,12 @@ void Node::accept(NodeVisitor &&v) const { v.visit(*this); } } // namespace Explicit -namespace implicit +namespace Implicit { void Node::accept(NodeVisitor &&v) const { v.visit(*this); } -} // namespace implicit +} // namespace Implicit } // namespace Conv2D } // namespace op } // namespace tflite @@ -74,7 +74,7 @@ Param::Param(uint32_t inputCount, const uint32_t *inputs, uint32_t outputCount, } // namespace Explicit -namespace implicit +namespace Implicit { Param::Param(uint32_t inputCount, const uint32_t *inputs, uint32_t outputCount, @@ -103,7 +103,7 @@ Param::Param(uint32_t inputCount, const uint32_t *inputs, uint32_t outputCount, activation_index = inputs[6]; } -} // namespace implicit +} // namespace Implicit } // namespace Conv2D } // namespace op } // namespace tflite diff --git a/runtimes/pure_arm_compute/src/internal/op/Conv2D.h b/runtimes/pure_arm_compute/src/internal/op/Conv2D.h index 07cfa9c..6202b26 100644 --- a/runtimes/pure_arm_compute/src/internal/op/Conv2D.h +++ b/runtimes/pure_arm_compute/src/internal/op/Conv2D.h @@ -61,7 +61,7 @@ private: } // namespace Explicit -namespace implicit +namespace Implicit { struct Param @@ -103,7 +103,7 @@ private: const Param _param; }; -} // namespace implicit +} // namespace Implicit } // namespace Conv2D } // namespace op } // namespace tflite diff --git a/runtimes/pure_arm_compute/src/internal/op/DepthwiseConv2D.cc b/runtimes/pure_arm_compute/src/internal/op/DepthwiseConv2D.cc index c998810..c3afc7d 100644 --- a/runtimes/pure_arm_compute/src/internal/op/DepthwiseConv2D.cc +++ b/runtimes/pure_arm_compute/src/internal/op/DepthwiseConv2D.cc @@ -18,12 +18,12 @@ void Node::accept(NodeVisitor &&v) const { v.visit(*this); } } // namespace Explicit -namespace implicit +namespace Implicit { void Node::accept(NodeVisitor &&v) const { v.visit(*this); } -} // namespace implicit +} // namespace Implicit } // namespace DepthwiseConv2D } // namespace op } // namespace tflite @@ -75,7 +75,7 @@ Param::Param(uint32_t inputCount, const uint32_t *inputs, uint32_t outputCount, } // namespace Explicit -namespace implicit +namespace Implicit { Param::Param(uint32_t inputCount, const uint32_t *inputs, uint32_t outputCount, @@ -105,7 +105,7 @@ Param::Param(uint32_t inputCount, const uint32_t *inputs, uint32_t outputCount, activation_index = inputs[7]; } -} // namespace implicit +} // namespace Implicit } // namespace DepthwiseConv2D } // namespace op } // namespace tflite diff --git a/runtimes/pure_arm_compute/src/internal/op/DepthwiseConv2D.h b/runtimes/pure_arm_compute/src/internal/op/DepthwiseConv2D.h index d6f86a6..460bfe8 100644 --- a/runtimes/pure_arm_compute/src/internal/op/DepthwiseConv2D.h +++ b/runtimes/pure_arm_compute/src/internal/op/DepthwiseConv2D.h @@ -62,7 +62,7 @@ private: } // namespace Explicit -namespace implicit +namespace Implicit { struct Param @@ -105,7 +105,7 @@ private: const Param _param; }; -} // namespace implicit +} // namespace Implicit } // namespace DepthwiseConv2D } // namespace op } // namespace tflite diff --git a/runtimes/pure_arm_compute/src/internal/op/MaxPool2D.cc b/runtimes/pure_arm_compute/src/internal/op/MaxPool2D.cc index 5a1f811..6ac2573 100644 --- a/runtimes/pure_arm_compute/src/internal/op/MaxPool2D.cc +++ b/runtimes/pure_arm_compute/src/internal/op/MaxPool2D.cc @@ -18,12 +18,12 @@ void Node::accept(NodeVisitor &&v) const { v.visit(*this); } } // namespace Explicit -namespace implicit +namespace Implicit { void Node::accept(NodeVisitor &&v) const { v.visit(*this); } -} // namespace implicit +} // namespace Implicit } // namespace MaxPool2D } // namespace op } // namespace tflite @@ -73,7 +73,7 @@ Param::Param(uint32_t inputCount, const uint32_t *inputs, uint32_t outputCount, } // namespace Explicit -namespace implicit +namespace Implicit { Param::Param(uint32_t inputCount, const uint32_t *inputs, uint32_t outputCount, @@ -101,7 +101,7 @@ Param::Param(uint32_t inputCount, const uint32_t *inputs, uint32_t outputCount, activation_index = inputs[6]; } -} // namespace implicit +} // namespace Implicit } // namespace MaxPool2D } // namespace op } // namespace tflite diff --git a/runtimes/pure_arm_compute/src/internal/op/MaxPool2D.h b/runtimes/pure_arm_compute/src/internal/op/MaxPool2D.h index 6473093..23313df 100644 --- a/runtimes/pure_arm_compute/src/internal/op/MaxPool2D.h +++ b/runtimes/pure_arm_compute/src/internal/op/MaxPool2D.h @@ -62,7 +62,7 @@ private: } // namespace Explicit -namespace implicit +namespace Implicit { struct Param @@ -105,7 +105,7 @@ private: const Param _param; }; -} // namespace implicit +} // namespace Implicit } // namespace MaxPool2D } // namespace op } // namespace tflite diff --git a/runtimes/pure_arm_compute/src/internal/op/NodeVisitor.h b/runtimes/pure_arm_compute/src/internal/op/NodeVisitor.h index fb8c6bb..6fc5e33 100644 --- a/runtimes/pure_arm_compute/src/internal/op/NodeVisitor.h +++ b/runtimes/pure_arm_compute/src/internal/op/NodeVisitor.h @@ -40,14 +40,14 @@ struct NodeVisitor virtual void visit(const Sub::Node &) = 0; virtual void visit(const Mul::Node &) = 0; virtual void visit(const Div::Node &) = 0; - virtual void visit(const Conv2D::implicit::Node &) = 0; + virtual void visit(const Conv2D::Implicit::Node &) = 0; virtual void visit(const Conv2D::Explicit::Node &) = 0; - virtual void visit(const DepthwiseConv2D::implicit::Node &) = 0; + virtual void visit(const DepthwiseConv2D::Implicit::Node &) = 0; virtual void visit(const DepthwiseConv2D::Explicit::Node &) = 0; virtual void visit(const Dequantize::Node &) = 0; - virtual void visit(const MaxPool2D::implicit::Node &) = 0; + virtual void visit(const MaxPool2D::Implicit::Node &) = 0; virtual void visit(const MaxPool2D::Explicit::Node &) = 0; - virtual void visit(const AvgPool2D::implicit::Node &) = 0; + virtual void visit(const AvgPool2D::Implicit::Node &) = 0; virtual void visit(const AvgPool2D::Explicit::Node &) = 0; virtual void visit(const Concat::Node &) = 0; virtual void visit(const Reshape::Node &) = 0; diff --git a/runtimes/pure_arm_compute/src/model.cc b/runtimes/pure_arm_compute/src/model.cc index 65f6684..b5959cd 100644 --- a/runtimes/pure_arm_compute/src/model.cc +++ b/runtimes/pure_arm_compute/src/model.cc @@ -145,8 +145,8 @@ int ANeuralNetworksModel_addOperation(ANeuralNetworksModel *model, if (inputCount == 7) { - using internal::tflite::op::Conv2D::implicit::Param; - using internal::tflite::op::Conv2D::implicit::Node; + using internal::tflite::op::Conv2D::Implicit::Param; + using internal::tflite::op::Conv2D::Implicit::Node; // Add 'operations' auto &operations = model->deref().operations(); @@ -176,8 +176,8 @@ int ANeuralNetworksModel_addOperation(ANeuralNetworksModel *model, if (inputCount == 8) { - using internal::tflite::op::DepthwiseConv2D::implicit::Param; - using internal::tflite::op::DepthwiseConv2D::implicit::Node; + using internal::tflite::op::DepthwiseConv2D::Implicit::Param; + using internal::tflite::op::DepthwiseConv2D::Implicit::Node; // Add 'operations' auto &operations = model->deref().operations(); @@ -207,8 +207,8 @@ int ANeuralNetworksModel_addOperation(ANeuralNetworksModel *model, if (inputCount == 7) { - using internal::tflite::op::MaxPool2D::implicit::Param; - using internal::tflite::op::MaxPool2D::implicit::Node; + using internal::tflite::op::MaxPool2D::Implicit::Param; + using internal::tflite::op::MaxPool2D::Implicit::Node; // Add 'operations' auto &operations = model->deref().operations(); @@ -251,8 +251,8 @@ int ANeuralNetworksModel_addOperation(ANeuralNetworksModel *model, if (inputCount == 7) { - using internal::tflite::op::AvgPool2D::implicit::Param; - using internal::tflite::op::AvgPool2D::implicit::Node; + using internal::tflite::op::AvgPool2D::Implicit::Param; + using internal::tflite::op::AvgPool2D::Implicit::Node; // Add 'operations' auto &operations = model->deref().operations(); -- 2.7.4