[tflchef] Support AveragePool2D (#2175)

This patch extends tflchef for AveragePool2D operator.

Signed-off-by: Sanggyu Lee <sg5.lee@samsung.com>

diff --git a/contrib/tflchef/core/src/Op/AveragePool2D.cpp b/contrib/tflchef/core/src/Op/AveragePool2D.cpp
new file mode 100644 (file)
index 0000000..84d6a75
--- /dev/null
+++ b/contrib/tflchef/core/src/Op/AveragePool2D.cpp
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd. All Rights Reserved
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "AveragePool2D.h"
+#include "Convert.h"
+
+#include <cassert>
+
+flatbuffers::Offset<void> AveragePool2DChef::value(flatbuffers::FlatBufferBuilder &fbb) const
+{
+  auto &operation = (*_operation);
+
+  assert(operation.has_averagepool2d_options());
+
+  auto options = operation.averagepool2d_options();
+
+  auto tflite_padding = as_tflite_padding(options.padding());
+  auto tflite_activation = as_tflite_activation(options.activation());
+
+  tflite::Pool2DOptionsBuilder options_builder{fbb};
+  options_builder.add_padding(tflite_padding);
+  options_builder.add_stride_h(options.stride_h());
+  options_builder.add_stride_w(options.stride_w());
+  options_builder.add_filter_width(options.filter_width());
+  options_builder.add_filter_height(options.filter_height());
+  options_builder.add_fused_activation_function(tflite_activation);
+
+  return options_builder.Finish().Union();
+}
+
+std::unique_ptr<OpChef> AveragePool2DChefFactory::create(const tflchef::Operation *operation) const
+{
+  return std::unique_ptr<OpChef>{new AveragePool2DChef{operation}};
+}

diff --git a/contrib/tflchef/core/src/Op/AveragePool2D.h b/contrib/tflchef/core/src/Op/AveragePool2D.h
new file mode 100644 (file)
index 0000000..652fae2
--- /dev/null
+++ b/contrib/tflchef/core/src/Op/AveragePool2D.h
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd. All Rights Reserved
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __OP_AVERAGE_POOL_2D_H__
+#define __OP_AVERAGE_POOL_2D_H__
+
+#include "OpChef.h"
+
+class AveragePool2DChef final : public OpChef
+{
+public:
+  explicit AveragePool2DChef(const tflchef::Operation *operation) : _operation{operation}
+  {
+    // DO NOTHING
+  }
+
+public:
+  tflite::BuiltinOperator code(void) const override
+  {
+    return tflite::BuiltinOperator_AVERAGE_POOL_2D;
+  }
+
+  tflite::BuiltinOptions type(void) const override { return tflite::BuiltinOptions_Pool2DOptions; }
+
+  flatbuffers::Offset<void> value(flatbuffers::FlatBufferBuilder &fbb) const override;
+
+private:
+  const tflchef::Operation *_operation;
+};
+
+struct AveragePool2DChefFactory final : public OpChefFactory
+{
+  std::unique_ptr<OpChef> create(const tflchef::Operation *operation) const override;
+};
+
+#endif // __OP_AVERAGE_POOL_2D_H__

diff --git a/contrib/tflchef/core/src/OpChef.def b/contrib/tflchef/core/src/OpChef.def
index 824375b..479ca3f 100644 (file)
--- a/contrib/tflchef/core/src/OpChef.def
+++ b/contrib/tflchef/core/src/OpChef.def
@@ -2,6 +2,8 @@
 #error "Define OP first"
 #endif // OP_CHEF
 
+// Please keep the list in alphabetical order
 // OP_CHEF(NAME, FACTORY_CLASS)
+OP_CHEF(AveragePool2D, AveragePool2DChefFactory)
 OP_CHEF(Conv2D, Conv2DChefFactory)
 OP_CHEF(ReLU6, ReLU6ChefFactory)

diff --git a/contrib/tflchef/core/src/OpChefs.h b/contrib/tflchef/core/src/OpChefs.h
index 2a40721..f1c8f2b 100644 (file)
--- a/contrib/tflchef/core/src/OpChefs.h
+++ b/contrib/tflchef/core/src/OpChefs.h
@@ -17,6 +17,7 @@
 #ifndef __OP_CHEFS_H__
 #define __OP_CHEFS_H__
 
+#include "Op/AveragePool2D.h"
 #include "Op/Conv2D.h"
 #include "Op/ReLU6.h"
 

diff --git a/contrib/tflchef/proto/tflchef.proto b/contrib/tflchef/proto/tflchef.proto
index 3308414..4d84733 100644 (file)
--- a/contrib/tflchef/proto/tflchef.proto
+++ b/contrib/tflchef/proto/tflchef.proto
@@ -44,12 +44,22 @@ message Conv2DOptions
   optional Activation activation = 4 [default = NONE];
 }
 
+message Pool2DOptions {
+  optional Padding padding = 1 [default = VALID];
+  optional int32 stride_w = 2 [default = 1];
+  optional int32 stride_h = 3 [default = 1];
+  optional int32 filter_width = 4 [default = 1];
+  optional int32 filter_height = 5 [ default = 1];
+  optional Activation activation = 6 [default = NONE];
+}
+
 message Operation {
   optional string type = 1;
   repeated string input = 2;
   repeated string output = 3;
 
   optional Conv2DOptions conv2d_options = 100;
+  optional Pool2DOptions averagepool2d_options = 101;
 }
 
 message ModelRecipe {

diff --git a/contrib/tflchef/tests/averagepool2d/test.recipe b/contrib/tflchef/tests/averagepool2d/test.recipe
new file mode 100644 (file)
index 0000000..5ad1466
--- /dev/null
+++ b/contrib/tflchef/tests/averagepool2d/test.recipe
@@ -0,0 +1,33 @@
+operand {
+  name: "ifm"
+  type: FLOAT32
+  shape { dim: 1 dim: 8 dim: 8 dim: 1 }
+}
+operand {
+  name: "bias"
+  type: FLOAT32
+  shape { dim: 1 }
+  filler {
+    tag: "constant"
+    arg: "1.1"
+  }
+}
+operand {
+  name: "ofm"
+  type: FLOAT32
+  shape { dim: 1 dim: 7 dim: 7 dim: 1 }
+}
+operation {
+  type: "AveragePool2D"
+  averagepool2d_options {
+    padding: VALID
+    stride_w: 1
+    stride_h: 1
+    filter_width: 2
+    filter_height: 2
+  }
+  input: "ifm"
+  output: "ofm"
+}
+input: "ifm"
+output: "ofm"