[flchef] Add FullyConnected for reverse (#3038)

This will add FullyConnected for tflchef-reverse

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

diff --git a/contrib/tflchef/tests/fullyconnected/test.reverse b/contrib/tflchef/tests/fullyconnected/test.reverse
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/contrib/tflchef/tests/fullyconnected2/test.reverse b/contrib/tflchef/tests/fullyconnected2/test.reverse
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/contrib/tflchef/tflite/src/Op/FullyConnected.cpp b/contrib/tflchef/tflite/src/Op/FullyConnected.cpp
new file mode 100644 (file)
index 0000000..4291c84
--- /dev/null
+++ b/contrib/tflchef/tflite/src/Op/FullyConnected.cpp
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2019 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 "FullyConnected.h"
+
+#include "Convert.h"
+
+namespace tflchef
+{
+
+void TFliteOpFullyConnected::filler(const tflite::Operator *op, TFliteImport *import,
+                                    tflchef::ModelRecipe *model_recipe) const
+{
+  // Nothing to do with filler
+}
+
+tflchef::Operation *TFliteOpFullyConnected::build(const tflite::Operator *op, TFliteImport *import,
+                                                  tflchef::ModelRecipe *model_recipe) const
+{
+  auto op_params = op->builtin_options_as_FullyConnectedOptions();
+  assert(op_params != nullptr);
+
+  auto operation = model_recipe->add_operation();
+
+  operation->set_type("FullyConnected");
+
+  auto op_options = operation->mutable_fullyconnected_options();
+
+  op_options->set_activation(as_tflchef_activation(op_params->fused_activation_function()));
+
+  return operation;
+}
+
+} // namespace tflchef

diff --git a/contrib/tflchef/tflite/src/Op/FullyConnected.h b/contrib/tflchef/tflite/src/Op/FullyConnected.h
new file mode 100644 (file)
index 0000000..8fbe1f3
--- /dev/null
+++ b/contrib/tflchef/tflite/src/Op/FullyConnected.h
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2019 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_FULLYCONNECTED_H__
+#define __TFLITE_OP_FULLYCONNECTED_H__
+
+#include "TFliteOpChef.h"
+
+namespace tflchef
+{
+
+/**
+ * @brief tflchef operator builder for FullyConnected
+ */
+class TFliteOpFullyConnected : 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_FULLYCONNECTED_H__

diff --git a/contrib/tflchef/tflite/src/TFliteOpChefs.h b/contrib/tflchef/tflite/src/TFliteOpChefs.h
index 0af024d..9f34468 100644 (file)
--- a/contrib/tflchef/tflite/src/TFliteOpChefs.h
+++ b/contrib/tflchef/tflite/src/TFliteOpChefs.h
@@ -23,6 +23,7 @@
 #include "Op/Conv2D.h"
 #include "Op/DepthwiseConv2D.h"
 #include "Op/Div.h"
+#include "Op/FullyConnected.h"
 #include "Op/MaxPool2D.h"
 #include "Op/ReLU.h"
 #include "Op/ReLU6.h"

diff --git a/contrib/tflchef/tflite/src/TFliteOpRegistry.h b/contrib/tflchef/tflite/src/TFliteOpRegistry.h
index a702da1..9e08502 100644 (file)
--- a/contrib/tflchef/tflite/src/TFliteOpRegistry.h
+++ b/contrib/tflchef/tflite/src/TFliteOpRegistry.h
@@ -60,6 +60,7 @@ private:
     _tfliteop_map[tflite::BuiltinOperator_DEPTHWISE_CONV_2D] =
         make_unique<TFliteOpDepthwiseConv2D>();
     _tfliteop_map[tflite::BuiltinOperator_DIV] = make_unique<TFliteOpDiv>();
+    _tfliteop_map[tflite::BuiltinOperator_FULLY_CONNECTED] = make_unique<TFliteOpFullyConnected>();
     _tfliteop_map[tflite::BuiltinOperator_MAX_POOL_2D] = make_unique<TFliteOpMaxPool2D>();
     _tfliteop_map[tflite::BuiltinOperator_RELU] = make_unique<TFliteOpReLU>();
     _tfliteop_map[tflite::BuiltinOperator_RELU6] = make_unique<TFliteOpReLU6>();