Merge remote-tracking branch 'origin/dygraph' into dygraph

404a3b31 · Leif · a5530565 · d128c1df · 404a3b31 · 404a3b31
Commit 404a3b31 authored Oct 20, 2021 by Leif
20 changed files
--- a/PTDN/readme.md
+++ b/PTDN/readme.md
+# 推理部署导航
+## 1. 简介
+飞桨除了基本的模型训练和预测，还提供了支持多端多平台的高性能推理部署工具。本文档提供了PaddleOCR中所有模型的推理部署导航PTDN（Paddle Train Deploy Navigation），方便用户查阅每种模型的推理部署打通情况，并可以进行一键测试。
+<div align="center">
+    <img src="docs/guide.png" width="1000">
+</div>
+## 2. 汇总信息
+打通情况汇总如下，已填写的部分表示可以使用本工具进行一键测试，未填写的表示正在支持中。
+**字段说明：**
+- 基础训练预测：包括模型训练、Paddle Inference Python预测。
+- 其他：包括Paddle Inference C++预测、Paddle Serving部署、Paddle-Lite部署等。
+| 算法论文 | 模型名称 | 模型类型 | 基础训练预测 |   其他  |
+| :--- | :--- |  :----:  | :--------: |  :----  |
+| DB     |ch_ppocr_mobile_v2.0_det | 检测  | 支持 | Paddle Inference: C++ <br> Paddle Serving: Python, C++ <br> Paddle-Lite: <br> (1) ARM CPU(C++) |
+| DB     |ch_ppocr_server_v2.0_det | 检测  | 支持 | Paddle Inference: C++ <br> Paddle Serving: Python, C++ <br> Paddle-Lite: <br> (1) ARM CPU(C++) |
+| DB     |ch_PP-OCRv2_det          | 检测  |
+| CRNN   |ch_ppocr_mobile_v2.0_rec | 识别  | 支持 | Paddle Inference: C++ <br> Paddle Serving: Python, C++ <br> Paddle-Lite: <br> (1) ARM CPU(C++) |
+| CRNN   |ch_ppocr_server_v2.0_rec | 识别  | 支持 | Paddle Inference: C++ <br> Paddle Serving: Python, C++ <br> Paddle-Lite: <br> (1) ARM CPU(C++) |
+| CRNN   |ch_PP-OCRv2_rec          | 识别  |
+| PP-OCR |ch_ppocr_mobile_v2.0 | 检测+识别  | 支持 | Paddle Inference: C++ <br> Paddle Serving: Python, C++ <br> Paddle-Lite: <br> (1) ARM CPU(C++) |
+| PP-OCR |ch_ppocr_server_v2.0 | 检测+识别  | 支持 | Paddle Inference: C++ <br> Paddle Serving: Python, C++ <br> Paddle-Lite: <br> (1) ARM CPU(C++) |
+|PP-OCRv2|ch_PP-OCRv2 | 检测+识别  | 支持 | Paddle Inference: C++ <br> Paddle Serving: Python, C++ <br> Paddle-Lite: <br> (1) ARM CPU(C++) |
+| DB     |det_mv3_db_v2.0                | 检测  |
+| DB     |det_r50_vd_db_v2.0             | 检测  |
+| EAST   |det_mv3_east_v2.0              | 检测  |
+| EAST   |det_r50_vd_east_v2.0           | 检测  |
+| PSENet |det_mv3_pse_v2.0               | 检测  |
+| PSENet |det_r50_vd_pse_v2.0            | 检测  |
+| SAST   |det_r50_vd_sast_totaltext_v2.0 | 检测  |
+| Rosetta|rec_mv3_none_none_ctc_v2.0     | 识别  |
+| Rosetta|rec_r34_vd_none_none_ctc_v2.0  | 识别  |
+| CRNN   |rec_mv3_none_bilstm_ctc_v2.0   | 识别  |
+| CRNN   |rec_r34_vd_none_bilstm_ctc_v2.0| 识别  |
+| StarNet|rec_mv3_tps_bilstm_ctc_v2.0    | 识别  |
+| StarNet|rec_r34_vd_tps_bilstm_ctc_v2.0 | 识别  |
+| RARE   |rec_mv3_tps_bilstm_att_v2.0    | 识别  |
+| RARE   |rec_r34_vd_tps_bilstm_att_v2.0 | 识别  |
+| SRN    |rec_r50fpn_vd_none_srn         | 识别  |
+| NRTR   |rec_mtb_nrtr                   | 识别  |
+| SAR    |rec_r31_sar                    | 识别  |
+| PGNet  |rec_r34_vd_none_none_ctc_v2.0  | 端到端|
+## 3. 一键测试工具使用
+### 目录介绍
+```shell
+PTDN/
+├── configs/  # 配置文件目录
+	├── det_mv3_db.yml               # 测试mobile版ppocr检测模型训练的yml文件
+	├── det_r50_vd_db.yml            # 测试server版ppocr检测模型训练的yml文件
+	├── rec_icdar15_r34_train.yml    # 测试server版ppocr识别模型训练的yml文件
+	├── ppocr_sys_mobile_params.txt     # 测试mobile版ppocr检测+识别模型串联的参数配置文件
+	├── ppocr_det_mobile_params.txt     # 测试mobile版ppocr检测模型的参数配置文件
+	├── ppocr_rec_mobile_params.txt     # 测试mobile版ppocr识别模型的参数配置文件
+	├── ppocr_sys_server_params.txt     # 测试server版ppocr检测+识别模型串联的参数配置文件
+	├── ppocr_det_server_params.txt     # 测试server版ppocr检测模型的参数配置文件
+	├── ppocr_rec_server_params.txt     # 测试server版ppocr识别模型的参数配置文件
+	├── ...                                
+├── results/   # 预先保存的预测结果，用于和实际预测结果进行精读比对
+	├── python_ppocr_det_mobile_results_fp32.txt           # 预存的mobile版ppocr检测模型python预测fp32精度的结果
+	├── python_ppocr_det_mobile_results_fp16.txt           # 预存的mobile版ppocr检测模型python预测fp16精度的结果
+	├── cpp_ppocr_det_mobile_results_fp32.txt       # 预存的mobile版ppocr检测模型c++预测的fp32精度的结果
+	├── cpp_ppocr_det_mobile_results_fp16.txt       # 预存的mobile版ppocr检测模型c++预测的fp16精度的结果
+	├── ...
+├── prepare.sh                        # 完成test_*.sh运行所需要的数据和模型下载
+├── test_train_inference_python.sh    # 测试python训练预测的主程序
+├── test_inference_cpp.sh             # 测试c++预测的主程序
+├── test_serving.sh                   # 测试serving部署预测的主程序
+├── test_lite.sh                      # 测试lite部署预测的主程序
+├── compare_results.py                # 用于对比log中的预测结果与results中的预存结果精度误差是否在限定范围内
+└── readme.md                         # 使用文档
+```
+### 测试流程
+使用本工具，可以测试不同功能的支持情况，以及预测结果是否对齐，测试流程如下：
+<div align="center">
+    <img src="docs/test.png" width="800">
+</div>
+1. 运行prepare.sh准备测试所需数据和模型；
+2. 运行要测试的功能对应的测试脚本`test_*.sh`，产出log，由log可以看到不同配置是否运行成功；
+3. 用`compare_results.py`对比log中的预测结果和预存在results目录下的结果，判断预测精度是否符合预期（在误差范围内）。
+其中，有4个测试主程序，功能如下：
+- `test_train_inference_python.sh`：测试基于Python的模型训练、评估、推理等基本功能，包括裁剪、量化、蒸馏。
+- `test_inference_cpp.sh`：测试基于C++的模型推理。
+- `test_serving.sh`：测试基于Paddle Serving的服务化部署功能。
+- `test_lite.sh`：测试基于Paddle-Lite的端侧预测部署功能。
+各功能测试中涉及混合精度、裁剪、量化等训练相关，及mkldnn、Tensorrt等多种预测相关参数配置，请点击下方相应链接了解更多细节和使用教程：  
+[test_train_inference_python 使用](docs/test_train_inference_python.md)  
+[test_inference_cpp 使用](docs/test_inference_cpp.md)  
+[test_serving 使用](docs/test_serving.md)  
+[test_lite 使用](docs/test_lite.md)  
--- a/tests/results/ppocr_det_mobile_results_fp16_cpp.txt
+++ b/tests/results/ppocr_det_mobile_results_fp16_cpp.txt
--- a/tests/results/ppocr_det_mobile_results_fp32_cpp.txt
+++ b/tests/results/ppocr_det_mobile_results_fp32_cpp.txt
--- a/tests/results/ppocr_det_mobile_results_fp16.txt
+++ b/tests/results/ppocr_det_mobile_results_fp16.txt
--- a/tests/results/ppocr_det_mobile_results_fp32.txt
+++ b/tests/results/ppocr_det_mobile_results_fp32.txt
--- a/tests/test_cpp.sh
+++ b/tests/test_cpp.sh
@@ -56,7 +56,11 @@ function func_cpp_inference(){
                fi
                for threads in ${cpp_cpu_threads_list[*]}; do
                    for batch_size in ${cpp_batch_size_list[*]}; do
-                        _save_log_path="${_log_path}/cpp_infer_cpu_usemkldnn_${use_mkldnn}_threads_${threads}_batchsize_${batch_size}.log"
+                        precision="fp32"
+                        if [ ${use_mkldnn} = "False" ] && [ ${_flag_quant} = "True" ]; then
+                            precison="int8"
+                        fi
+                        _save_log_path="${_log_path}/cpp_infer_cpu_usemkldnn_${use_mkldnn}_threads_${threads}_precision_${precision}_batchsize_${batch_size}.log"
                        set_infer_data=$(func_set_params "${cpp_image_dir_key}" "${_img_dir}")
                        set_benchmark=$(func_set_params "${cpp_benchmark_key}" "${cpp_benchmark_value}")
                        set_batchsize=$(func_set_params "${cpp_batch_size_key}" "${batch_size}")

--- a/tests/test_serving.sh
+++ b/tests/test_serving.sh
@@ -2,44 +2,44 @@
 source tests/common_func.sh
 FILENAME=$1
-dataline=$(awk 'NR==67, NR==81{print}'  $FILENAME)
+dataline=$(awk 'NR==67, NR==83{print}'  $FILENAME)
 # parser params
 IFS=$'\n'
 lines=(${dataline})
 # parser serving
-trans_model_py=$(func_parser_value "${lines[1]}")
+model_name=$(func_parser_value "${lines[1]}")
-infer_model_dir_key=$(func_parser_key "${lines[2]}")
+python=$(func_parser_value "${lines[2]}")
-infer_model_dir_value=$(func_parser_value "${lines[2]}")
+trans_model_py=$(func_parser_value "${lines[3]}")
-model_filename_key=$(func_parser_key "${lines[3]}")
+infer_model_dir_key=$(func_parser_key "${lines[4]}")
-model_filename_value=$(func_parser_value "${lines[3]}")
+infer_model_dir_value=$(func_parser_value "${lines[4]}")
-params_filename_key=$(func_parser_key "${lines[4]}")
+model_filename_key=$(func_parser_key "${lines[5]}")
-params_filename_value=$(func_parser_value "${lines[4]}")
+model_filename_value=$(func_parser_value "${lines[5]}")
-serving_server_key=$(func_parser_key "${lines[5]}")
+params_filename_key=$(func_parser_key "${lines[6]}")
-serving_server_value=$(func_parser_value "${lines[5]}")
+params_filename_value=$(func_parser_value "${lines[6]}")
-serving_client_key=$(func_parser_key "${lines[6]}")
+serving_server_key=$(func_parser_key "${lines[7]}")
-serving_client_value=$(func_parser_value "${lines[6]}")
+serving_server_value=$(func_parser_value "${lines[7]}")
-serving_dir_value=$(func_parser_value "${lines[7]}")
+serving_client_key=$(func_parser_key "${lines[8]}")
-web_service_py=$(func_parser_value "${lines[8]}")
+serving_client_value=$(func_parser_value "${lines[8]}")
-web_use_gpu_key=$(func_parser_key "${lines[9]}")
+serving_dir_value=$(func_parser_value "${lines[9]}")
-web_use_gpu_list=$(func_parser_value "${lines[9]}")
+web_service_py=$(func_parser_value "${lines[10]}")
-web_use_mkldnn_key=$(func_parser_key "${lines[10]}")
+web_use_gpu_key=$(func_parser_key "${lines[11]}")
-web_use_mkldnn_list=$(func_parser_value "${lines[10]}")
+web_use_gpu_list=$(func_parser_value "${lines[11]}")
-web_cpu_threads_key=$(func_parser_key "${lines[11]}")
+web_use_mkldnn_key=$(func_parser_key "${lines[12]}")
-web_cpu_threads_list=$(func_parser_value "${lines[11]}")
+web_use_mkldnn_list=$(func_parser_value "${lines[12]}")
-web_use_trt_key=$(func_parser_key "${lines[12]}")
+web_cpu_threads_key=$(func_parser_key "${lines[13]}")
-web_use_trt_list=$(func_parser_value "${lines[12]}")
+web_cpu_threads_list=$(func_parser_value "${lines[13]}")
-web_precision_key=$(func_parser_key "${lines[13]}")
+web_use_trt_key=$(func_parser_key "${lines[14]}")
-web_precision_list=$(func_parser_value "${lines[13]}")
+web_use_trt_list=$(func_parser_value "${lines[14]}")
-pipeline_py=$(func_parser_value "${lines[14]}")
+web_precision_key=$(func_parser_key "${lines[15]}")
+web_precision_list=$(func_parser_value "${lines[15]}")
+pipeline_py=$(func_parser_value "${lines[16]}")
+LOG_PATH="../../tests/output"
-LOG_PATH="./tests/output"
+mkdir -p ./tests/output
-mkdir -p ${LOG_PATH}
 status_log="${LOG_PATH}/results_serving.log"
 function func_serving(){
    IFS='|'
    _python=$1
@@ -65,12 +65,12 @@ function func_serving(){
                    continue
                fi
                for threads in ${web_cpu_threads_list[*]}; do
-                      _save_log_path="${_log_path}/server_cpu_usemkldnn_${use_mkldnn}_threads_${threads}_batchsize_1.log"
+                      _save_log_path="${LOG_PATH}/server_infer_cpu_usemkldnn_${use_mkldnn}_threads_${threads}_batchsize_1.log"
                      set_cpu_threads=$(func_set_params "${web_cpu_threads_key}" "${threads}")
-                      web_service_cmd="${python} ${web_service_py} ${web_use_gpu_key}=${use_gpu} ${web_use_mkldnn_key}=${use_mkldnn} ${set_cpu_threads} &>${_save_log_path} &"
+                      web_service_cmd="${python} ${web_service_py} ${web_use_gpu_key}=${use_gpu} ${web_use_mkldnn_key}=${use_mkldnn} ${set_cpu_threads} &"
                      eval $web_service_cmd
                      sleep 2s
-                      pipeline_cmd="${python} ${pipeline_py}"
+                      pipeline_cmd="${python} ${pipeline_py} > ${_save_log_path} 2>&1 "
                      eval $pipeline_cmd
                      last_status=${PIPESTATUS[0]}
                      eval "cat ${_save_log_path}"
@@ -93,13 +93,13 @@ function func_serving(){
                    if [[ ${use_trt} = "False" || ${precision} =~ "int8" ]] && [[ ${_flag_quant} = "True" ]]; then
                        continue
                    fi
-                    _save_log_path="${_log_path}/infer_gpu_usetrt_${use_trt}_precision_${precision}_batchsize_1.log"
+                    _save_log_path="${LOG_PATH}/server_infer_gpu_usetrt_${use_trt}_precision_${precision}_batchsize_1.log"
                    set_tensorrt=$(func_set_params "${web_use_trt_key}" "${use_trt}")
                    set_precision=$(func_set_params "${web_precision_key}" "${precision}")
-                    web_service_cmd="${python} ${web_service_py} ${web_use_gpu_key}=${use_gpu} ${set_tensorrt} ${set_precision} &>${_save_log_path} & "
+                    web_service_cmd="${python} ${web_service_py} ${web_use_gpu_key}=${use_gpu} ${set_tensorrt} ${set_precision} & "
                    eval $web_service_cmd
                    sleep 2s
-                    pipeline_cmd="${python} ${pipeline_py}"
+                    pipeline_cmd="${python} ${pipeline_py} > ${_save_log_path} 2>&1"
                    eval $pipeline_cmd
                    last_status=${PIPESTATUS[0]}
                    eval "cat ${_save_log_path}"
@@ -129,3 +129,7 @@ eval $env
 echo "################### run test ###################"
+export Count=0
+IFS="|"
+func_serving "${web_service_cmd}"
--- a/tests/test.sh
+++ b/tests/test.sh
 #!/bin/bash
+source tests/common_func.sh
 FILENAME=$1
-# MODE be one of ['lite_train_infer' 'whole_infer' 'whole_train_infer', 'infer', 'cpp_infer', 'serving_infer', 'klquant_infer']
+# MODE be one of ['lite_train_infer' 'whole_infer' 'whole_train_infer', 'infer', 'klquant_infer']
 MODE=$2
-if [ ${MODE} = "cpp_infer" ]; then
-    dataline=$(awk 'NR==67, NR==81{print}'  $FILENAME)
+dataline=$(awk 'NR==1, NR==51{print}'  $FILENAME)
-elif [ ${MODE} = "serving_infer" ]; then
-    dataline=$(awk 'NR==52, NR==66{print}'  $FILENAME)
-elif [ ${MODE} = "klquant_infer" ]; then
-    dataline=$(awk 'NR==82, NR==98{print}'  $FILENAME)
-else
-    dataline=$(awk 'NR==1, NR==51{print}'  $FILENAME)
-fi
 # parser params
 IFS=$'\n'
 lines=(${dataline})
-function func_parser_key(){
-    strs=$1
-    IFS=":"
-    array=(${strs})
-    tmp=${array[0]}
-    echo ${tmp}
-}
-function func_parser_value(){
-    strs=$1
-    IFS=":"
-    array=(${strs})
-    tmp=${array[1]}
-    echo ${tmp}
-}
-function func_set_params(){
-    key=$1
-    value=$2
-    if [ ${key} = "null" ];then
-        echo " "
-    elif [[ ${value} = "null" ]] || [[ ${value} = " " ]] || [ ${#value} -le 0 ];then
-        echo " "
-    else 
-        echo "${key}=${value}"
-    fi
-}
-function func_parser_params(){
-    strs=$1
-    IFS=":"
-    array=(${strs})
-    key=${array[0]}
-    tmp=${array[1]}
-    IFS="|"
-    res=""
-    for _params in ${tmp[*]}; do
-        IFS="="
-        array=(${_params})
-        mode=${array[0]}
-        value=${array[1]}
-        if [[ ${mode} = ${MODE} ]]; then
-            IFS="|"
-            #echo $(func_set_params "${mode}" "${value}")
-            echo $value
-            break
-        fi
-        IFS="|"
-    done
-    echo ${res}
-}
-function status_check(){
-    last_status=$1   # the exit code
-    run_command=$2
-    run_log=$3
-    if [ $last_status -eq 0 ]; then
-        echo -e "\033[33m Run successfully with command - ${run_command}!  \033[0m" | tee -a ${run_log}
-    else
-        echo -e "\033[33m Run failed with command - ${run_command}!  \033[0m" | tee -a ${run_log}
-    fi
-}
-IFS=$'\n'
 # The training params
 model_name=$(func_parser_value "${lines[1]}")
 python=$(func_parser_value "${lines[2]}")
@@ -152,8 +87,10 @@ benchmark_value=$(func_parser_value "${lines[49]}")
 infer_key1=$(func_parser_key "${lines[50]}")
 infer_value1=$(func_parser_value "${lines[50]}")
-# parser serving
+# parser klquant_infer
 if [ ${MODE} = "klquant_infer" ]; then
+    dataline=$(awk 'NR==82, NR==98{print}'  $FILENAME)
+    lines=(${dataline})
    # parser inference model 
    infer_model_dir_list=$(func_parser_value "${lines[1]}")
    infer_export_list=$(func_parser_value "${lines[2]}")
@@ -181,66 +118,10 @@ if [ ${MODE} = "klquant_infer" ]; then
    infer_key1=$(func_parser_key "${lines[15]}")
    infer_value1=$(func_parser_value "${lines[15]}")
 fi
-# parser serving
-if [ ${MODE} = "server_infer" ]; then
-    trans_model_py=$(func_parser_value "${lines[1]}")
-    infer_model_dir_key=$(func_parser_key "${lines[2]}")
-    infer_model_dir_value=$(func_parser_value "${lines[2]}")
-    model_filename_key=$(func_parser_key "${lines[3]}")
-    model_filename_value=$(func_parser_value "${lines[3]}")
-    params_filename_key=$(func_parser_key "${lines[4]}")
-    params_filename_value=$(func_parser_value "${lines[4]}")
-    serving_server_key=$(func_parser_key "${lines[5]}")
-    serving_server_value=$(func_parser_value "${lines[5]}")
-    serving_client_key=$(func_parser_key "${lines[6]}")
-    serving_client_value=$(func_parser_value "${lines[6]}")
-    serving_dir_value=$(func_parser_value "${lines[7]}")
-    web_service_py=$(func_parser_value "${lines[8]}")
-    web_use_gpu_key=$(func_parser_key "${lines[9]}")
-    web_use_gpu_list=$(func_parser_value "${lines[9]}")
-    web_use_mkldnn_key=$(func_parser_key "${lines[10]}")
-    web_use_mkldnn_list=$(func_parser_value "${lines[10]}")
-    web_cpu_threads_key=$(func_parser_key "${lines[11]}")
-    web_cpu_threads_list=$(func_parser_value "${lines[11]}")
-    web_use_trt_key=$(func_parser_key "${lines[12]}")
-    web_use_trt_list=$(func_parser_value "${lines[12]}")
-    web_precision_key=$(func_parser_key "${lines[13]}")
-    web_precision_list=$(func_parser_value "${lines[13]}")
-    pipeline_py=$(func_parser_value "${lines[14]}")
-fi
-if [ ${MODE} = "cpp_infer" ]; then
-    # parser cpp inference model 
-    cpp_infer_model_dir_list=$(func_parser_value "${lines[1]}")
-    cpp_infer_is_quant=$(func_parser_value "${lines[2]}")
-    # parser cpp inference 
-    inference_cmd=$(func_parser_value "${lines[3]}")
-    cpp_use_gpu_key=$(func_parser_key "${lines[4]}")
-    cpp_use_gpu_list=$(func_parser_value "${lines[4]}")
-    cpp_use_mkldnn_key=$(func_parser_key "${lines[5]}")
-    cpp_use_mkldnn_list=$(func_parser_value "${lines[5]}")
-    cpp_cpu_threads_key=$(func_parser_key "${lines[6]}")
-    cpp_cpu_threads_list=$(func_parser_value "${lines[6]}")
-    cpp_batch_size_key=$(func_parser_key "${lines[7]}")
-    cpp_batch_size_list=$(func_parser_value "${lines[7]}")
-    cpp_use_trt_key=$(func_parser_key "${lines[8]}")
-    cpp_use_trt_list=$(func_parser_value "${lines[8]}")
-    cpp_precision_key=$(func_parser_key "${lines[9]}")
-    cpp_precision_list=$(func_parser_value "${lines[9]}")
-    cpp_infer_model_key=$(func_parser_key "${lines[10]}")
-    cpp_image_dir_key=$(func_parser_key "${lines[11]}")
-    cpp_infer_img_dir=$(func_parser_value "${lines[12]}")
-    cpp_infer_key1=$(func_parser_key "${lines[13]}")
-    cpp_infer_value1=$(func_parser_value "${lines[13]}")
-    cpp_benchmark_key=$(func_parser_key "${lines[14]}")
-    cpp_benchmark_value=$(func_parser_value "${lines[14]}")
-fi
 LOG_PATH="./tests/output"
 mkdir -p ${LOG_PATH}
-status_log="${LOG_PATH}/results.log"
+status_log="${LOG_PATH}/results_python.log"
 function func_inference(){
@@ -260,18 +141,28 @@ function func_inference(){
                fi
                for threads in ${cpu_threads_list[*]}; do
                    for batch_size in ${batch_size_list[*]}; do
-                        _save_log_path="${_log_path}/infer_cpu_usemkldnn_${use_mkldnn}_threads_${threads}_batchsize_${batch_size}.log"
+                        for precision in ${precision_list[*]}; do
-                        set_infer_data=$(func_set_params "${image_dir_key}" "${_img_dir}")
+                            if [ ${use_mkldnn} = "False" ] && [ ${precision} = "fp16" ]; then
-                        set_benchmark=$(func_set_params "${benchmark_key}" "${benchmark_value}")
+                                continue
-                        set_batchsize=$(func_set_params "${batch_size_key}" "${batch_size}")
+                            fi # skip when enable fp16 but disable mkldnn
-                        set_cpu_threads=$(func_set_params "${cpu_threads_key}" "${threads}")
+                            if [ ${_flag_quant} = "True" ] && [ ${precision} != "int8" ]; then
-                        set_model_dir=$(func_set_params "${infer_model_key}" "${_model_dir}")
+                                continue
-                        set_infer_params1=$(func_set_params "${infer_key1}" "${infer_value1}")
+                            fi # skip when quant model inference but precision is not int8
-                        command="${_python} ${_script} ${use_gpu_key}=${use_gpu} ${use_mkldnn_key}=${use_mkldnn} ${set_cpu_threads} ${set_model_dir} ${set_batchsize} ${set_infer_data} ${set_benchmark} ${set_infer_params1} > ${_save_log_path} 2>&1 "
+                            set_precision=$(func_set_params "${precision_key}" "${precision}")
-                        eval $command
-                        last_status=${PIPESTATUS[0]}
+                            _save_log_path="${_log_path}/python_infer_cpu_usemkldnn_${use_mkldnn}_threads_${threads}_precision_${precision}_batchsize_${batch_size}.log"
-                        eval "cat ${_save_log_path}"
+                            set_infer_data=$(func_set_params "${image_dir_key}" "${_img_dir}")
-                        status_check $last_status "${command}" "${status_log}"
+                            set_benchmark=$(func_set_params "${benchmark_key}" "${benchmark_value}")
+                            set_batchsize=$(func_set_params "${batch_size_key}" "${batch_size}")
+                            set_cpu_threads=$(func_set_params "${cpu_threads_key}" "${threads}")
+                            set_model_dir=$(func_set_params "${infer_model_key}" "${_model_dir}")
+                            set_infer_params1=$(func_set_params "${infer_key1}" "${infer_value1}")
+                            command="${_python} ${_script} ${use_gpu_key}=${use_gpu} ${use_mkldnn_key}=${use_mkldnn} ${set_cpu_threads} ${set_model_dir} ${set_batchsize} ${set_infer_data} ${set_benchmark} ${set_precision} ${set_infer_params1} > ${_save_log_path} 2>&1 "
+                            eval $command
+                            last_status=${PIPESTATUS[0]}
+                            eval "cat ${_save_log_path}"
+                            status_check $last_status "${command}" "${status_log}"
+                        done
                    done
                done
            done
@@ -288,7 +179,7 @@ function func_inference(){
                        continue
                    fi
                    for batch_size in ${batch_size_list[*]}; do
-                        _save_log_path="${_log_path}/infer_gpu_usetrt_${use_trt}_precision_${precision}_batchsize_${batch_size}.log"
+                        _save_log_path="${_log_path}/python_infer_gpu_usetrt_${use_trt}_precision_${precision}_batchsize_${batch_size}.log"
                        set_infer_data=$(func_set_params "${image_dir_key}" "${_img_dir}")
                        set_benchmark=$(func_set_params "${benchmark_key}" "${benchmark_value}")
                        set_batchsize=$(func_set_params "${batch_size_key}" "${batch_size}")
@@ -310,148 +201,6 @@ function func_inference(){
        fi
    done
 }
-function func_serving(){
-    IFS='|'
-    _python=$1
-    _script=$2
-    _model_dir=$3
-    # pdserving
-    set_dirname=$(func_set_params "${infer_model_dir_key}" "${infer_model_dir_value}")
-    set_model_filename=$(func_set_params "${model_filename_key}" "${model_filename_value}")
-    set_params_filename=$(func_set_params "${params_filename_key}" "${params_filename_value}")
-    set_serving_server=$(func_set_params "${serving_server_key}" "${serving_server_value}")
-    set_serving_client=$(func_set_params "${serving_client_key}" "${serving_client_value}")
-    trans_model_cmd="${python} ${trans_model_py} ${set_dirname} ${set_model_filename} ${set_params_filename} ${set_serving_server} ${set_serving_client}"
-    eval $trans_model_cmd
-    cd ${serving_dir_value}
-    echo $PWD
-    unset https_proxy
-    unset http_proxy
-    for use_gpu in ${web_use_gpu_list[*]}; do
-        echo ${ues_gpu}
-        if [ ${use_gpu} = "null" ]; then
-            for use_mkldnn in ${web_use_mkldnn_list[*]}; do
-                if [ ${use_mkldnn} = "False" ]; then
-                    continue
-                fi
-                for threads in ${web_cpu_threads_list[*]}; do
-                      _save_log_path="${_log_path}/server_cpu_usemkldnn_${use_mkldnn}_threads_${threads}_batchsize_1.log"
-                      set_cpu_threads=$(func_set_params "${web_cpu_threads_key}" "${threads}")
-                      web_service_cmd="${python} ${web_service_py} ${web_use_gpu_key}=${use_gpu} ${web_use_mkldnn_key}=${use_mkldnn} ${set_cpu_threads} &>${_save_log_path} &"
-                      eval $web_service_cmd
-                      sleep 2s
-                      pipeline_cmd="${python} ${pipeline_py}"
-                      eval $pipeline_cmd
-                      last_status=${PIPESTATUS[0]}
-                      eval "cat ${_save_log_path}"
-                      status_check $last_status "${pipeline_cmd}" "${status_log}"
-                      PID=$!
-                      kill $PID
-                      sleep 2s
-                      ps ux | grep -E 'web_service|pipeline' | awk '{print $2}' | xargs kill -s 9
-                done
-            done
-        elif [ ${use_gpu} = "0" ]; then
-            for use_trt in ${web_use_trt_list[*]}; do
-                for precision in ${web_precision_list[*]}; do
-                    if [[ ${_flag_quant} = "False" ]] && [[ ${precision} =~ "int8" ]]; then
-                        continue
-                    fi
-                    if [[ ${precision} =~ "fp16" || ${precision} =~ "int8" ]] && [ ${use_trt} = "False" ]; then
-                        continue
-                    fi
-                    if [[ ${use_trt} = "False" || ${precision} =~ "int8" ]] && [[ ${_flag_quant} = "True" ]]; then
-                        continue
-                    fi
-                    _save_log_path="${_log_path}/infer_gpu_usetrt_${use_trt}_precision_${precision}_batchsize_1.log"
-                    set_tensorrt=$(func_set_params "${web_use_trt_key}" "${use_trt}")
-                    set_precision=$(func_set_params "${web_precision_key}" "${precision}")
-                    web_service_cmd="${python} ${web_service_py} ${web_use_gpu_key}=${use_gpu} ${set_tensorrt} ${set_precision} &>${_save_log_path} & "
-                    eval $web_service_cmd
-                    sleep 2s
-                    pipeline_cmd="${python} ${pipeline_py}"
-                    eval $pipeline_cmd
-                    last_status=${PIPESTATUS[0]}
-                    eval "cat ${_save_log_path}"
-                    status_check $last_status "${pipeline_cmd}" "${status_log}"
-                    PID=$!
-                    kill $PID
-                    sleep 2s
-                    ps ux | grep -E 'web_service|pipeline' | awk '{print $2}' | xargs kill -s 9
-                done
-            done
-        else
-            echo "Does not support hardware other than CPU and GPU Currently!"
-        fi
-    done
-}
-function func_cpp_inference(){
-    IFS='|'
-    _script=$1
-    _model_dir=$2
-    _log_path=$3
-    _img_dir=$4
-    _flag_quant=$5
-    # inference 
-    for use_gpu in ${cpp_use_gpu_list[*]}; do
-        if [ ${use_gpu} = "False" ] || [ ${use_gpu} = "cpu" ]; then
-            for use_mkldnn in ${cpp_use_mkldnn_list[*]}; do
-                if [ ${use_mkldnn} = "False" ] && [ ${_flag_quant} = "True" ]; then
-                    continue
-                fi
-                for threads in ${cpp_cpu_threads_list[*]}; do
-                    for batch_size in ${cpp_batch_size_list[*]}; do
-                        _save_log_path="${_log_path}/cpp_infer_cpu_usemkldnn_${use_mkldnn}_threads_${threads}_batchsize_${batch_size}.log"
-                        set_infer_data=$(func_set_params "${cpp_image_dir_key}" "${_img_dir}")
-                        set_benchmark=$(func_set_params "${cpp_benchmark_key}" "${cpp_benchmark_value}")
-                        set_batchsize=$(func_set_params "${cpp_batch_size_key}" "${batch_size}")
-                        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} ${cpp_use_mkldnn_key}=${use_mkldnn} ${set_cpu_threads} ${set_model_dir} ${set_batchsize} ${set_infer_data} ${set_benchmark} ${set_infer_params1} > ${_save_log_path} 2>&1 "
-                        eval $command
-                        last_status=${PIPESTATUS[0]}
-                        eval "cat ${_save_log_path}"
-                        status_check $last_status "${command}" "${status_log}"
-                    done
-                done
-            done
-        elif [ ${use_gpu} = "True" ] || [ ${use_gpu} = "gpu" ]; then
-            for use_trt in ${cpp_use_trt_list[*]}; do
-                for precision in ${cpp_precision_list[*]}; do
-                    if [[ ${_flag_quant} = "False" ]] && [[ ${precision} =~ "int8" ]]; then
-                        continue
-                    fi 
-                    if [[ ${precision} =~ "fp16" || ${precision} =~ "int8" ]] && [ ${use_trt} = "False" ]; then
-                        continue
-                    fi
-                    if [[ ${use_trt} = "False" || ${precision} =~ "int8" ]] && [ ${_flag_quant} = "True" ]; then
-                        continue
-                    fi
-                    for batch_size in ${cpp_batch_size_list[*]}; do
-                        _save_log_path="${_log_path}/cpp_infer_gpu_usetrt_${use_trt}_precision_${precision}_batchsize_${batch_size}.log"
-                        set_infer_data=$(func_set_params "${cpp_image_dir_key}" "${_img_dir}")
-                        set_benchmark=$(func_set_params "${cpp_benchmark_key}" "${cpp_benchmark_value}")
-                        set_batchsize=$(func_set_params "${cpp_batch_size_key}" "${batch_size}")
-                        set_tensorrt=$(func_set_params "${cpp_use_trt_key}" "${use_trt}")
-                        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 "
-                        eval $command
-                        last_status=${PIPESTATUS[0]}
-                        eval "cat ${_save_log_path}"
-                        status_check $last_status "${command}" "${status_log}"
-                    done
-                done
-            done
-        else
-            echo "Does not support hardware other than CPU and GPU Currently!"
-        fi
-    done
-}
 if [ ${MODE} = "infer" ] || [ ${MODE} = "klquant_infer" ]; then
    GPUID=$3
@@ -483,44 +232,12 @@ if [ ${MODE} = "infer" ] || [ ${MODE} = "klquant_infer" ]; then
        fi
        #run inference
        is_quant=${infer_quant_flag[Count]}
+        if [ ${MODE} = "klquant_infer" ]; then
+            is_quant="True"
+        fi
        func_inference "${python}" "${inference_py}" "${save_infer_dir}" "${LOG_PATH}" "${infer_img_dir}" ${is_quant}
        Count=$(($Count + 1))
    done
-elif [ ${MODE} = "cpp_infer" ]; then
-    GPUID=$3
-    if [ ${#GPUID} -le 0 ];then
-        env=" "
-    else
-        env="export CUDA_VISIBLE_DEVICES=${GPUID}"
-    fi
-    # set CUDA_VISIBLE_DEVICES
-    eval $env
-    export Count=0
-    IFS="|"
-    infer_quant_flag=(${cpp_infer_is_quant})
-    for infer_model in ${cpp_infer_model_dir_list[*]}; do
-        #run inference
-        is_quant=${infer_quant_flag[Count]}
-        func_cpp_inference "${inference_cmd}" "${infer_model}" "${LOG_PATH}" "${cpp_infer_img_dir}" ${is_quant}
-        Count=$(($Count + 1))
-    done
-elif [ ${MODE} = "serving_infer" ]; then
-    GPUID=$3
-    if [ ${#GPUID} -le 0 ];then
-        env=" "
-    else
-        env="export CUDA_VISIBLE_DEVICES=${GPUID}"
-    fi
-    # set CUDA_VISIBLE_DEVICES
-    eval $env
-    export Count=0
-    IFS="|"
-    #run serving
-    func_serving "${web_service_cmd}"
 else
    IFS="|"
    export Count=0
@@ -632,3 +349,4 @@ else
        done      # done with:    for autocast in ${autocast_list[*]}; do 
    done          # done with:    for gpu in ${gpu_list[*]}; do
 fi  # end if [ ${MODE} = "infer" ]; then
--- a/configs/rec/ch_PP-OCRv2/ch_PP-OCRv2_rec.yml
+++ b/configs/rec/ch_PP-OCRv2/ch_PP-OCRv2_rec.yml
@@ -14,7 +14,6 @@ Global:
  use_visualdl: false
  infer_img: doc/imgs_words/ch/word_1.jpg
  character_dict_path: ppocr/utils/ppocr_keys_v1.txt
-  character_type: ch
  max_text_length: 25
  infer_mode: false
  use_space_char: true

--- a/configs/rec/ch_PP-OCRv2/ch_PP-OCRv2_rec_distillation.yml
+++ b/configs/rec/ch_PP-OCRv2/ch_PP-OCRv2_rec_distillation.yml
@@ -14,7 +14,6 @@ Global:
  use_visualdl: false
  infer_img: doc/imgs_words/ch/word_1.jpg
  character_dict_path: ppocr/utils/ppocr_keys_v1.txt
-  character_type: ch
  max_text_length: 25
  infer_mode: false
  use_space_char: true

--- a/configs/rec/ch_PP-OCRv2/ch_PP-OCRv2_rec_enhanced_ctc_loss.yml
+++ b/configs/rec/ch_PP-OCRv2/ch_PP-OCRv2_rec_enhanced_ctc_loss.yml
@@ -14,7 +14,6 @@ Global:
  use_visualdl: false
  infer_img: doc/imgs_words/ch/word_1.jpg
  character_dict_path: ppocr/utils/ppocr_keys_v1.txt
-  character_type: ch
  max_text_length: 25
  infer_mode: false
  use_space_char: true

--- a/configs/rec/ch_ppocr_v2.0/rec_chinese_common_train_v2.0.yml
+++ b/configs/rec/ch_ppocr_v2.0/rec_chinese_common_train_v2.0.yml
@@ -15,7 +15,6 @@ Global:
  infer_img: doc/imgs_words/ch/word_1.jpg
  # for data or label process
  character_dict_path: ppocr/utils/ppocr_keys_v1.txt
-  character_type: ch
  max_text_length: 25
  infer_mode: False
  use_space_char: True

--- a/configs/rec/ch_ppocr_v2.0/rec_chinese_lite_train_v2.0.yml
+++ b/configs/rec/ch_ppocr_v2.0/rec_chinese_lite_train_v2.0.yml
@@ -15,7 +15,6 @@ Global:
  infer_img: doc/imgs_words/ch/word_1.jpg
  # for data or label process
  character_dict_path: ppocr/utils/ppocr_keys_v1.txt
-  character_type: ch
  max_text_length: 25
  infer_mode: False
  use_space_char: True

--- a/configs/rec/multi_language/rec_arabic_lite_train.yml
+++ b/configs/rec/multi_language/rec_arabic_lite_train.yml
@@ -15,7 +15,6 @@ Global:
  use_visualdl: false
  infer_img: null
  character_dict_path: ppocr/utils/dict/arabic_dict.txt
-  character_type: arabic
  max_text_length: 25
  infer_mode: false
  use_space_char: true

--- a/configs/rec/multi_language/rec_cyrillic_lite_train.yml
+++ b/configs/rec/multi_language/rec_cyrillic_lite_train.yml
@@ -15,7 +15,6 @@ Global:
  use_visualdl: false
  infer_img: null
  character_dict_path: ppocr/utils/dict/cyrillic_dict.txt
-  character_type: cyrillic
  max_text_length: 25
  infer_mode: false
  use_space_char: true

--- a/configs/rec/multi_language/rec_devanagari_lite_train.yml
+++ b/configs/rec/multi_language/rec_devanagari_lite_train.yml
@@ -15,7 +15,6 @@ Global:
  use_visualdl: false
  infer_img: null
  character_dict_path: ppocr/utils/dict/devanagari_dict.txt
-  character_type: devanagari
  max_text_length: 25
  infer_mode: false
  use_space_char: true

--- a/configs/rec/multi_language/rec_en_number_lite_train.yml
+++ b/configs/rec/multi_language/rec_en_number_lite_train.yml
@@ -16,7 +16,6 @@ Global:
  infer_img:
  # for data or label process
  character_dict_path: ppocr/utils/en_dict.txt
-  character_type: EN
  max_text_length: 25
  infer_mode: False
  use_space_char: True

--- a/configs/rec/multi_language/rec_french_lite_train.yml
+++ b/configs/rec/multi_language/rec_french_lite_train.yml
@@ -16,7 +16,6 @@ Global:
  infer_img:
  # for data or label process
  character_dict_path: ppocr/utils/dict/french_dict.txt
-  character_type: french
  max_text_length: 25
  infer_mode: False
  use_space_char: False

--- a/configs/rec/multi_language/rec_german_lite_train.yml
+++ b/configs/rec/multi_language/rec_german_lite_train.yml
@@ -16,7 +16,6 @@ Global:
  infer_img:
  # for data or label process
  character_dict_path: ppocr/utils/dict/german_dict.txt
-  character_type: german
  max_text_length: 25
  infer_mode: False
  use_space_char: False

--- a/configs/rec/multi_language/rec_japan_lite_train.yml
+++ b/configs/rec/multi_language/rec_japan_lite_train.yml
@@ -16,7 +16,6 @@ Global:
  infer_img:
  # for data or label process
  character_dict_path: ppocr/utils/dict/japan_dict.txt
-  character_type: japan
  max_text_length: 25
  infer_mode: False
  use_space_char: False