提交 edc64789 编写于 作者: D Dong Daxiang 提交者: GitHub

Merge pull request #564 from guru4elephant/fix_numpy_predict

Fix numpy predict
...@@ -345,7 +345,7 @@ int PredictorClient::numpy_predict( ...@@ -345,7 +345,7 @@ int PredictorClient::numpy_predict(
PredictorRes &predict_res_batch, PredictorRes &predict_res_batch,
const int &pid) { const int &pid) {
int batch_size = std::max(float_feed_batch.size(), int_feed_batch.size()); int batch_size = std::max(float_feed_batch.size(), int_feed_batch.size());
VLOG(2) << "batch size: " << batch_size;
predict_res_batch.clear(); predict_res_batch.clear();
Timer timeline; Timer timeline;
int64_t preprocess_start = timeline.TimeStampUS(); int64_t preprocess_start = timeline.TimeStampUS();
...@@ -462,7 +462,7 @@ int PredictorClient::numpy_predict( ...@@ -462,7 +462,7 @@ int PredictorClient::numpy_predict(
for (ssize_t j = 0; j < int_array.shape(1); j++) { for (ssize_t j = 0; j < int_array.shape(1); j++) {
for (ssize_t k = 0; k < int_array.shape(2); k++) { for (ssize_t k = 0; k < int_array.shape(2); k++) {
for (ssize_t l = 0; k < int_array.shape(3); l++) { for (ssize_t l = 0; k < int_array.shape(3); l++) {
tensor->add_float_data(int_array(i, j, k, l)); tensor->add_int64_data(int_array(i, j, k, l));
} }
} }
} }
...@@ -474,7 +474,7 @@ int PredictorClient::numpy_predict( ...@@ -474,7 +474,7 @@ int PredictorClient::numpy_predict(
for (ssize_t i = 0; i < int_array.shape(0); i++) { for (ssize_t i = 0; i < int_array.shape(0); i++) {
for (ssize_t j = 0; j < int_array.shape(1); j++) { for (ssize_t j = 0; j < int_array.shape(1); j++) {
for (ssize_t k = 0; k < int_array.shape(2); k++) { for (ssize_t k = 0; k < int_array.shape(2); k++) {
tensor->add_float_data(int_array(i, j, k)); tensor->add_int64_data(int_array(i, j, k));
} }
} }
} }
...@@ -484,7 +484,7 @@ int PredictorClient::numpy_predict( ...@@ -484,7 +484,7 @@ int PredictorClient::numpy_predict(
auto int_array = int_feed[vec_idx].unchecked<2>(); auto int_array = int_feed[vec_idx].unchecked<2>();
for (ssize_t i = 0; i < int_array.shape(0); i++) { for (ssize_t i = 0; i < int_array.shape(0); i++) {
for (ssize_t j = 0; j < int_array.shape(1); j++) { for (ssize_t j = 0; j < int_array.shape(1); j++) {
tensor->add_float_data(int_array(i, j)); tensor->add_int64_data(int_array(i, j));
} }
} }
break; break;
...@@ -492,7 +492,7 @@ int PredictorClient::numpy_predict( ...@@ -492,7 +492,7 @@ int PredictorClient::numpy_predict(
case 1: { case 1: {
auto int_array = int_feed[vec_idx].unchecked<1>(); auto int_array = int_feed[vec_idx].unchecked<1>();
for (ssize_t i = 0; i < int_array.shape(0); i++) { for (ssize_t i = 0; i < int_array.shape(0); i++) {
tensor->add_float_data(int_array(i)); tensor->add_int64_data(int_array(i));
} }
break; break;
} }
......
...@@ -71,6 +71,7 @@ class Debugger(object): ...@@ -71,6 +71,7 @@ class Debugger(object):
if profile: if profile:
config.enable_profile() config.enable_profile()
config.set_cpu_math_library_num_threads(cpu_num) config.set_cpu_math_library_num_threads(cpu_num)
config.switch_ir_optim(False)
self.predictor = create_paddle_predictor(config) self.predictor = create_paddle_predictor(config)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册