From d54e74c87df9ede59ccab2cee360a6e5655f6ceb Mon Sep 17 00:00:00 2001 From: zhangyang Date: Mon, 23 Jul 2018 16:03:32 +0800 Subject: [PATCH] To inclde FPGA ops --- src/common/types.cpp | 16 +++++++++++++++- src/common/types.h | 7 +++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/src/common/types.cpp b/src/common/types.cpp index 7b8b5bb559..e64d9c91a6 100644 --- a/src/common/types.cpp +++ b/src/common/types.cpp @@ -44,6 +44,14 @@ const std::string G_OP_TYPE_FETCH = "fetch"; const std::string G_OP_TYPE_DEPTHWISE_CONV = "depthwise_conv2d"; const std::string G_OP_TYPE_IM2SEQUENCE = "im2sequence"; const std::string G_OP_TYPE_DROPOUT = "dropout"; +const std::string G_OP_TYPE_FUSION_CONV_RELU = "fusion_conv_relu"; +const std::string G_OP_TYPE_FUSION_CONV_BN_SCALE = "fusion_conv_bn_scale"; +const std::string G_OP_TYPE_FUSION_CONV_BN_SCALE_RELU = + "fusion_conv_bn_scale_relu"; +const std::string G_OP_TYPE_FUSION_POOL_BN = "fusion_pool_bn"; +const std::string G_OP_TYPE_FUSION_ELEMENTWISE_ADD_RELU = + "fusion_elementwise_add_relu"; +const std::string G_OP_TYPE_REGION = "region"; std::unordered_map< std::string, std::pair, std::vector>> @@ -74,6 +82,12 @@ std::unordered_map< {G_OP_TYPE_DEPTHWISE_CONV, {{"Input"}, {"Output"}}}, {G_OP_TYPE_FUSION_CONV_ADD_RELU, {{"Input"}, {"Out"}}}, {G_OP_TYPE_IM2SEQUENCE, {{"X"}, {"Out"}}}, - {G_OP_TYPE_DROPOUT, {{"X"}, {"Out"}}}}; + {G_OP_TYPE_DROPOUT, {{"X"}, {"Out"}}}, + {G_OP_TYPE_FUSION_CONV_RELU, {{"Input"}, {"Out"}}}, + {G_OP_TYPE_FUSION_CONV_BN_SCALE, {{"Input"}, {"Out"}}}, + {G_OP_TYPE_FUSION_CONV_BN_SCALE_RELU, {{"Input"}, {"Out"}}}, + {G_OP_TYPE_FUSION_POOL_BN, {{"X"}, {"Out"}}}, + {G_OP_TYPE_FUSION_ELEMENTWISE_ADD_RELU, {{"X", "Y"}, {"Out"}}}, + {G_OP_TYPE_REGION, {{"X"}, {"Out"}}}}; } // namespace paddle_mobile diff --git a/src/common/types.h b/src/common/types.h index 627b7efac6..d34c76710a 100644 --- a/src/common/types.h +++ b/src/common/types.h @@ -102,6 +102,13 @@ extern const std::string G_OP_TYPE_DEPTHWISE_CONV; extern const std::string G_OP_TYPE_IM2SEQUENCE; extern const std::string G_OP_TYPE_DROPOUT; +extern const std::string G_OP_TYPE_FUSION_CONV_RELU; +extern const std::string G_OP_TYPE_FUSION_CONV_BN_SCALE; +extern const std::string G_OP_TYPE_FUSION_CONV_BN_SCALE_RELU; +extern const std::string G_OP_TYPE_FUSION_POOL_BN; +extern const std::string G_OP_TYPE_FUSION_ELEMENTWISE_ADD_RELU; +extern const std::string G_OP_TYPE_REGION; + extern std::unordered_map< std::string, std::pair, std::vector>> op_input_output_key; -- GitLab