Merge pull request #1062 from hjchen2/dev-latest

Fix fpga macro in load_ops.h

src/framework/load_ops.h

@@ -36,7 +36,7 @@ limitations under the License. */
 #define LOAD_FPGA_OP(op_type)                                           \
   extern int TouchOpRegistrar_##op_type##_##fpga();                     \
   static int use_op_itself_##op_type##_##fpga __attribute__((unused)) = \
-      TouchOpRegistrar_##op_type##_##mali_gpu()
+      TouchOpRegistrar_##op_type##_##fpga()
 #else
 #define LOAD_FPGA_OP(op_type)
 #endif

src/io/executor.cpp

@@ -398,7 +398,7 @@ std::vector<typename Executor<Dtype, P>::Ptype> Executor<Dtype, P>::Predict(
 #ifdef PADDLE_MOBILE_FPGA
 template <typename Dtype, Precision P>
 void Executor<Dtype, P>::InjectVariable(const framework::Tensor &t,
-                                        string var_name) {
+                                        std::string var_name) {
   framework::Variable *g_feed_value = program_.scope->Var(var_name);
   framework::Tensor *feed_tensor =
       g_feed_value->GetMutable<framework::LoDTensor>();

src/io/executor.h

@@ -59,7 +59,7 @@ class Executor {
                              const std::vector<int64_t> &dims);
 
 #ifdef PADDLE_MOBILE_FPGA
-  void InjectVariable(const framework::Tensor &t, string var_name);
+  void InjectVariable(const framework::Tensor &t, std::string var_name);
   void FeedData(const framework::Tensor &t);
   std::shared_ptr<framework::Tensor> FetchResult(int id = -1);
   void Predict_From_To(int start = 0, int end = -1);

src/io/paddle_mobile.cpp

@@ -127,7 +127,7 @@ PaddleMobile<Dtype, P>::~PaddleMobile() {
 
 template <typename Dtype, Precision P>
 void PaddleMobile<Dtype, P>::InjectVariable(const framework::Tensor &t,
-                                            string var_name) {
+                                            std::string var_name) {
   executor_->InjectVariable(t, var_name);
 }
 

src/io/paddle_mobile.h

@@ -60,7 +60,7 @@ class PaddleMobile {
   ~PaddleMobile();
 
 #ifdef PADDLE_MOBILE_FPGA
-  void InjectVariable(const framework::Tensor &t, string var_name);
+  void InjectVariable(const framework::Tensor &t, std::string var_name);
   void FeedData(const framework::Tensor &t);
   std::shared_ptr<framework::Tensor> FetchResult(int id = -1);
   void Predict_From_To(int start = 0, int end = -1);