Introduce padding struct (#5210)

* Introduce padding struct

Introduce padding struct including padding type and explicit padding value
Use padding type field only

Signed-off-by: Hyeongseok Oh <hseok82.oh@samsung.com>
* Fix bug in debug build

diff --git a/runtimes/neurun/backend/acl_cl/StageGenerator.cc b/runtimes/neurun/backend/acl_cl/StageGenerator.cc
index 439ec7a..3a50ed2 100644 (file)
--- a/runtimes/neurun/backend/acl_cl/StageGenerator.cc
+++ b/runtimes/neurun/backend/acl_cl/StageGenerator.cc
@@ -254,7 +254,7 @@ void StageGenerator::visit(const model::operation::Conv2DNode &node)
   param.stride = stride;
 
   // TODO : Extract this to a function
-  const auto padding_type = node.param().padding;
+  const auto padding_type = node.param().padding.type;
   param.padding = [&]() {
     if (padding_type != model::PaddingType::EXPLICIT) // implicit padding
     {
@@ -351,7 +351,7 @@ void StageGenerator::visit(const model::operation::DepthwiseConv2DNode &node)
   param.stride = stride;
 
   // TODO : Extract this to a function
-  const auto padding_type = node.param().padding;
+  const auto padding_type = node.param().padding.type;
   param.padding = [&]() {
     if (padding_type != model::PaddingType::EXPLICIT) // implicit padding
     {
@@ -449,7 +449,7 @@ void StageGenerator::visit(const model::operation::MaxPool2DNode &node)
   param.stride.horizontal = hstride;
 
   // TODO : Extract this to a function
-  const auto padding_type = node.param().padding;
+  const auto padding_type = node.param().padding.type;
   param.padding = [&]() {
     if (padding_type != model::PaddingType::EXPLICIT) // implicit padding
     {
@@ -556,7 +556,7 @@ void StageGenerator::visit(const model::operation::AvgPool2DNode &node)
   param.stride.horizontal = hstride;
 
   // TODO : Extract this to a function
-  const auto padding_type = node.param().padding;
+  const auto padding_type = node.param().padding.type;
   param.padding = [&]() {
     if (padding_type != model::PaddingType::EXPLICIT) // implicit padding
     {
@@ -2018,7 +2018,7 @@ void StageGenerator::visit(const model::operation::L2Pool2DNode &node)
   param.stride = stride;
 
   // TODO : Extract this to a function
-  const auto padding_type = node.param().padding;
+  const auto padding_type = node.param().padding.type;
   param.padding = [&]() {
     if (padding_type != model::PaddingType::EXPLICIT) // implicit padding
     {
@@ -2314,7 +2314,7 @@ void StageGenerator::visit(const model::operation::TransposeConvNode &node)
   param.stride.horizontal = hstride;
   param.stride.vertical = vstride;
 
-  const auto padding_type = node.param().padding;
+  const auto padding_type = node.param().padding.type;
   assert((padding_type == model::PaddingType::SAME) || (padding_type == model::PaddingType::VALID));
   param.padding =
       (padding_type == model::PaddingType::SAME)

diff --git a/runtimes/neurun/backend/acl_neon/StageGenerator.cc b/runtimes/neurun/backend/acl_neon/StageGenerator.cc
index 72615ca..6f96e3d 100644 (file)
--- a/runtimes/neurun/backend/acl_neon/StageGenerator.cc
+++ b/runtimes/neurun/backend/acl_neon/StageGenerator.cc
@@ -221,7 +221,7 @@ void StageGenerator::visit(const model::operation::Conv2DNode &node)
   param.stride = stride;
 
   // TODO : Extract this to a function
-  const auto padding_type = node.param().padding;
+  const auto padding_type = node.param().padding.type;
   param.padding = [&]() {
     if (padding_type != model::PaddingType::EXPLICIT) // implicit padding
     {
@@ -318,7 +318,7 @@ void StageGenerator::visit(const model::operation::DepthwiseConv2DNode &node)
   param.stride = stride;
 
   // TODO : Extract this to a function
-  const auto padding_type = node.param().padding;
+  const auto padding_type = node.param().padding.type;
   param.padding = [&]() {
     if (padding_type != model::PaddingType::EXPLICIT) // implicit padding
     {
@@ -416,7 +416,7 @@ void StageGenerator::visit(const model::operation::MaxPool2DNode &node)
   param.stride.horizontal = hstride;
 
   // TODO : Extract this to a function
-  const auto padding_type = node.param().padding;
+  const auto padding_type = node.param().padding.type;
   param.padding = [&]() {
     if (padding_type != model::PaddingType::EXPLICIT) // implicit padding
     {
@@ -523,7 +523,7 @@ void StageGenerator::visit(const model::operation::AvgPool2DNode &node)
   param.stride.horizontal = hstride;
 
   // TODO : Extract this to a function
-  const auto padding_type = node.param().padding;
+  const auto padding_type = node.param().padding.type;
   param.padding = [&]() {
     if (padding_type != model::PaddingType::EXPLICIT) // implicit padding
     {

diff --git a/runtimes/neurun/backend/cpu/StageGenerator.cc b/runtimes/neurun/backend/cpu/StageGenerator.cc
index 3fb6bf0..799bfcb 100644 (file)
--- a/runtimes/neurun/backend/cpu/StageGenerator.cc
+++ b/runtimes/neurun/backend/cpu/StageGenerator.cc
@@ -104,7 +104,7 @@ void StageGenerator::visit(const model::operation::Conv2DNode &node)
   param.stride = stride;
 
   // TODO : Extract this to a function
-  const auto padding_type = node.param().padding;
+  const auto padding_type = node.param().padding.type;
   param.padding = [&]() {
     if (padding_type != model::PaddingType::EXPLICIT) // implicit padding
     {
@@ -209,7 +209,7 @@ void StageGenerator::visit(const model::operation::DepthwiseConv2DNode &node)
   param.stride = stride;
 
   // TODO : Extract this to a function
-  const auto padding_type = node.param().padding;
+  const auto padding_type = node.param().padding.type;
   param.padding = [&]() {
     if (padding_type != model::PaddingType::EXPLICIT) // implicit padding
     {
@@ -309,7 +309,7 @@ void StageGenerator::visit(const model::operation::MaxPool2DNode &node)
   param.stride.horizontal = hstride;
 
   // TODO : Extract this to a function
-  const auto padding_type = node.param().padding;
+  const auto padding_type = node.param().padding.type;
   param.padding = [&]() {
     if (padding_type != model::PaddingType::EXPLICIT) // implicit padding
     {
@@ -404,7 +404,7 @@ void StageGenerator::visit(const model::operation::AvgPool2DNode &node)
   param.stride.horizontal = hstride;
 
   // TODO : Extract this to a function
-  const auto padding_type = node.param().padding;
+  const auto padding_type = node.param().padding.type;
   param.padding = [&]() {
     if (padding_type != model::PaddingType::EXPLICIT) // implicit padding
     {

diff --git a/runtimes/neurun/core/include/model/InternalType.h b/runtimes/neurun/core/include/model/InternalType.h
index 54ba6bd..7cf9226 100644 (file)
--- a/runtimes/neurun/core/include/model/InternalType.h
+++ b/runtimes/neurun/core/include/model/InternalType.h
@@ -17,6 +17,8 @@
 #ifndef __NEURUN_MODEL_INTERNAL_TYPE_H__
 #define __NEURUN_MODEL_INTERNAL_TYPE_H__
 
+#include <cstdint>
+
 namespace neurun
 {
 namespace model
@@ -39,6 +41,22 @@ enum class PaddingType
   VALID = 2
 };
 
+// TODO merge with neurun::util::Padding struct
+struct ExplicitPadding
+{
+  int32_t left;
+  int32_t right;
+  int32_t top;
+  int32_t bottom;
+};
+
+// TODO Resolve explicit padding value at frontend and save in value field
+struct Padding
+{
+  PaddingType type;
+  ExplicitPadding value;
+};
+
 } // namespace model
 } // namespace neurun
 

diff --git a/runtimes/neurun/core/include/model/operation/AvgPool2DNode.h b/runtimes/neurun/core/include/model/operation/AvgPool2DNode.h
index dd62f55..cf0e54e 100644 (file)
--- a/runtimes/neurun/core/include/model/operation/AvgPool2DNode.h
+++ b/runtimes/neurun/core/include/model/operation/AvgPool2DNode.h
@@ -45,7 +45,7 @@ public:
     OperandIndex hstride_index;
     OperandIndex vstride_index;
 
-    PaddingType padding;
+    Padding padding;
 
     OperandIndex padding_left_index;
     OperandIndex padding_right_index;

diff --git a/runtimes/neurun/core/include/model/operation/Conv2DNode.h b/runtimes/neurun/core/include/model/operation/Conv2DNode.h
index be3f019..b5e314f 100644 (file)
--- a/runtimes/neurun/core/include/model/operation/Conv2DNode.h
+++ b/runtimes/neurun/core/include/model/operation/Conv2DNode.h
@@ -44,7 +44,7 @@ public:
     OperandIndex hstride_index;
     OperandIndex vstride_index;
 
-    PaddingType padding;
+    Padding padding;
 
     OperandIndex padding_left_index;
     OperandIndex padding_right_index;

diff --git a/runtimes/neurun/core/include/model/operation/DepthwiseConv2DNode.h b/runtimes/neurun/core/include/model/operation/DepthwiseConv2DNode.h
index ddd0d07..5d27eb5 100644 (file)
--- a/runtimes/neurun/core/include/model/operation/DepthwiseConv2DNode.h
+++ b/runtimes/neurun/core/include/model/operation/DepthwiseConv2DNode.h
@@ -44,7 +44,7 @@ public:
     OperandIndex hstride_index;
     OperandIndex vstride_index;
 
-    PaddingType padding;
+    Padding padding;
 
     OperandIndex padding_left_index;
     OperandIndex padding_right_index;

diff --git a/runtimes/neurun/core/include/model/operation/L2Pool2DNode.h b/runtimes/neurun/core/include/model/operation/L2Pool2DNode.h
index eedfbda..5fbddfb 100644 (file)
--- a/runtimes/neurun/core/include/model/operation/L2Pool2DNode.h
+++ b/runtimes/neurun/core/include/model/operation/L2Pool2DNode.h
@@ -39,7 +39,7 @@ public:
 
   struct Param
   {
-    PaddingType padding;
+    Padding padding;
 
     OperandIndex padding_left_index;
     OperandIndex padding_right_index;

diff --git a/runtimes/neurun/core/include/model/operation/MaxPool2DNode.h b/runtimes/neurun/core/include/model/operation/MaxPool2DNode.h
index 23626cf..8217e70 100644 (file)
--- a/runtimes/neurun/core/include/model/operation/MaxPool2DNode.h
+++ b/runtimes/neurun/core/include/model/operation/MaxPool2DNode.h
@@ -45,7 +45,7 @@ public:
     OperandIndex hstride_index;
     OperandIndex vstride_index;
 
-    PaddingType padding;
+    Padding padding;
 
     OperandIndex padding_left_index;
     OperandIndex padding_right_index;

diff --git a/runtimes/neurun/core/include/model/operation/TransposeConvNode.h b/runtimes/neurun/core/include/model/operation/TransposeConvNode.h
index 3247501..38ba3f5 100644 (file)
--- a/runtimes/neurun/core/include/model/operation/TransposeConvNode.h
+++ b/runtimes/neurun/core/include/model/operation/TransposeConvNode.h
@@ -41,7 +41,7 @@ public:
 
   struct Param
   {
-    PaddingType padding;
+    Padding padding;
     OperandIndex hstride_index;
     OperandIndex vstride_index;
   };

diff --git a/runtimes/neurun/core/src/compiler/OperationValidator.cc b/runtimes/neurun/core/src/compiler/OperationValidator.cc
index 9204c9d..927f7dc 100644 (file)
--- a/runtimes/neurun/core/src/compiler/OperationValidator.cc
+++ b/runtimes/neurun/core/src/compiler/OperationValidator.cc
@@ -356,8 +356,8 @@ void OperationValidator::visit(const model::operation::TransposeConvNode &node)
 
   assert(vstride > 0);
   assert(hstride > 0);
-  assert((node.param().padding == model::PaddingType::SAME) ||
-         (node.param().padding == model::PaddingType::VALID));
+  assert((node.param().padding.type == model::PaddingType::SAME) ||
+         (node.param().padding.type == model::PaddingType::VALID));
   assert(ifm_shape.N == ofm_shape.N);
   assert(ifm_shape.C == ker_shape.C);
   assert(ker_shape.N == ofm_shape.C);

diff --git a/runtimes/neurun/core/src/graph/dumper/Dumper.cc b/runtimes/neurun/core/src/graph/dumper/Dumper.cc
index 771a685..92514a4 100644 (file)
--- a/runtimes/neurun/core/src/graph/dumper/Dumper.cc
+++ b/runtimes/neurun/core/src/graph/dumper/Dumper.cc
@@ -93,7 +93,7 @@ void Dumper::visit(const ConcatNode &node)
 void Dumper::visit(const Conv2DNode &node)
 {
   std::string padding_type =
-      node.param().padding == model::PaddingType::EXPLICIT ? "Explicit" : "Implicit";
+      node.param().padding.type == model::PaddingType::EXPLICIT ? "Explicit" : "Implicit";
   VERBOSE(LIR) << "* Conv2D(" << padding_type << ")" << std::endl;
   VERBOSE(LIR) << "  - Inputs : IFM(" << node.getInputs().at(Conv2DNode::Input::INPUT).value()
                << ") Kernel(" << node.getInputs().at(Conv2DNode::Input::KERNEL).value() << ") Bias("
@@ -112,7 +112,7 @@ void Dumper::visit(const DepthToSpaceNode &node)
 void Dumper::visit(const DepthwiseConv2DNode &node)
 {
   std::string padding_type =
-      node.param().padding == model::PaddingType::EXPLICIT ? "Explicit" : "Implicit";
+      node.param().padding.type == model::PaddingType::EXPLICIT ? "Explicit" : "Implicit";
   VERBOSE(LIR) << "* DepthwiseConv2D(" << padding_type << ")" << std::endl;
   VERBOSE(LIR) << "  - Inputs : IFM("
                << node.getInputs().at(DepthwiseConv2DNode::Input::INPUT).value() << ") Kernel("
@@ -259,7 +259,7 @@ void Dumper::visit(const LogisticNode &node)
 void Dumper::visit(const MaxPool2DNode &node)
 {
   std::string padding_type =
-      node.param().padding == model::PaddingType::EXPLICIT ? "Explicit" : "Implicit";
+      node.param().padding.type == model::PaddingType::EXPLICIT ? "Explicit" : "Implicit";
   VERBOSE(LIR) << "* MaxPool2D(" << padding_type << ")" << std::endl;
   VERBOSE(LIR) << "  - Inputs : IFM(" << node.getInputs().at(MaxPool2DNode::Input::INPUT).value()
                << ")" << std::endl;
@@ -469,7 +469,7 @@ void Dumper::visit(const TopKV2Node &node)
 void Dumper::visit(const TransposeConvNode &node)
 {
   std::string padding_type =
-      node.param().padding == model::PaddingType::EXPLICIT ? "Explicit" : "Implicit";
+      node.param().padding.type == model::PaddingType::EXPLICIT ? "Explicit" : "Implicit";
   VERBOSE(LIR) << "* TransposeConv(" << padding_type << ")" << std::endl;
   VERBOSE(LIR) << "  - Inputs : Output Shape("
                << node.getInputs().at(TransposeConvNode::Input::OUTPUT_SHAPE).value() << ") KERNEL("

diff --git a/runtimes/neurun/frontend/nnapi/wrapper/OperationFactory.cc b/runtimes/neurun/frontend/nnapi/wrapper/OperationFactory.cc
index d30dc3d..a59854a 100644 (file)
--- a/runtimes/neurun/frontend/nnapi/wrapper/OperationFactory.cc
+++ b/runtimes/neurun/frontend/nnapi/wrapper/OperationFactory.cc
@@ -68,7 +68,7 @@ OperationFactory::OperationFactory()
       const auto padding_index = OperandIndex{init_param.inputs[3]};
       const auto activation_index = OperandIndex{init_param.inputs[7]};
 
-      param.padding =
+      param.padding.type =
           NNAPIConvert::getPaddingType(operands.at(padding_index).asScalar<PaddingCode>());
       param.hstride_index = OperandIndex{init_param.inputs[4]};
       param.vstride_index = OperandIndex{init_param.inputs[5]};
@@ -92,7 +92,7 @@ OperationFactory::OperationFactory()
 
       const auto activation_index = OperandIndex{init_param.inputs[10]};
 
-      param.padding = PaddingType::EXPLICIT;
+      param.padding.type = PaddingType::EXPLICIT;
       param.padding_left_index = OperandIndex{init_param.inputs[3]};
       param.padding_right_index = OperandIndex{init_param.inputs[4]};
       param.padding_top_index = OperandIndex{init_param.inputs[5]};
@@ -132,7 +132,7 @@ OperationFactory::OperationFactory()
       const auto padding_index = OperandIndex{init_param.inputs[1]};
       const auto activation_index = OperandIndex{init_param.inputs[6]};
 
-      param.padding =
+      param.padding.type =
           NNAPIConvert::getPaddingType(operands.at(padding_index).asScalar<PaddingCode>());
 
       param.hstride_index = OperandIndex{init_param.inputs[2]};
@@ -159,7 +159,7 @@ OperationFactory::OperationFactory()
 
       const auto activation_index = OperandIndex{init_param.inputs[9]};
 
-      param.padding = PaddingType::EXPLICIT;
+      param.padding.type = PaddingType::EXPLICIT;
 
       param.padding_left_index = OperandIndex{init_param.inputs[1]};
       param.padding_right_index = OperandIndex{init_param.inputs[2]};
@@ -202,7 +202,7 @@ OperationFactory::OperationFactory()
       const auto padding_index = OperandIndex{init_param.inputs[1]};
       const auto activation_index = OperandIndex{init_param.inputs[6]};
 
-      param.padding =
+      param.padding.type =
           NNAPIConvert::getPaddingType(operands.at(padding_index).asScalar<PaddingCode>());
       param.hstride_index = OperandIndex{init_param.inputs[2]};
       param.vstride_index = OperandIndex{init_param.inputs[3]};
@@ -228,7 +228,7 @@ OperationFactory::OperationFactory()
 
       auto activation_index = OperandIndex{init_param.inputs[9]};
 
-      param.padding = PaddingType::EXPLICIT;
+      param.padding.type = PaddingType::EXPLICIT;
 
       param.padding_left_index = OperandIndex{init_param.inputs[1]};
       param.padding_right_index = OperandIndex{init_param.inputs[2]};
@@ -372,7 +372,7 @@ OperationFactory::OperationFactory()
       const auto padding_index = OperandIndex{init_param.inputs[3]};
       const auto activation_index = OperandIndex{init_param.inputs[6]};
 
-      param.padding =
+      param.padding.type =
           NNAPIConvert::getPaddingType(operands.at(padding_index).asScalar<PaddingCode>());
       param.hstride_index = OperandIndex{init_param.inputs[4]};
       param.vstride_index = OperandIndex{init_param.inputs[5]};
@@ -393,7 +393,7 @@ OperationFactory::OperationFactory()
 
       const auto activation_index = OperandIndex{init_param.inputs[6]};
 
-      param.padding = PaddingType::EXPLICIT;
+      param.padding.type = PaddingType::EXPLICIT;
       param.padding_left_index = OperandIndex{init_param.inputs[3]};
       param.padding_right_index = OperandIndex{init_param.inputs[4]};
       param.padding_top_index = OperandIndex{init_param.inputs[5]};
@@ -882,7 +882,7 @@ OperationFactory::OperationFactory()
       const auto padding_index = OperandIndex{init_param.inputs[1]};
       const auto activation_index = OperandIndex{init_param.inputs[6]};
 
-      param.padding =
+      param.padding.type =
           NNAPIConvert::getPaddingType(operands.at(padding_index).asScalar<PaddingCode>());
       param.hstride_index = OperandIndex{init_param.inputs[2]};
       param.vstride_index = OperandIndex{init_param.inputs[3]};
@@ -904,7 +904,7 @@ OperationFactory::OperationFactory()
       //  9 -> FuseCode (activation) Index
       const auto activation_index = OperandIndex{init_param.inputs[9]};
 
-      param.padding = PaddingType::EXPLICIT;
+      param.padding.type = PaddingType::EXPLICIT;
       param.padding_left_index = OperandIndex{init_param.inputs[1]};
       param.padding_right_index = OperandIndex{init_param.inputs[2]};
       param.padding_top_index = OperandIndex{init_param.inputs[3]};
@@ -1002,7 +1002,7 @@ OperationFactory::OperationFactory()
 
     operation::TransposeConvNode::Param param;
     auto padding_index = OperandIndex{init_param.inputs[3]};
-    param.padding =
+    param.padding.type =
         NNAPIConvert::getPaddingType(operands.at(padding_index).asScalar<PaddingCode>());
     param.hstride_index = OperandIndex{init_param.inputs[4]};
     param.vstride_index = OperandIndex{init_param.inputs[5]};

diff --git a/runtimes/neurun/test/graph/operation/SetIO.cc b/runtimes/neurun/test/graph/operation/SetIO.cc
index b41065f..b98b914 100644 (file)
--- a/runtimes/neurun/test/graph/operation/SetIO.cc
+++ b/runtimes/neurun/test/graph/operation/SetIO.cc
@@ -46,7 +46,7 @@ TEST(graph_operation_setIO, operation_setIO_conv)
   IndexSet inputs{input_operand, kernel_operand, bias_operand};
 
   GraphNode::Param conv_params;
-  conv_params.padding = neurun::model::PaddingType::SAME;
+  conv_params.padding.type = neurun::model::PaddingType::SAME;
   conv_params.hstride_index = model.operands.append(shape, type);
   conv_params.vstride_index = model.operands.append(shape, type);
   conv_params.activation = neurun::model::Activation::NONE;