Skip to content

P
Paddle-Lite

PaddlePaddle / Paddle-Lite

通知 331
Star 4
Fork 1
P
Paddle-Lite
提交 f01e982a 编写于 作者: Z zhangyang
浏览文件
操作

Merge remote-tracking branch 'upstream/develop' into develop

上级 c05bf274 7b70a56a
隐藏空白更改
内联 并排
Showing with 6 addition and 10 deletion
src/common/types.cpp
浏览文件 @ f01e982a
...@@ -44,13 +44,11 @@ const std::string G_OP_TYPE_FETCH = "fetch"; ...@@ -44,13 +44,11 @@ const std::string G_OP_TYPE_FETCH = "fetch";
const std::string G_OP_TYPE_DEPTHWISE_CONV = "depthwise_conv2d"; const std::string G_OP_TYPE_DEPTHWISE_CONV = "depthwise_conv2d";
const std::string G_OP_TYPE_IM2SEQUENCE = "im2sequence"; const std::string G_OP_TYPE_IM2SEQUENCE = "im2sequence";
const std::string G_OP_TYPE_DROPOUT = "dropout"; 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_ADD_BN = "fusion_conv_add_bn";
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_POOL_BN = "fusion_pool_bn";
const std::string G_OP_TYPE_FUSION_ELEMENTWISE_ADD_RELU = const std::string G_OP_TYPE_FUSION_ELEMENTWISE_ADD_RELU =
"fusion_elementwise_add_relu"; "fusion_elementwise_add_relu";
const std::string G_OP_TYPE_FUSION_FC_RELU = "fusion_fc_relu";
const std::string G_OP_TYPE_REGION = "region"; const std::string G_OP_TYPE_REGION = "region";
std::unordered_map< std::unordered_map<
...@@ -83,11 +81,10 @@ std::unordered_map< ...@@ -83,11 +81,10 @@ std::unordered_map<
{G_OP_TYPE_FUSION_CONV_ADD_RELU, {{"Input"}, {"Out"}}}, {G_OP_TYPE_FUSION_CONV_ADD_RELU, {{"Input"}, {"Out"}}},
{G_OP_TYPE_IM2SEQUENCE, {{"X"}, {"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_ADD_BN, {{"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_POOL_BN, {{"X"}, {"Out"}}},
{G_OP_TYPE_FUSION_ELEMENTWISE_ADD_RELU, {{"X", "Y"}, {"Out"}}}, {G_OP_TYPE_FUSION_ELEMENTWISE_ADD_RELU, {{"X", "Y"}, {"Out"}}},
{G_OP_TYPE_FUSION_FC_RELU, {{"X", "Y", "Z"}, {"Out"}}},
{G_OP_TYPE_REGION, {{"X"}, {"Out"}}}}; {G_OP_TYPE_REGION, {{"X"}, {"Out"}}}};
} // namespace paddle_mobile } // namespace paddle_mobile
src/common/types.h
浏览文件 @ f01e982a
...@@ -102,11 +102,10 @@ extern const std::string G_OP_TYPE_DEPTHWISE_CONV; ...@@ -102,11 +102,10 @@ extern const std::string G_OP_TYPE_DEPTHWISE_CONV;
extern const std::string G_OP_TYPE_IM2SEQUENCE; extern const std::string G_OP_TYPE_IM2SEQUENCE;
extern const std::string G_OP_TYPE_DROPOUT; 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_ADD_BN;
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_POOL_BN;
extern const std::string G_OP_TYPE_FUSION_ELEMENTWISE_ADD_RELU; extern const std::string G_OP_TYPE_FUSION_ELEMENTWISE_ADD_RELU;
extern const std::string G_OP_TYPE_FUSION_FC_RELU;
extern const std::string G_OP_TYPE_REGION; extern const std::string G_OP_TYPE_REGION;
extern std::unordered_map< extern std::unordered_map<
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或