diff --git a/src/framework/load_ops.h b/src/framework/load_ops.h index 6423a6ffeedd2f08f45265350b1312ca65abbb7e..a2a6da34849641b4f99310621445cb312c7d5227 100644 --- a/src/framework/load_ops.h +++ b/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 diff --git a/src/io/executor.cpp b/src/io/executor.cpp index 66a70006dc22076d9f8ec155b3522bbc4ae3e1e2..c7e6c783bb227c75dd394fcecf5c03e83c81b252 100644 --- a/src/io/executor.cpp +++ b/src/io/executor.cpp @@ -398,7 +398,7 @@ std::vector::Ptype> Executor::Predict( #ifdef PADDLE_MOBILE_FPGA template void Executor::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(); diff --git a/src/io/executor.h b/src/io/executor.h index 35b3c51740e21357865a119de05b58f7008e3db8..98906749effb7e46318157085c4505c57726ec62 100644 --- a/src/io/executor.h +++ b/src/io/executor.h @@ -59,7 +59,7 @@ class Executor { const std::vector &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 FetchResult(int id = -1); void Predict_From_To(int start = 0, int end = -1); diff --git a/src/io/paddle_mobile.cpp b/src/io/paddle_mobile.cpp index 52dbe272794a569b5237d134f82099c01c330730..ec1fd1af45319192585f60fa1f90500fa2deaf46 100644 --- a/src/io/paddle_mobile.cpp +++ b/src/io/paddle_mobile.cpp @@ -127,7 +127,7 @@ PaddleMobile::~PaddleMobile() { template void PaddleMobile::InjectVariable(const framework::Tensor &t, - string var_name) { + std::string var_name) { executor_->InjectVariable(t, var_name); } diff --git a/src/io/paddle_mobile.h b/src/io/paddle_mobile.h index eeff44c8e5578601df80dd134becfd483e33e238..e0ff51d246b179e3f91e1c94f3b26c5ff9ba3d8f 100644 --- a/src/io/paddle_mobile.h +++ b/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 FetchResult(int id = -1); void Predict_From_To(int start = 0, int end = -1);