[tflchef] Add Conv2D for reverse (#2375)

* [tflchef] Add Conv2D for reverse

This will add Conv2D Op for tflchef-reverse

Signed-off-by: SaeHie Park <saehie.park@samsung.com>
* add comment

diff --git a/contrib/tflchef/tests/CMakeLists.txt b/contrib/tflchef/tests/CMakeLists.txt
index 323424b..e95cdf5 100644 (file)
--- a/contrib/tflchef/tests/CMakeLists.txt
+++ b/contrib/tflchef/tests/CMakeLists.txt
@@ -35,7 +35,7 @@ endforeach(RECIPE)
 # Test tflchef-reverse
 list(APPEND GEN_TFLITEFILES "averagepool2d/test.recipe")
 list(APPEND GEN_TFLITEFILES "concatenation/test.recipe")
-#list(APPEND GEN_TFLITEFILES "conv2d/test.recipe")
+list(APPEND GEN_TFLITEFILES "conv2d/test.recipe")
 #list(APPEND GEN_TFLITEFILES "depthwiseconv2d/test.recipe")
 list(APPEND GEN_TFLITEFILES "maxpool2d/test.recipe")
 list(APPEND GEN_TFLITEFILES "relu/test.recipe")

diff --git a/contrib/tflchef/tflite/src/Op/Conv2D.cpp b/contrib/tflchef/tflite/src/Op/Conv2D.cpp
new file mode 100644 (file)
index 0000000..5d48ee2
--- /dev/null
+++ b/contrib/tflchef/tflite/src/Op/Conv2D.cpp
@@ -0,0 +1,58 @@
+/*
+ * 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 "Conv2D.h"
+
+#include "Convert.h"
+
+namespace tflchef
+{
+
+void TFliteOpConv2D::filler(const tflite::Operator *op, TFliteImport *import,
+                            tflchef::ModelRecipe *model_recipe) const
+{
+  const std::vector<int32_t> &inputs = as_index_vector(op->inputs());
+
+  bool hasBias = (inputs.size() == 3);
+  assert(inputs.size() == 2 || hasBias);
+
+  import->set_tensor_filler(inputs.at(1)); // kernel
+  if (hasBias)
+    import->set_tensor_filler(inputs.at(2)); // bias
+}
+
+tflchef::Operation *TFliteOpConv2D::build(const tflite::Operator *op, TFliteImport *import,
+                                          tflchef::ModelRecipe *model_recipe) const
+{
+  auto op_params = op->builtin_options_as_Conv2DOptions();
+  assert(op_params != nullptr);
+
+  auto operation = model_recipe->add_operation();
+
+  operation->set_type("Conv2D");
+
+  auto op_options = operation->mutable_conv2d_options();
+
+  op_options->set_activation(as_tflchef_activation(op_params->fused_activation_function()));
+  op_options->set_stride_h(op_params->stride_h());
+  op_options->set_stride_w(op_params->stride_w());
+  op_options->set_padding(as_tflchef_padding(op_params->padding()));
+  // TODO support dilation
+
+  return operation;
+}
+
+} // namespace tflchef

diff --git a/contrib/tflchef/tflite/src/Op/Conv2D.h b/contrib/tflchef/tflite/src/Op/Conv2D.h
new file mode 100644 (file)
index 0000000..0216e9c
--- /dev/null
+++ b/contrib/tflchef/tflite/src/Op/Conv2D.h
@@ -0,0 +1,39 @@
+/*
+ * 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 __TFLITE_OP_CONV2D_H__
+#define __TFLITE_OP_CONV2D_H__
+
+#include "TFliteOpChef.h"
+
+namespace tflchef
+{
+
+/**
+ * @brief tflchef operator builder for Conv2D
+ */
+class TFliteOpConv2D : public TFliteOpChef
+{
+public:
+  void filler(const tflite::Operator *op, TFliteImport *import,
+              tflchef::ModelRecipe *model_recipe) const override;
+  tflchef::Operation *build(const tflite::Operator *op, TFliteImport *import,
+                            tflchef::ModelRecipe *model_recipe) const override;
+};
+
+} // namespace tflchef
+
+#endif // __TFLITE_OP_CONV2D_H__

diff --git a/contrib/tflchef/tflite/src/TFliteOpChefs.h b/contrib/tflchef/tflite/src/TFliteOpChefs.h
index 79bbe73..7481701 100644 (file)
--- a/contrib/tflchef/tflite/src/TFliteOpChefs.h
+++ b/contrib/tflchef/tflite/src/TFliteOpChefs.h
@@ -20,7 +20,7 @@
 // In alphabet order
 #include "Op/AveragePool2D.h"
 #include "Op/Concatenation.h"
-//#include "Op/Conv2D.h"
+#include "Op/Conv2D.h"
 //#include "Op/DepthwiseConv2D.h"
 #include "Op/MaxPool2D.h"
 #include "Op/ReLU.h"

diff --git a/contrib/tflchef/tflite/src/TFliteOpRegistry.h b/contrib/tflchef/tflite/src/TFliteOpRegistry.h
index 8468a08..a45560b 100644 (file)
--- a/contrib/tflchef/tflite/src/TFliteOpRegistry.h
+++ b/contrib/tflchef/tflite/src/TFliteOpRegistry.h
@@ -56,7 +56,7 @@ private:
   {
     _tfliteop_map[tflite::BuiltinOperator_AVERAGE_POOL_2D] = make_unique<TFliteOpAveragePool2D>();
     _tfliteop_map[tflite::BuiltinOperator_CONCATENATION] = make_unique<TFliteOpConcatenation>();
-    //_tfliteop_map[tflite::BuiltinOperator_CONV_2D] = make_unique<TFliteOpConv2D>();
+    _tfliteop_map[tflite::BuiltinOperator_CONV_2D] = make_unique<TFliteOpConv2D>();
     //_tfliteop_map[tflite::BuiltinOperator_DEPTHWISE_CONV_2D] =
     //    make_unique<TFliteOpDepthwiseConv2D>();
     _tfliteop_map[tflite::BuiltinOperator_MAX_POOL_2D] = make_unique<TFliteOpMaxPool2D>();