From fde75268aa7603ba3cfa62a48ff73fe9bc28ee6b Mon Sep 17 00:00:00 2001 From: =?utf8?q?=EB=B0=95=EC=84=B8=ED=9D=AC/=EB=8F=99=EC=9E=91=EC=A0=9C?= =?utf8?q?=EC=96=B4Lab=28SR=29/Principal=20Engineer/=EC=82=BC=EC=84=B1?= =?utf8?q?=EC=A0=84=EC=9E=90?= Date: Thu, 22 Nov 2018 16:46:43 +0900 Subject: [PATCH] [tflchef] Add ReLU6 for reverse (#2374) This will add ReLU6 Op for tflchef-reverse Signed-off-by: SaeHie Park --- contrib/tflchef/tests/CMakeLists.txt | 2 +- contrib/tflchef/tflite/src/Op/ReLU6.cpp | 40 +++++++++++++++++++++++++++ contrib/tflchef/tflite/src/Op/ReLU6.h | 39 ++++++++++++++++++++++++++ contrib/tflchef/tflite/src/TFliteOpChefs.h | 2 +- contrib/tflchef/tflite/src/TFliteOpRegistry.h | 2 +- 5 files changed, 82 insertions(+), 3 deletions(-) create mode 100644 contrib/tflchef/tflite/src/Op/ReLU6.cpp create mode 100644 contrib/tflchef/tflite/src/Op/ReLU6.h diff --git a/contrib/tflchef/tests/CMakeLists.txt b/contrib/tflchef/tests/CMakeLists.txt index 39b6f91..6f2e654 100644 --- a/contrib/tflchef/tests/CMakeLists.txt +++ b/contrib/tflchef/tests/CMakeLists.txt @@ -39,7 +39,7 @@ list(APPEND GEN_TFLITEFILES "concatenation/test.recipe") #list(APPEND GEN_TFLITEFILES "depthwiseconv2d/test.recipe") #list(APPEND GEN_TFLITEFILES "maxpool2d/test.recipe") list(APPEND GEN_TFLITEFILES "relu/test.recipe") -#list(APPEND GEN_TFLITEFILES "relu6/test.recipe") +list(APPEND GEN_TFLITEFILES "relu6/test.recipe") list(APPEND GEN_TFLITEFILES "reshape/test.recipe") # TODO if all operates are added we can just use one line of "*/test.recipe" diff --git a/contrib/tflchef/tflite/src/Op/ReLU6.cpp b/contrib/tflchef/tflite/src/Op/ReLU6.cpp new file mode 100644 index 0000000..1437188 --- /dev/null +++ b/contrib/tflchef/tflite/src/Op/ReLU6.cpp @@ -0,0 +1,40 @@ +/* + * 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 "ReLU6.h" + +#include "Convert.h" + +namespace tflchef +{ + +void TFliteOpReLU6::filler(const tflite::Operator *op, TFliteImport *import, + tflchef::ModelRecipe *model_recipe) const +{ + // Nothing to do with filler +} + +tflchef::Operation *TFliteOpReLU6::build(const tflite::Operator *op, TFliteImport *import, + tflchef::ModelRecipe *model_recipe) const +{ + auto operation = model_recipe->add_operation(); + + operation->set_type("ReLU6"); + + return operation; +} + +} // namespace tflchef diff --git a/contrib/tflchef/tflite/src/Op/ReLU6.h b/contrib/tflchef/tflite/src/Op/ReLU6.h new file mode 100644 index 0000000..64ddb6a --- /dev/null +++ b/contrib/tflchef/tflite/src/Op/ReLU6.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_RELU6_H__ +#define __TFLITE_OP_RELU6_H__ + +#include "TFliteOpChef.h" + +namespace tflchef +{ + +/** + * @brief tflchef operator builder for ReLU6 + */ +class TFliteOpReLU6 : 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_RELU6_H__ diff --git a/contrib/tflchef/tflite/src/TFliteOpChefs.h b/contrib/tflchef/tflite/src/TFliteOpChefs.h index d2000dd..8d9ae94 100644 --- a/contrib/tflchef/tflite/src/TFliteOpChefs.h +++ b/contrib/tflchef/tflite/src/TFliteOpChefs.h @@ -24,7 +24,7 @@ //#include "Op/DepthwiseConv2D.h" //#include "Op/MaxPool2D.h" #include "Op/ReLU.h" -//#include "Op/ReLU6.h" +#include "Op/ReLU6.h" #include "Op/Reshape.h" #endif // __TFLITE_OP_CHEFS_H__ diff --git a/contrib/tflchef/tflite/src/TFliteOpRegistry.h b/contrib/tflchef/tflite/src/TFliteOpRegistry.h index 7a2f721..8cd98e3 100644 --- a/contrib/tflchef/tflite/src/TFliteOpRegistry.h +++ b/contrib/tflchef/tflite/src/TFliteOpRegistry.h @@ -61,7 +61,7 @@ private: // make_unique(); //_tfliteop_map[tflite::BuiltinOperator_MAX_POOL_2D] = make_unique(); _tfliteop_map[tflite::BuiltinOperator_RELU] = make_unique(); - //_tfliteop_map[tflite::BuiltinOperator_RELU6] = make_unique(); + _tfliteop_map[tflite::BuiltinOperator_RELU6] = make_unique(); _tfliteop_map[tflite::BuiltinOperator_RESHAPE] = make_unique(); } -- 2.7.4