[tflchef] Support DepthwiseConv2D (#2277)

This patch extends tflchef for DepthwiseConv2D operator.

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

diff --git a/contrib/tflchef/core/src/Op/DepthwiseConv2D.cpp b/contrib/tflchef/core/src/Op/DepthwiseConv2D.cpp
new file mode 100644 (file)
index 0000000..e04cf50
--- /dev/null
+++ b/contrib/tflchef/core/src/Op/DepthwiseConv2D.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 "DepthwiseConv2D.h"
+#include "Convert.h"
+
+#include <cassert>
+
+flatbuffers::Offset<void> DepthwiseConv2DChef::value(flatbuffers::FlatBufferBuilder &fbb) const
+{
+  auto &operation = (*_operation);
+
+  assert(operation.has_depthwiseconv2d_options());
+
+  auto options = operation.depthwiseconv2d_options();
+
+  auto tflite_padding = as_tflite_padding(options.padding());
+  auto tflite_activation = as_tflite_activation(options.activation());
+
+  tflite::DepthwiseConv2DOptionsBuilder options_builder{fbb};
+  options_builder.add_padding(tflite_padding);
+  options_builder.add_stride_w(options.stride_w());
+  options_builder.add_stride_h(options.stride_h());
+  options_builder.add_depth_multiplier(options.depth_multiplier());
+  options_builder.add_fused_activation_function(tflite_activation);
+
+  return options_builder.Finish().Union();
+}
+
+std::unique_ptr<OpChef>
+DepthwiseConv2DChefFactory::create(const tflchef::Operation *operation) const
+{
+  return std::unique_ptr<OpChef>{new DepthwiseConv2DChef{operation}};
+}

diff --git a/contrib/tflchef/core/src/Op/DepthwiseConv2D.h b/contrib/tflchef/core/src/Op/DepthwiseConv2D.h
new file mode 100644 (file)
index 0000000..718ee79
--- /dev/null
+++ b/contrib/tflchef/core/src/Op/DepthwiseConv2D.h
@@ -0,0 +1,52 @@
+/*
+ * 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_DEPTHWISECONV2D_H__
+#define __OP_DEPTHWISECONV2D_H__
+
+#include "OpChef.h"
+
+class DepthwiseConv2DChef final : public OpChef
+{
+public:
+  explicit DepthwiseConv2DChef(const tflchef::Operation *operation) : _operation{operation}
+  {
+    // DO NOTHING
+  }
+
+public:
+  tflite::BuiltinOperator code(void) const override
+  {
+    return tflite::BuiltinOperator_DEPTHWISE_CONV_2D;
+  }
+
+  tflite::BuiltinOptions type(void) const override
+  {
+    return tflite::BuiltinOptions_DepthwiseConv2DOptions;
+  }
+
+  flatbuffers::Offset<void> value(flatbuffers::FlatBufferBuilder &fbb) const override;
+
+private:
+  const tflchef::Operation *_operation;
+};
+
+struct DepthwiseConv2DChefFactory final : public OpChefFactory
+{
+  std::unique_ptr<OpChef> create(const tflchef::Operation *operation) const override;
+};
+
+#endif // __OP_DEPTHWISECONV2D_H__

diff --git a/contrib/tflchef/core/src/OpChef.def b/contrib/tflchef/core/src/OpChef.def
index 2c371d4..d9050a5 100644 (file)
--- a/contrib/tflchef/core/src/OpChef.def
+++ b/contrib/tflchef/core/src/OpChef.def
@@ -7,6 +7,7 @@
 OP_CHEF(AveragePool2D, AveragePool2DChefFactory)
 OP_CHEF(Concatenation, ConcatenationChefFactory)
 OP_CHEF(Conv2D, Conv2DChefFactory)
+OP_CHEF(DepthwiseConv2D, DepthwiseConv2DChefFactory)
 OP_CHEF(MaxPool2D, MaxPool2DChefFactory)
 OP_CHEF(ReLU6, ReLU6ChefFactory)
 OP_CHEF(Reshape, ReshapeChefFactory)

diff --git a/contrib/tflchef/core/src/OpChefs.h b/contrib/tflchef/core/src/OpChefs.h
index 82cccc3..bd2060f 100644 (file)
--- a/contrib/tflchef/core/src/OpChefs.h
+++ b/contrib/tflchef/core/src/OpChefs.h
@@ -20,6 +20,7 @@
 #include "Op/AveragePool2D.h"
 #include "Op/Concatenation.h"
 #include "Op/Conv2D.h"
+#include "Op/DepthwiseConv2D.h"
 #include "Op/MaxPool2D.h"
 #include "Op/ReLU6.h"
 #include "Op/Reshape.h"

diff --git a/contrib/tflchef/proto/tflchef.proto b/contrib/tflchef/proto/tflchef.proto
index e60d2e7..77c2cb2 100644 (file)
--- a/contrib/tflchef/proto/tflchef.proto
+++ b/contrib/tflchef/proto/tflchef.proto
@@ -62,6 +62,15 @@ message ReshapeOptions {
   repeated int32 new_shape = 1;
 }
 
+message DepthwiseConv2DOptions
+{
+  optional Padding padding = 1 [default = VALID];
+  optional int32 stride_w = 2 [default = 1];
+  optional int32 stride_h = 3 [default = 1];
+  optional int32 depth_multiplier = 4 [default = 1];
+  optional Activation activation = 5 [default = NONE];
+}
+
 message Operation {
   optional string type = 1;
   repeated string input = 2;
@@ -72,6 +81,7 @@ message Operation {
   optional ConcatenationOptions concatenation_options = 102;
   optional Pool2DOptions maxpool2d_options = 103;
   optional ReshapeOptions reshape_options = 104;
+  optional DepthwiseConv2DOptions depthwiseconv2d_options = 105;
 }
 
 message ModelRecipe {

diff --git a/contrib/tflchef/tests/depthwiseconv2d/test.recipe b/contrib/tflchef/tests/depthwiseconv2d/test.recipe
new file mode 100644 (file)
index 0000000..13a5ce1
--- /dev/null
+++ b/contrib/tflchef/tests/depthwiseconv2d/test.recipe
@@ -0,0 +1,40 @@
+operand {
+  name: "ifm"
+  type: FLOAT32
+  shape { dim: 1 dim: 64 dim: 64 dim: 8 }
+}
+operand {
+  name: "ker"
+  type: FLOAT32
+  shape { dim: 1 dim: 3 dim: 3 dim: 8 }
+}
+operand {
+  name: "bias"
+  type: FLOAT32
+  shape { dim: 8 }
+  filler {
+    tag: "constant"
+    arg: "1.1"
+  }
+}
+operand {
+  name: "ofm"
+  type: FLOAT32
+  shape { dim: 1 dim: 64 dim: 64 dim: 8 }
+}
+operation {
+  type: "DepthwiseConv2D"
+  depthwiseconv2d_options {
+    padding: SAME
+    stride_w: 1
+    stride_h: 1
+    depth_multiplier: 1
+  }
+  input: "ifm"
+  input: "ker"
+  input: "bias"
+  output: "ofm"
+}
+input: "ifm"
+input: "ker"
+output: "ofm"