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

src/common/types.cpp

@@ -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_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_CONV_ADD_BN = "fusion_conv_add_bn";
 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_FUSION_FC_RELU = "fusion_fc_relu";
 const std::string G_OP_TYPE_REGION = "region";
 
 std::unordered_map<
@@ -83,11 +81,10 @@ std::unordered_map<
         {G_OP_TYPE_FUSION_CONV_ADD_RELU, {{"Input"}, {"Out"}}},
         {G_OP_TYPE_IM2SEQUENCE, {{"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_CONV_ADD_BN, {{"Input"}, {"Out"}}},
         {G_OP_TYPE_FUSION_POOL_BN, {{"X"}, {"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"}}}};
 
 }  // namespace paddle_mobile

src/common/types.h

@@ -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_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_CONV_ADD_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_FC_RELU;
 extern const std::string G_OP_TYPE_REGION;
 
 extern std::unordered_map<