From: 박세희/동작제어Lab(SR)/Principal Engineer/삼성전자 <saehie.park@samsung.com>
Date: Thu, 22 Nov 2018 05:19:21 +0000 (+0900)
Subject: [tflchef] Add Concat for reverse (#2370)
X-Git-Tag: nncc_backup~1274
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=66da701d96f2c89d2680dd92fba58c868d7ad313;p=platform%2Fcore%2Fml%2Fnnfw.git

[tflchef] Add Concat for reverse (#2370)

This will add Concatenation Op for tflchef-reverse

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

diff --git a/contrib/tflchef/tests/CMakeLists.txt b/contrib/tflchef/tests/CMakeLists.txt
index dc5151d..529c544 100644
--- a/contrib/tflchef/tests/CMakeLists.txt
+++ b/contrib/tflchef/tests/CMakeLists.txt
@@ -34,7 +34,7 @@ endforeach(RECIPE)
 
 # Test tflchef-reverse
 list(APPEND GEN_TFLITEFILES "averagepool2d/test.recipe")
-#list(APPEND GEN_TFLITEFILES "concatenation/test.recipe")
+list(APPEND GEN_TFLITEFILES "concatenation/test.recipe")
 #list(APPEND GEN_TFLITEFILES "conv2d/test.recipe")
 #list(APPEND GEN_TFLITEFILES "depthwiseconv2d/test.recipe")
 #list(APPEND GEN_TFLITEFILES "maxpool2d/test.recipe")
diff --git a/contrib/tflchef/tflite/src/Op/Concatenation.cpp b/contrib/tflchef/tflite/src/Op/Concatenation.cpp
new file mode 100644
index 0000000..126402f
--- /dev/null
+++ b/contrib/tflchef/tflite/src/Op/Concatenation.cpp
@@ -0,0 +1,48 @@
+/*
+ * 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 "Concatenation.h"
+
+#include "Convert.h"
+
+namespace tflchef
+{
+
+void TFliteOpConcatenation::filler(const tflite::Operator *op, TFliteImport *import,
+                                   tflchef::ModelRecipe *model_recipe) const
+{
+  // Nothing to do with filler
+}
+
+tflchef::Operation *TFliteOpConcatenation::build(const tflite::Operator *op, TFliteImport *import,
+                                                 tflchef::ModelRecipe *model_recipe) const
+{
+  auto op_params = op->builtin_options_as_ConcatenationOptions();
+  assert(op_params != nullptr);
+
+  auto operation = model_recipe->add_operation();
+
+  operation->set_type("Concatenation");
+
+  auto op_options = operation->mutable_concatenation_options();
+
+  op_options->set_axis(op_params->axis());
+  op_options->set_activation(as_tflchef_activation(op_params->fused_activation_function()));
+
+  return operation;
+}
+
+} // namespace tflchef
diff --git a/contrib/tflchef/tflite/src/Op/Concatenation.h b/contrib/tflchef/tflite/src/Op/Concatenation.h
new file mode 100644
index 0000000..4a7ea57
--- /dev/null
+++ b/contrib/tflchef/tflite/src/Op/Concatenation.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_CONCATENATION_H__
+#define __TFLITE_OP_CONCATENATION_H__
+
+#include "TFliteOpChef.h"
+
+namespace tflchef
+{
+
+/**
+ * @brief tflchef operator builder for Concatenation
+ */
+class TFliteOpConcatenation : 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_CONCATENATION_H__
diff --git a/contrib/tflchef/tflite/src/TFliteOpChefs.h b/contrib/tflchef/tflite/src/TFliteOpChefs.h
index 654303a..6c9126a 100644
--- a/contrib/tflchef/tflite/src/TFliteOpChefs.h
+++ b/contrib/tflchef/tflite/src/TFliteOpChefs.h
@@ -19,7 +19,7 @@
 
 // In alphabet order
 #include "Op/AveragePool2D.h"
-//#include "Op/Concatenation.h"
+#include "Op/Concatenation.h"
 //#include "Op/Conv2D.h"
 //#include "Op/DepthwiseConv2D.h"
 //#include "Op/MaxPool2D.h"
diff --git a/contrib/tflchef/tflite/src/TFliteOpRegistry.h b/contrib/tflchef/tflite/src/TFliteOpRegistry.h
index e1dd21e..34a7ea7 100644
--- a/contrib/tflchef/tflite/src/TFliteOpRegistry.h
+++ b/contrib/tflchef/tflite/src/TFliteOpRegistry.h
@@ -55,7 +55,7 @@ private:
   TFliteOpRegistry()
   {
     _tfliteop_map[tflite::BuiltinOperator_AVERAGE_POOL_2D] = make_unique<TFliteOpAveragePool2D>();
-    //_tfliteop_map[tflite::BuiltinOperator_CONCATENATION] = make_unique<TFliteOpConcatenation>();
+    _tfliteop_map[tflite::BuiltinOperator_CONCATENATION] = make_unique<TFliteOpConcatenation>();
     //_tfliteop_map[tflite::BuiltinOperator_CONV_2D] = make_unique<TFliteOpConv2D>();
     //_tfliteop_map[tflite::BuiltinOperator_DEPTHWISE_CONV_2D] =
     //    make_unique<TFliteOpDepthwiseConv2D>();