refine anakin op converter

Author: NHZlX

paddle/fluid/inference/anakin/convert/batch_norm.cc

@@ -14,6 +14,7 @@
 
 #include "paddle/fluid/inference/anakin/convert/batch_norm.h"
 #include <math.h>
+#include <algorithm>
 #include <map>
 #include <string>
 #include <vector>
@@ -41,7 +42,6 @@ void BatchNormOpConverter::operator()(const framework::proto::OpDesc &op,
 
   auto output = op_desc.Output("Y").front();
   auto op_name = op_desc.Type() + ":" + op_desc.Output("Y").front();
-  bool is_test = boost::get<bool>(op_desc.GetAttr("is_test"));
   auto epsilon = boost::get<float>(op_desc.GetAttr("epsilon"));
 
   auto bn_op_name = op_name + ":bn";

paddle/fluid/inference/anakin/convert/flatten.cc

@@ -48,4 +48,4 @@ void FlattenOpConverter::operator()(const framework::proto::OpDesc &op,
 }  // namespace inference
 }  // namespace paddle
 
-REGISTER_ANAKIN_OP_CONVERTER(flatten2, FlattenOpConverter);
+REGISTER_ANAKIN_OP_CONVERTER(flatten, FlattenOpConverter);

paddle/fluid/inference/anakin/convert/op_converter.h

@@ -47,7 +47,10 @@ class AnakinOpConverter {
     std::string op_type = op_desc.Type();
     AnakinOpConverter *it = nullptr;
 
-    std::cout << op_type << std::endl;
+    if (op_type == "reshape2") op_type = "reshape";
+    if (op_type == "transpose2") op_type = "transpose";
+    if (op_type == "flatten2") op_type = "flatten";
+
     if (!it) {
       it = Registry<AnakinOpConverter>::Global().Lookup(op_type);
     }

paddle/fluid/inference/anakin/convert/reshape.cc

@@ -49,4 +49,4 @@ void ReshapeOpConverter::operator()(const framework::proto::OpDesc &op,
 }  // namespace inference
 }  // namespace paddle
 
-REGISTER_ANAKIN_OP_CONVERTER(reshape2, ReshapeOpConverter);
+REGISTER_ANAKIN_OP_CONVERTER(reshape, ReshapeOpConverter);

paddle/fluid/inference/anakin/convert/transpose.cc

@@ -52,4 +52,4 @@ void TransposeOpConverter::operator()(const framework::proto::OpDesc &op,
 }  // namespace inference
 }  // namespace paddle
 
-REGISTER_ANAKIN_OP_CONVERTER(transpose2, TransposeOpConverter);
+REGISTER_ANAKIN_OP_CONVERTER(transpose, TransposeOpConverter);

paddle/fluid/inference/api/CMakeLists.txt

@@ -64,3 +64,8 @@ if (WITH_ANAKIN AND WITH_MKL) # only needed in CI
     anakin_target(inference_anakin_api)
     anakin_target(inference_anakin_api_shared)
 endif()
+if (WITH_ANAKIN_SUBGRAPH)
+   inference_analysis_test(test_anakin_model SRCS mobilenet_test.cc EXTRA_DEPS paddle_fluid) 
+   inference_analysis_test(anakin_conv_model SRCS conv_anakin_test.cc EXTRA_DEPS paddle_fluid) 
+   inference_analysis_test(life_feature_test SRCS life_feature_test.cc EXTRA_DEPS paddle_fluid) 
+endif()

paddle/fluid/inference/api/analysis_predictor.cc

@@ -780,9 +780,9 @@ USE_ANAKIN_CONVERTER(tanh);
 USE_ANAKIN_CONVERTER(pool2d);
 USE_ANAKIN_CONVERTER(elementwise_add);
 USE_ANAKIN_CONVERTER(batch_norm);
-USE_ANAKIN_CONVERTER(flatten2);
-USE_ANAKIN_CONVERTER(reshape2);
-USE_ANAKIN_CONVERTER(transpose2);
+USE_ANAKIN_CONVERTER(flatten);
+USE_ANAKIN_CONVERTER(reshape);
+USE_ANAKIN_CONVERTER(transpose);
 USE_ANAKIN_CONVERTER(softmax);
 
 USE_ANAKIN_CONVERTER(detection_out);