adatator tipc

deploy/cpp_infer/src/main.cpp

@@ -75,6 +75,16 @@ int main(int argc, char **argv) {
       ocr.ocr(cv_all_img_names, FLAGS_det, FLAGS_rec, FLAGS_cls);
 
   for (int i = 0; i < cv_all_img_names.size(); ++i) {
+    if (FLAGS_benchmark) {
+      cout << cv_all_img_names[i] << '\t';
+      for (int n = 0; n < ocr_results[i].size(); n++) {
+        for (int m = 0; m < ocr_results[i][n].box.size(); m++) {
+          cout << ocr_results[i][n].box[m][0] << ' '
+               << ocr_results[i][n].box[m][1] << ' ';
+        }
+      }
+      cout << endl;
+    } else {
       cout << cv_all_img_names[i] << "\n";
       Utility::print_result(ocr_results[i]);
       if (FLAGS_visualize && FLAGS_det) {
@@ -91,4 +101,5 @@ int main(int argc, char **argv) {
       }
       cout << "***************************" << endl;
     }
+  }
 }

deploy/cpp_infer/src/paddleocr.cpp

@@ -144,7 +144,9 @@ PaddleOCR::ocr(std::vector<cv::String> cv_all_img_names, bool det, bool rec,
 
     for (int i = 0; i < cv_all_img_names.size(); ++i) {
       std::vector<OCRPredictResult> ocr_result;
+      if (!FLAGS_benchmark) {
         cout << "predict img: " << cv_all_img_names[i] << endl;
+      }
 
       cv::Mat srcimg = cv::imread(cv_all_img_names[i], cv::IMREAD_COLOR);
       if (!srcimg.data) {

test_tipc/configs/ch_ppocr_mobile_v2.0_det/model_linux_gpu_normal_normal_infer_cpp_linux_gpu_cpu.txt

@@ -3,8 +3,8 @@ model_name:ocr_det
 use_opencv:True
 infer_model:./inference/ch_ppocr_mobile_v2.0_det_infer/
 infer_quant:False
-inference:./deploy/cpp_infer/build/ppocr det
---use_gpu:True|False
+inference:./deploy/cpp_infer/build/ppocr
+--use_gpu:False
 --enable_mkldnn:True|False
 --cpu_threads:1|6
 --rec_batch_num:1
@@ -14,3 +14,7 @@ inference:./deploy/cpp_infer/build/ppocr det
 --image_dir:./inference/ch_det_data_50/all-sum-510/
 null:null
 --benchmark:True
+--det:True
+--rec:False
+--cls:False
+--use_angle_cls:False
\ No newline at end of file

test_tipc/test_inference_cpp.sh

@@ -2,7 +2,7 @@
 source test_tipc/common_func.sh
 
 FILENAME=$1
-dataline=$(awk 'NR==1, NR==16{print}'  $FILENAME)
+dataline=$(awk 'NR==1, NR==20{print}'  $FILENAME)
 
 # parser params
 IFS=$'\n'
@@ -34,6 +34,14 @@ cpp_infer_key1=$(func_parser_key "${lines[14]}")
 cpp_infer_value1=$(func_parser_value "${lines[14]}")
 cpp_benchmark_key=$(func_parser_key "${lines[15]}")
 cpp_benchmark_value=$(func_parser_value "${lines[15]}")
+cpp_det_key=$(func_parser_key "${lines[16]}")
+cpp_det_value=$(func_parser_value "${lines[16]}")
+cpp_rec_key=$(func_parser_key "${lines[17]}")
+cpp_rec_value=$(func_parser_value "${lines[17]}")
+cpp_cls_key=$(func_parser_key "${lines[18]}")
+cpp_cls_value=$(func_parser_value "${lines[18]}")
+cpp_use_angle_cls_key=$(func_parser_key "${lines[19]}")
+cpp_use_angle_cls_value=$(func_parser_value "${lines[19]}")
 
 LOG_PATH="./test_tipc/output"
 mkdir -p ${LOG_PATH}
@@ -68,7 +76,11 @@ function func_cpp_inference(){
                         set_cpu_threads=$(func_set_params "${cpp_cpu_threads_key}" "${threads}")
                         set_model_dir=$(func_set_params "${cpp_infer_model_key}" "${_model_dir}")
                         set_infer_params1=$(func_set_params "${cpp_infer_key1}" "${cpp_infer_value1}")
-                        command="${_script} ${cpp_use_gpu_key}=${use_gpu} ${set_mkldnn} ${set_cpu_threads} ${set_model_dir} ${set_batchsize} ${set_infer_data} ${set_benchmark} ${set_infer_params1} > ${_save_log_path} 2>&1 "
+                        set_det=$(func_set_params "${cpp_det_key}" "${cpp_det_value}")
+                        set_rec=$(func_set_params "${cpp_rec_key}" "${cpp_rec_value}")
+                        set_cls=$(func_set_params "${cpp_cls_key}" "${cpp_cls_value}")
+                        set_use_angle_cls=$(func_set_params "${cpp_use_angle_cls_key}" "${cpp_use_angle_cls_value}")
+                        command="${_script} ${cpp_use_gpu_key}=${use_gpu} ${set_mkldnn} ${set_cpu_threads} ${set_model_dir} ${set_batchsize} ${set_infer_data} ${set_benchmark} ${set_det} ${set_rec} ${set_cls} ${set_use_angle_cls} ${set_infer_params1} > ${_save_log_path} 2>&1 "
                         eval $command
                         last_status=${PIPESTATUS[0]}
                         eval "cat ${_save_log_path}"
@@ -97,7 +109,11 @@ function func_cpp_inference(){
                         set_precision=$(func_set_params "${cpp_precision_key}" "${precision}")
                         set_model_dir=$(func_set_params "${cpp_infer_model_key}" "${_model_dir}")
                         set_infer_params1=$(func_set_params "${cpp_infer_key1}" "${cpp_infer_value1}")
-                        command="${_script} ${cpp_use_gpu_key}=${use_gpu} ${set_tensorrt} ${set_precision} ${set_model_dir} ${set_batchsize} ${set_infer_data} ${set_benchmark} ${set_infer_params1} > ${_save_log_path} 2>&1 "
+                        set_det=$(func_set_params "${cpp_det_key}" "${cpp_det_value}")
+                        set_rec=$(func_set_params "${cpp_rec_key}" "${cpp_rec_value}")
+                        set_cls=$(func_set_params "${cpp_cls_key}" "${cpp_cls_value}")
+                        set_use_angle_cls=$(func_set_params "${cpp_use_angle_cls_key}" "${cpp_use_angle_cls_value}")
+                        command="${_script} ${cpp_use_gpu_key}=${use_gpu} ${set_tensorrt} ${set_precision} ${set_model_dir} ${set_batchsize} ${set_infer_data} ${set_benchmark} ${set_det} ${set_rec} ${set_cls} ${set_use_angle_cls} ${set_infer_params1} > ${_save_log_path} 2>&1 "
                         eval $command
                         last_status=${PIPESTATUS[0]}
                         eval "cat ${_save_log_path}"