From ff065665e822a846a7af1bb148779d38ace60920 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:48:01 +0900 Subject: [PATCH] [tflchef] Add MaxPool2D for reverse (#2376) This will add MaxPool2D Op for tflchef-reverse Signed-off-by: SaeHie Park --- contrib/tflchef/tests/CMakeLists.txt | 2 +- contrib/tflchef/tflite/src/Op/MaxPool2D.cpp | 52 +++++++++++++++++++++++++++ contrib/tflchef/tflite/src/Op/MaxPool2D.h | 39 ++++++++++++++++++++ contrib/tflchef/tflite/src/TFliteOpChefs.h | 2 +- contrib/tflchef/tflite/src/TFliteOpRegistry.h | 2 +- 5 files changed, 94 insertions(+), 3 deletions(-) create mode 100644 contrib/tflchef/tflite/src/Op/MaxPool2D.cpp create mode 100644 contrib/tflchef/tflite/src/Op/MaxPool2D.h diff --git a/contrib/tflchef/tests/CMakeLists.txt b/contrib/tflchef/tests/CMakeLists.txt index 6f2e654..323424b 100644 --- a/contrib/tflchef/tests/CMakeLists.txt +++ b/contrib/tflchef/tests/CMakeLists.txt @@ -37,7 +37,7 @@ 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 "depthwiseconv2d/test.recipe") -#list(APPEND GEN_TFLITEFILES "maxpool2d/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 "reshape/test.recipe") diff --git a/contrib/tflchef/tflite/src/Op/MaxPool2D.cpp b/contrib/tflchef/tflite/src/Op/MaxPool2D.cpp new file mode 100644 index 0000000..1366366 --- /dev/null +++ b/contrib/tflchef/tflite/src/Op/MaxPool2D.cpp @@ -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. + */ + +#include "MaxPool2D.h" + +#include "Convert.h" + +namespace tflchef +{ + +void TFliteOpMaxPool2D::filler(const tflite::Operator *op, TFliteImport *import, + tflchef::ModelRecipe *model_recipe) const +{ + // Nothing to do with filler +} + +tflchef::Operation *TFliteOpMaxPool2D::build(const tflite::Operator *op, TFliteImport *import, + tflchef::ModelRecipe *model_recipe) const +{ + auto op_params = op->builtin_options_as_Pool2DOptions(); + assert(op_params != nullptr); + + auto operation = model_recipe->add_operation(); + + operation->set_type("MaxPool2D"); + + auto op_options = operation->mutable_maxpool2d_options(); + + op_options->set_padding(as_tflchef_padding(op_params->padding())); + op_options->set_stride_h(op_params->stride_h()); + op_options->set_stride_w(op_params->stride_w()); + op_options->set_filter_height(op_params->filter_height()); + op_options->set_filter_width(op_params->filter_width()); + op_options->set_activation(as_tflchef_activation(op_params->fused_activation_function())); + + return operation; +} + +} // namespace tflchef diff --git a/contrib/tflchef/tflite/src/Op/MaxPool2D.h b/contrib/tflchef/tflite/src/Op/MaxPool2D.h new file mode 100644 index 0000000..36533f8 --- /dev/null +++ b/contrib/tflchef/tflite/src/Op/MaxPool2D.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_MAXPOOL2D_H__ +#define __TFLITE_OP_MAXPOOL2D_H__ + +#include "TFliteOpChef.h" + +namespace tflchef +{ + +/** + * @brief tflchef operator builder for MaxPool2D + */ +class TFliteOpMaxPool2D : 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_MAXPOOL2D_H__ diff --git a/contrib/tflchef/tflite/src/TFliteOpChefs.h b/contrib/tflchef/tflite/src/TFliteOpChefs.h index 8d9ae94..79bbe73 100644 --- a/contrib/tflchef/tflite/src/TFliteOpChefs.h +++ b/contrib/tflchef/tflite/src/TFliteOpChefs.h @@ -22,7 +22,7 @@ #include "Op/Concatenation.h" //#include "Op/Conv2D.h" //#include "Op/DepthwiseConv2D.h" -//#include "Op/MaxPool2D.h" +#include "Op/MaxPool2D.h" #include "Op/ReLU.h" #include "Op/ReLU6.h" #include "Op/Reshape.h" diff --git a/contrib/tflchef/tflite/src/TFliteOpRegistry.h b/contrib/tflchef/tflite/src/TFliteOpRegistry.h index 8cd98e3..8468a08 100644 --- a/contrib/tflchef/tflite/src/TFliteOpRegistry.h +++ b/contrib/tflchef/tflite/src/TFliteOpRegistry.h @@ -59,7 +59,7 @@ private: //_tfliteop_map[tflite::BuiltinOperator_CONV_2D] = make_unique(); //_tfliteop_map[tflite::BuiltinOperator_DEPTHWISE_CONV_2D] = // make_unique(); - //_tfliteop_map[tflite::BuiltinOperator_MAX_POOL_2D] = 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_RESHAPE] = make_unique(); -- 2.7.4