Fix Retrive Retrieve, CI 错误修改 PaddleTest (#61306)

co63oc · web-flow · commit 31d28719645e · 2024-02-01T11:35:43.000+08:00
* Fix

* Fix

* ci

* ci
diff --git a/paddle/fluid/inference/api/analysis_predictor.cc b/paddle/fluid/inference/api/analysis_predictor.cc
@@ -3393,7 +3393,7 @@ PredictorPool::PredictorPool(const Config &config, size_t size) {
   }
 }
 
-Predictor *PredictorPool::Retrive(size_t idx) {
+Predictor *PredictorPool::Retrieve(size_t idx) {
   PADDLE_ENFORCE_LT(
       idx,
       preds_.size() + 1,
diff --git a/paddle/fluid/inference/api/paddle_inference_api.h b/paddle/fluid/inference/api/paddle_inference_api.h
@@ -267,7 +267,7 @@ class PD_INFER_DECL PredictorPool {
   explicit PredictorPool(const Config& config, size_t size = 1);
 
   /// \brief Get \param id-th predictor.
-  Predictor* Retrive(size_t idx);
+  Predictor* Retrieve(size_t idx);
 
  private:
   std::shared_ptr<Predictor> main_pred_;
diff --git a/paddle/fluid/pybind/inference_api.cc b/paddle/fluid/pybind/inference_api.cc
@@ -1268,8 +1268,8 @@ void BindPaddleInferTensor(py::module *m) {
 void BindPredictorPool(py::module *m) {
   py::class_<paddle_infer::services::PredictorPool>(*m, "PredictorPool")
       .def(py::init<const paddle_infer::Config &, size_t>())
-      .def("retrive",
-           &paddle_infer::services::PredictorPool::Retrive,
+      .def("retrieve",
+           &paddle_infer::services::PredictorPool::Retrieve,
            py::return_value_policy::reference);
 }
 
diff --git a/test/cpp/inference/api/paddle_infer_api_test.cc b/test/cpp/inference/api/paddle_infer_api_test.cc
@@ -67,7 +67,7 @@ TEST(PredictorPool, basic) {
   config.EnableUseGpu(100, 0);
 
   services::PredictorPool pred_pool(config, 4);
-  auto pred = pred_pool.Retrive(2);
+  auto pred = pred_pool.Retrieve(2);
 
   std::vector<int> in_shape = {1, 3, 318, 318};
   int in_num =
diff --git a/test/cpp/inference/api/trt_mobilenet_test.cc b/test/cpp/inference/api/trt_mobilenet_test.cc
@@ -29,7 +29,7 @@ TEST(PredictorPool, use_gpu) {
   config.EnableTensorRtDLA(0);
   services::PredictorPool pred_pool(config, 1);
 
-  auto predictor = pred_pool.Retrive(0);
+  auto predictor = pred_pool.Retrieve(0);
   auto input_names = predictor->GetInputNames();
   auto input_t = predictor->GetInputHandle(input_names[0]);
   std::vector<int> in_shape = {1, 3, 224, 224};
@@ -55,7 +55,7 @@ TEST(PredictorPool, use_trt_cuda_graph) {
   config.EnableTensorRtDLA(0);
   services::PredictorPool pred_pool(config, 1);
 
-  auto predictor = pred_pool.Retrive(0);
+  auto predictor = pred_pool.Retrieve(0);
   auto input_names = predictor->GetInputNames();
   auto input_t = predictor->GetInputHandle(input_names[0]);
   std::vector<int> in_shape = {1, 3, 224, 224};
diff --git a/test/cpp/inference/infer_ut/test_LeViT.cc b/test/cpp/inference/infer_ut/test_LeViT.cc
@@ -53,11 +53,11 @@ TEST(gpu_tester_LeViT, analysis_gpu_bz1) {
   // get groudtruth by disbale ir
   paddle_infer::services::PredictorPool pred_pool_no_ir(config_no_ir, 1);
   SingleThreadPrediction(
-      pred_pool_no_ir.Retrive(0), &my_input_data_map, &truth_output_data, 1);
+      pred_pool_no_ir.Retrieve(0), &my_input_data_map, &truth_output_data, 1);
   // get infer results
   paddle_infer::services::PredictorPool pred_pool(config, 1);
   SingleThreadPrediction(
-      pred_pool.Retrive(0), &my_input_data_map, &infer_output_data);
+      pred_pool.Retrieve(0), &my_input_data_map, &infer_output_data);
   // check outputs
   CompareRecord(&truth_output_data, &infer_output_data);
   std::cout << "finish test" << std::endl;
@@ -84,11 +84,11 @@ TEST(tensorrt_tester_LeViT, trt_fp32_bz2) {
   // get groudtruth by disbale ir
   paddle_infer::services::PredictorPool pred_pool_no_ir(config_no_ir, 1);
   SingleThreadPrediction(
-      pred_pool_no_ir.Retrive(0), &my_input_data_map, &truth_output_data, 1);
+      pred_pool_no_ir.Retrieve(0), &my_input_data_map, &truth_output_data, 1);
   // get infer results
   paddle_infer::services::PredictorPool pred_pool(config, 1);
   SingleThreadPrediction(
-      pred_pool.Retrive(0), &my_input_data_map, &infer_output_data);
+      pred_pool.Retrieve(0), &my_input_data_map, &infer_output_data);
   // check outputs
   CompareRecord(&truth_output_data, &infer_output_data);
   std::cout << "finish test" << std::endl;
@@ -123,10 +123,10 @@ TEST(tensorrt_tester_LeViT, serial_diff_batch_trt_fp32) {
         truth_output_data;
     // get groudtruth by disbale ir
     SingleThreadPrediction(
-        pred_pool_no_ir.Retrive(0), &my_input_data_map, &truth_output_data, 1);
+        pred_pool_no_ir.Retrieve(0), &my_input_data_map, &truth_output_data, 1);
     // get infer results
     SingleThreadPrediction(
-        pred_pool.Retrive(0), &my_input_data_map, &infer_output_data);
+        pred_pool.Retrieve(0), &my_input_data_map, &infer_output_data);
     // check outputs
     CompareRecord(&truth_output_data, &infer_output_data);
   }
@@ -155,14 +155,14 @@ TEST(tensorrt_tester_LeViT, multi_thread4_trt_fp32_bz2) {
   // get groudtruth by disbale ir
   paddle_infer::services::PredictorPool pred_pool_no_ir(config_no_ir, 1);
   SingleThreadPrediction(
-      pred_pool_no_ir.Retrive(0), &my_input_data_map, &truth_output_data, 1);
+      pred_pool_no_ir.Retrieve(0), &my_input_data_map, &truth_output_data, 1);
 
   // get infer results from multi threads
   std::vector<std::thread> threads;
   services::PredictorPool pred_pool(config, thread_num);
   for (int i = 0; i < thread_num; ++i) {
     threads.emplace_back(paddle::test::SingleThreadPrediction,
-                         pred_pool.Retrive(i),
+                         pred_pool.Retrieve(i),
                          &my_input_data_map,
                          &infer_output_data,
                          10);
@@ -209,7 +209,7 @@ TEST(tensorrt_tester_LeViT, multi_stream_thread4_trt_fp32_bz2) {
 
   paddle_infer::services::PredictorPool pred_pool_no_ir(config_no_ir, 1);
   SingleThreadPrediction(
-      pred_pool_no_ir.Retrive(0), &my_input_data_map, &truth_output_data, 1);
+      pred_pool_no_ir.Retrieve(0), &my_input_data_map, &truth_output_data, 1);
 
   // get infer results from multi threads
   std::vector<std::thread> threads;
diff --git a/test/cpp/inference/infer_ut/test_det_mv3_db.cc b/test/cpp/inference/infer_ut/test_det_mv3_db.cc
@@ -77,11 +77,11 @@ TEST(gpu_tester_det_mv3_db, analysis_gpu_bz4) {
   // get groudtruth by disbale ir
   paddle_infer::services::PredictorPool pred_pool_no_ir(config_no_ir, 1);
   SingleThreadPrediction(
-      pred_pool_no_ir.Retrive(0), &my_input_data_map, &truth_output_data, 1);
+      pred_pool_no_ir.Retrieve(0), &my_input_data_map, &truth_output_data, 1);
   // get infer results
   paddle_infer::services::PredictorPool pred_pool(config, 1);
   SingleThreadPrediction(
-      pred_pool.Retrive(0), &my_input_data_map, &infer_output_data);
+      pred_pool.Retrieve(0), &my_input_data_map, &infer_output_data);
   // check outputs
   CompareRecord(&truth_output_data, &infer_output_data, 1e-4);
   std::cout << "finish test" << std::endl;
@@ -110,14 +110,14 @@ TEST(tensorrt_tester_det_mv3_db, multi_thread2_trt_fp32_dynamic_shape_bz2) {
   // get groudtruth by disbale ir
   paddle_infer::services::PredictorPool pred_pool_no_ir(config_no_ir, 1);
   SingleThreadPrediction(
-      pred_pool_no_ir.Retrive(0), &my_input_data_map, &truth_output_data, 1);
+      pred_pool_no_ir.Retrieve(0), &my_input_data_map, &truth_output_data, 1);
 
   // get infer results from multi threads
   std::vector<std::thread> threads;
   services::PredictorPool pred_pool(config, thread_num);
   for (int i = 0; i < thread_num; ++i) {
     threads.emplace_back(paddle::test::SingleThreadPrediction,
-                         pred_pool.Retrive(i),
+                         pred_pool.Retrieve(i),
                          &my_input_data_map,
                          &infer_output_data,
                          2);
@@ -156,14 +156,14 @@ TEST(mkldnn_tester_det_mv3_db, multi_thread2_mkl_fp32_bz2) {
   // get groudtruth by disbale ir
   paddle_infer::services::PredictorPool pred_pool_no_ir(config_no_ir, 1);
   SingleThreadPrediction(
-      pred_pool_no_ir.Retrive(0), &my_input_data_map, &truth_output_data, 1);
+      pred_pool_no_ir.Retrieve(0), &my_input_data_map, &truth_output_data, 1);
 
   // get infer results from multi threads
   std::vector<std::thread> threads;
   services::PredictorPool pred_pool(config, thread_num);
   for (int i = 0; i < thread_num; ++i) {
     threads.emplace_back(paddle::test::SingleThreadPrediction,
-                         pred_pool.Retrive(i),
+                         pred_pool.Retrieve(i),
                          &my_input_data_map,
                          &infer_output_data,
                          2);
diff --git a/test/cpp/inference/infer_ut/test_ernie_text_cls.cc b/test/cpp/inference/infer_ut/test_ernie_text_cls.cc
@@ -74,11 +74,11 @@ TEST(gpu_tester_ernie_text_cls, analysis_gpu_bz2_buffer) {
   // get groudtruth by disbale ir
   paddle_infer::services::PredictorPool pred_pool_no_ir(config_no_ir, 1);
   SingleThreadPrediction(
-      pred_pool_no_ir.Retrive(0), &my_input_data_map, &truth_output_data, 1);
+      pred_pool_no_ir.Retrieve(0), &my_input_data_map, &truth_output_data, 1);
   // get infer results
   paddle_infer::services::PredictorPool pred_pool(config, 1);
   SingleThreadPrediction(
-      pred_pool.Retrive(0), &my_input_data_map, &infer_output_data);
+      pred_pool.Retrieve(0), &my_input_data_map, &infer_output_data);
   // check outputs
   CompareRecord(&truth_output_data, &infer_output_data);
   std::cout << "finish test" << std::endl;
@@ -107,14 +107,14 @@ TEST(mkldnn_tester_ernie_text_cls, multi_thread4_mkl_fp32_bz2) {
   // get groudtruth by disbale ir
   paddle_infer::services::PredictorPool pred_pool_no_ir(config_no_ir, 1);
   SingleThreadPrediction(
-      pred_pool_no_ir.Retrive(0), &my_input_data_map, &truth_output_data, 1);
+      pred_pool_no_ir.Retrieve(0), &my_input_data_map, &truth_output_data, 1);
 
   // get infer results from multi threads
   std::vector<std::thread> threads;
   services::PredictorPool pred_pool(config, thread_num);
   for (int i = 0; i < thread_num; ++i) {
     threads.emplace_back(paddle::test::SingleThreadPrediction,
-                         pred_pool.Retrive(i),
+                         pred_pool.Retrieve(i),
                          &my_input_data_map,
                          &infer_output_data,
                          2);
diff --git a/test/cpp/inference/infer_ut/test_mobilnetv1.cc b/test/cpp/inference/infer_ut/test_mobilnetv1.cc
@@ -71,7 +71,7 @@ TEST(tensorrt_tester_mobilenetv1, tuned_dynamic_trt_fp32_bz2) {
   LOG(INFO) << config.Summary();
   paddle_infer::services::PredictorPool pred_pool(config, 1);
   SingleThreadPrediction(
-      pred_pool.Retrive(0), &my_input_data_map, &infer_output_data);
+      pred_pool.Retrieve(0), &my_input_data_map, &infer_output_data);
   // check outputs
   CompareRecord(&truth_output_data, &infer_output_data);
   VLOG(1) << "finish test";
diff --git a/test/cpp/inference/infer_ut/test_ppyolo_mbv3.cc b/test/cpp/inference/infer_ut/test_ppyolo_mbv3.cc
@@ -78,14 +78,14 @@ TEST(tensorrt_tester_ppyolo_mbv3, multi_thread4_trt_fp32_bz2) {
   // get groudtruth by disbale ir
   paddle_infer::services::PredictorPool pred_pool_no_ir(config_no_ir, 1);
   SingleThreadPrediction(
-      pred_pool_no_ir.Retrive(0), &input_data_map, &truth_output_data, 1);
+      pred_pool_no_ir.Retrieve(0), &input_data_map, &truth_output_data, 1);
 
   // get infer results from multi threads
   std::vector<std::thread> threads;
   services::PredictorPool pred_pool(config, thread_num);
   for (int i = 0; i < thread_num; ++i) {
     threads.emplace_back(paddle::test::SingleThreadPrediction,
-                         pred_pool.Retrive(i),
+                         pred_pool.Retrieve(i),
                          &input_data_map,
                          &infer_output_data,
                          2);
@@ -128,14 +128,14 @@ TEST(DISABLED_mkldnn_tester_ppyolo_mbv3, multi_thread4_mkl_bz2) {
   // get groudtruth by disbale ir
   paddle_infer::services::PredictorPool pred_pool_no_ir(config_no_ir, 1);
   SingleThreadPrediction(
-      pred_pool_no_ir.Retrive(0), &input_data_map, &truth_output_data, 1);
+      pred_pool_no_ir.Retrieve(0), &input_data_map, &truth_output_data, 1);
 
   // get infer results from multi threads
   std::vector<std::thread> threads;
   services::PredictorPool pred_pool(config, thread_num);
   for (int i = 0; i < thread_num; ++i) {
     threads.emplace_back(paddle::test::SingleThreadPrediction,
-                         pred_pool.Retrive(i),
+                         pred_pool.Retrieve(i),
                          &input_data_map,
                          &infer_output_data,
                          2);
diff --git a/test/cpp/inference/infer_ut/test_ppyolov2_r50vd.cc b/test/cpp/inference/infer_ut/test_ppyolov2_r50vd.cc
@@ -78,14 +78,14 @@ TEST(tensorrt_tester_ppyolov2_r50vd, multi_thread2_trt_fp32_bz1) {
   // get groudtruth by disbale ir
   paddle_infer::services::PredictorPool pred_pool_no_ir(config_no_ir, 1);
   SingleThreadPrediction(
-      pred_pool_no_ir.Retrive(0), &input_data_map, &truth_output_data, 1);
+      pred_pool_no_ir.Retrieve(0), &input_data_map, &truth_output_data, 1);
 
   // get infer results from multi threads
   std::vector<std::thread> threads;
   services::PredictorPool pred_pool(config, thread_num);
   for (int i = 0; i < thread_num; ++i) {
     threads.emplace_back(paddle::test::SingleThreadPrediction,
-                         pred_pool.Retrive(i),
+                         pred_pool.Retrieve(i),
                          &input_data_map,
                          &infer_output_data,
                          2);
@@ -126,14 +126,14 @@ TEST(mkldnn_tester_ppyolov2_r50vd, multi_thread2_mkl_bz2) {
   // get groudtruth by disbale ir
   paddle_infer::services::PredictorPool pred_pool_no_ir(config_no_ir, 1);
   SingleThreadPrediction(
-      pred_pool_no_ir.Retrive(0), &input_data_map, &truth_output_data, 1);
+      pred_pool_no_ir.Retrieve(0), &input_data_map, &truth_output_data, 1);
 
   // get infer results from multi threads
   std::vector<std::thread> threads;
   services::PredictorPool pred_pool(config, thread_num);
   for (int i = 0; i < thread_num; ++i) {
     threads.emplace_back(paddle::test::SingleThreadPrediction,
-                         pred_pool.Retrive(i),
+                         pred_pool.Retrieve(i),
                          &input_data_map,
                          &infer_output_data,
                          2);
diff --git a/test/cpp/inference/infer_ut/test_resnet50.cc b/test/cpp/inference/infer_ut/test_resnet50.cc
@@ -50,11 +50,11 @@ TEST(gpu_tester_resnet50, analysis_gpu_bz1) {
   // get groudtruth by disbale ir
   paddle_infer::services::PredictorPool pred_pool_no_ir(config_no_ir, 1);
   SingleThreadPrediction(
-      pred_pool_no_ir.Retrive(0), &my_input_data_map, &truth_output_data, 1);
+      pred_pool_no_ir.Retrieve(0), &my_input_data_map, &truth_output_data, 1);
   // get infer results
   paddle_infer::services::PredictorPool pred_pool(config, 1);
   SingleThreadPrediction(
-      pred_pool.Retrive(0), &my_input_data_map, &infer_output_data);
+      pred_pool.Retrieve(0), &my_input_data_map, &infer_output_data);
   // check outputs
   CompareRecord(&truth_output_data, &infer_output_data);
   std::cout << "finish test" << std::endl;
@@ -81,11 +81,11 @@ TEST(tensorrt_tester_resnet50, trt_fp32_bz2) {
   // get groudtruth by disbale ir
   paddle_infer::services::PredictorPool pred_pool_no_ir(config_no_ir, 1);
   SingleThreadPrediction(
-      pred_pool_no_ir.Retrive(0), &my_input_data_map, &truth_output_data, 1);
+      pred_pool_no_ir.Retrieve(0), &my_input_data_map, &truth_output_data, 1);
   // get infer results
   paddle_infer::services::PredictorPool pred_pool(config, 1);
   SingleThreadPrediction(
-      pred_pool.Retrive(0), &my_input_data_map, &infer_output_data);
+      pred_pool.Retrieve(0), &my_input_data_map, &infer_output_data);
   // check outputs
   CompareRecord(&truth_output_data, &infer_output_data, 2e-4);
   std::cout << "finish test" << std::endl;
@@ -120,10 +120,10 @@ TEST(tensorrt_tester_resnet50, serial_diff_batch_trt_fp32) {
         truth_output_data;
     // get groudtruth by disbale ir
     SingleThreadPrediction(
-        pred_pool_no_ir.Retrive(0), &my_input_data_map, &truth_output_data, 1);
+        pred_pool_no_ir.Retrieve(0), &my_input_data_map, &truth_output_data, 1);
     // get infer results
     SingleThreadPrediction(
-        pred_pool.Retrive(0), &my_input_data_map, &infer_output_data);
+        pred_pool.Retrieve(0), &my_input_data_map, &infer_output_data);
     // check outputs
     CompareRecord(&truth_output_data, &infer_output_data, 1e-4);
   }
@@ -152,14 +152,14 @@ TEST(tensorrt_tester_resnet50, multi_thread4_trt_fp32_bz2) {
   // get groudtruth by disbale ir
   paddle_infer::services::PredictorPool pred_pool_no_ir(config_no_ir, 1);
   SingleThreadPrediction(
-      pred_pool_no_ir.Retrive(0), &my_input_data_map, &truth_output_data, 1);
+      pred_pool_no_ir.Retrieve(0), &my_input_data_map, &truth_output_data, 1);
 
   // get infer results from multi threads
   std::vector<std::thread> threads;
   services::PredictorPool pred_pool(config, thread_num);
   for (int i = 0; i < thread_num; ++i) {
     threads.emplace_back(paddle::test::SingleThreadPrediction,
-                         pred_pool.Retrive(i),
+                         pred_pool.Retrieve(i),
                          &my_input_data_map,
                          &infer_output_data,
                          2);
@@ -193,11 +193,11 @@ TEST(tensorrt_tester_resnet50, trt_int8_bz2) {
   // get first time prediction int8 results
   paddle_infer::services::PredictorPool pred_pool(config, 1);
   SingleThreadPrediction(
-      pred_pool.Retrive(0), &my_input_data_map, &truth_output_data, 1);
+      pred_pool.Retrieve(0), &my_input_data_map, &truth_output_data, 1);
 
   // get repeat 5 times prediction int8 results
   SingleThreadPrediction(
-      pred_pool.Retrive(0), &my_input_data_map, &infer_output_data, 5);
+      pred_pool.Retrieve(0), &my_input_data_map, &infer_output_data, 5);
 
   // check outputs
   CompareRecord(&truth_output_data, &infer_output_data);
@@ -225,7 +225,7 @@ TEST(DISABLED_tensorrt_tester_resnet50, profile_multi_thread_trt_fp32) {
   std::vector<std::future<double>> calcs;
   for (int i = 0; i < thread_num; ++i) {
     calcs.push_back(std::async(&paddle::test::SingleThreadProfile,
-                               pred_pool.Retrive(i),
+                               pred_pool.Retrieve(i),
                                &my_input_data_map,
                                repeat_time));
   }
diff --git a/test/cpp/inference/infer_ut/test_resnet50_quant.cc b/test/cpp/inference/infer_ut/test_resnet50_quant.cc
@@ -70,7 +70,7 @@ TEST(DISABLED_tensorrt_tester_resnet50_quant, multi_thread4_trt_int8_bz1) {
   services::PredictorPool pred_pool(config, thread_num);
   for (int i = 0; i < thread_num; ++i) {
     threads.emplace_back(paddle::test::SingleThreadPrediction,
-                         pred_pool.Retrive(i),
+                         pred_pool.Retrieve(i),
                          &input_data_map,
                          &infer_output_data,
                          5);
@@ -125,13 +125,13 @@ TEST(DISABLED_tensorrt_tester_resnet50_quant, multi_thread_multi_instance) {
   for (int i = 0; i < thread_num; ++i) {
     if (i % 2 == 0) {
       threads.emplace_back(paddle::test::SingleThreadPrediction,
-                           pred_pool_fp32.Retrive(i),
+                           pred_pool_fp32.Retrieve(i),
                            &input_data_fp32,
                            &infer_output_data,
                            5);
     } else {
       threads.emplace_back(paddle::test::SingleThreadPrediction,
-                           pred_pool_quant.Retrive(i),
+                           pred_pool_quant.Retrieve(i),
                            &input_data_quant,
                            &infer_output_data,
                            5);
diff --git a/test/cpp/inference/infer_ut/test_yolov3.cc b/test/cpp/inference/infer_ut/test_yolov3.cc

Original file line number	Diff line number	Diff line change
`@@ -3393,7 +3393,7 @@ PredictorPool::PredictorPool(const Config &config, size_t size) {`
`3393`	`3393`	`}`
`3394`	`3394`	`}`
`3395`	`3395`
`3396`		`-Predictor *PredictorPool::Retrive(size_t idx) {`
	`3396`	`+Predictor *PredictorPool::Retrieve(size_t idx) {`
`3397`	`3397`	`PADDLE_ENFORCE_LT(`
`3398`	`3398`	`idx,`
`3399`	`3399`	`preds_.size() + 1,`