Merge branch 'dygraph' into dygraph

test_tipc/configs/det_r18_vd_v2_0/train_infer_python.txt

@@ -49,6 +49,8 @@ inference:tools/infer/predict_det.py
 --save_log_path:null
 --benchmark:True
 null:null
+===========================infer_benchmark_params==========================
+random_infer_input:[{float32,[3,640,640]}];[{float32,[3,960,960]}]
 ===========================train_benchmark_params==========================
 batch_size:8|16
 fp_items:fp32|fp16

test_tipc/configs/det_r50_db_v2.0/train_infer_python.txt

@@ -48,4 +48,6 @@ inference:tools/infer/predict_det.py
 --image_dir:./inference/ch_det_data_50/all-sum-510/
 --save_log_path:null
 --benchmark:True
-null:null
+null:null
\ No newline at end of file
+===========================infer_benchmark_params==========================
+random_infer_input:[{float32,[3,640,640]}];[{float32,[3,960,960]}]
\ No newline at end of file

test_tipc/configs/det_r50_vd_east_v2_0/train_infer_python.txt

@@ -49,6 +49,8 @@ inference:tools/infer/predict_det.py
 --save_log_path:null
 --benchmark:True
 --det_algorithm:EAST
+===========================infer_benchmark_params==========================
+random_infer_input:[{float32,[3,640,640]}];[{float32,[3,960,960]}]
 ===========================train_benchmark_params==========================
 batch_size:8
 fp_items:fp32|fp16

test_tipc/configs/det_r50_vd_pse_v2_0/train_infer_python.txt

@@ -49,6 +49,8 @@ inference:tools/infer/predict_det.py
 --save_log_path:null
 --benchmark:True
 --det_algorithm:PSE
+===========================infer_benchmark_params==========================
+random_infer_input:[{float32,[3,640,640]}];[{float32,[3,960,960]}]
 ===========================train_benchmark_params==========================
 batch_size:8
 fp_items:fp32|fp16

test_tipc/configs/det_r50_vd_sast_icdar15_v2.0/train_infer_python.txt

@@ -49,3 +49,5 @@ inference:tools/infer/predict_det.py
 null:null
 --benchmark:True
 --det_algorithm:SAST
+===========================infer_benchmark_params==========================
+random_infer_input:[{float32,[3,640,640]}];[{float32,[3,960,960]}]

test_tipc/configs/det_r50_vd_sast_totaltext_v2.0/train_infer_python.txt

@@ -49,3 +49,5 @@ inference:tools/infer/predict_det.py
 null:null
 --benchmark:True
 --det_algorithm:SAST
+===========================infer_benchmark_params==========================
+random_infer_input:[{float32,[3,640,640]}];[{float32,[3,960,960]}]

test_tipc/configs/en_server_pgnetA/train_infer_python.txt

@@ -49,3 +49,5 @@ inference:tools/infer/predict_e2e.py
 null:null
 --benchmark:True
 null:null
+===========================infer_benchmark_params==========================
+random_infer_input:[{float32,[3,640,640]}];[{float32,[3,960,960]}]

test_tipc/configs/rec_mtb_nrtr/train_infer_python.txt

@@ -49,4 +49,5 @@ inference:tools/infer/predict_rec.py --rec_char_dict_path=./ppocr/utils/EN_symbo
 --save_log_path:./test/output/
 --benchmark:True
 null:null
-
+===========================infer_benchmark_params==========================
+random_infer_input:[{float32,[1,32,100]}]

test_tipc/configs/rec_mv3_none_bilstm_ctc_v2.0/train_infer_python.txt

@@ -49,3 +49,5 @@ inference:tools/infer/predict_rec.py --rec_char_dict_path=./ppocr/utils/ic15_dic
 --save_log_path:./test/output/
 --benchmark:True
 null:null
+===========================infer_benchmark_params==========================
+random_infer_input:[{float32,[3,32,100]}]
\ No newline at end of file

test_tipc/configs/rec_mv3_none_none_ctc_v2.0/train_infer_python.txt

@@ -49,3 +49,5 @@ inference:tools/infer/predict_rec.py --rec_char_dict_path=./ppocr/utils/ic15_dic
 --save_log_path:./test/output/
 --benchmark:True
 null:null
+===========================infer_benchmark_params==========================
+random_infer_input:[{float32,[3,32,100]}]
\ No newline at end of file

test_tipc/configs/rec_mv3_tps_bilstm_att_v2.0/train_infer_python.txt

@@ -49,4 +49,5 @@ inference:tools/infer/predict_rec.py --rec_char_dict_path=./ppocr/utils/ic15_dic
 --save_log_path:./test/output/
 --benchmark:True
 null:null
-
+===========================infer_benchmark_params==========================
+random_infer_input:[{float32,[3,32,100]}]

test_tipc/configs/rec_mv3_tps_bilstm_ctc_v2.0/train_infer_python.txt

@@ -49,3 +49,5 @@ inference:tools/infer/predict_rec.py --rec_char_dict_path=./ppocr/utils/ic15_dic
 --save_log_path:./test/output/
 --benchmark:True
 null:null
+===========================infer_benchmark_params==========================
+random_infer_input:[{float32,[3,32,100]}]

test_tipc/configs/rec_r31_sar/train_infer_python.txt

@@ -49,4 +49,5 @@ inference:tools/infer/predict_rec.py --rec_char_dict_path=./ppocr/utils/dict90.t
 --save_log_path:./test/output/
 --benchmark:True
 null:null
-
+===========================infer_benchmark_params==========================
+random_infer_input:[{float32,[3,48,48,160]}]

test_tipc/configs/rec_r34_vd_none_bilstm_ctc_v2.0/train_infer_python.txt

@@ -49,3 +49,5 @@ inference:tools/infer/predict_rec.py --rec_char_dict_path=./ppocr/utils/ic15_dic
 --save_log_path:./test/output/
 --benchmark:True
 null:null
+===========================infer_benchmark_params==========================
+random_infer_input:[{float32,[3,32,100]}]
\ No newline at end of file

test_tipc/configs/rec_r34_vd_none_none_ctc_v2.0/train_infer_python.txt

@@ -49,3 +49,5 @@ inference:tools/infer/predict_rec.py --rec_char_dict_path=./ppocr/utils/ic15_dic
 --save_log_path:./test/output/
 --benchmark:True
 null:null
+===========================infer_benchmark_params==========================
+random_infer_input:[{float32,[3,32,100]}]
\ No newline at end of file

test_tipc/configs/rec_r34_vd_tps_bilstm_att_v2.0/train_infer_python.txt

@@ -49,4 +49,5 @@ inference:tools/infer/predict_rec.py --rec_char_dict_path=./ppocr/utils/ic15_dic
 --save_log_path:./test/output/
 --benchmark:True
 null:null
-
+===========================infer_benchmark_params==========================
+random_infer_input:[{float32,[3,32,100]}]

test_tipc/configs/rec_r34_vd_tps_bilstm_ctc_v2.0/train_infer_python.txt

@@ -49,3 +49,5 @@ inference:tools/infer/predict_rec.py --rec_char_dict_path=./ppocr/utils/ic15_dic
 --save_log_path:./test/output/
 --benchmark:True
 null:null
+===========================infer_benchmark_params==========================
+random_infer_input:[{float32,[3,32,100]}]

test_tipc/configs/rec_r50_fpn_vd_none_srn/train_infer_python.txt

@@ -49,4 +49,5 @@ inference:tools/infer/predict_rec.py --rec_char_dict_path=./ppocr/utils/ic15_dic
 --save_log_path:./test/output/
 --benchmark:True
 null:null
-
+===========================infer_benchmark_params==========================
+random_infer_input:[{float32,[1,64,256]}]

test_tipc/docs/test_serving.md

@@ -20,10 +20,10 @@ PaddleServing预测功能测试的主程序为`test_serving.sh`，可以测试
 先运行`prepare.sh`准备数据和模型，然后运行`test_serving.sh`进行测试，最终在```test_tipc/output```目录下生成`serving_infer_*.log`后缀的日志文件。
 
 ```shell
-bash test_tipc/prepare.sh ./test_tipc/configs/ppocr_det_mobile/model_linux_gpu_normal_normal_serving_python_linux_gpu_cpu.txt "serving_infer"
+bash test_tipc/prepare.sh ./test_tipc/configs/ch_ppocr_mobile_v2.0_det/model_linux_gpu_normal_normal_serving_python_linux_gpu_cpu.txt "serving_infer"
 
 # 用法:
-bash test_tipc/test_serving.sh ./test_tipc/configs/ppocr_det_mobile/model_linux_gpu_normal_normal_serving_python_linux_gpu_cpu.txt
+bash test_tipc/test_serving.sh ./test_tipc/configs/ch_ppocr_mobile_v2.0_det/model_linux_gpu_normal_normal_serving_python_linux_gpu_cpu.txt
 ```  
 
 #### 运行结果

test_tipc/prepare.sh

@@ -308,10 +308,9 @@ if [ ${MODE} = "serving_infer" ];then
     IFS='|'
     array=(${python_name_list})
     python_name=${array[0]}
-    wget -nc https://paddle-serving.bj.bcebos.com/chain/paddle_serving_server_gpu-0.0.0.post101-py3-none-any.whl
-    ${python_name} -m pip install install paddle_serving_server_gpu-0.0.0.post101-py3-none-any.whl
-    ${python_name} -m pip install paddle_serving_client==0.6.1
-    ${python_name} -m pip install paddle-serving-app==0.6.3
+    ${python_name} -m pip install paddle-serving-server-gpu==0.8.3.post101
+    ${python_name} -m pip install paddle_serving_client==0.8.3
+    ${python_name} -m pip install paddle-serving-app==0.8.3
     wget -nc  -P ./inference https://paddleocr.bj.bcebos.com/dygraph_v2.0/ch/ch_ppocr_mobile_v2.0_det_infer.tar
     wget -nc  -P ./inference https://paddleocr.bj.bcebos.com/dygraph_v2.0/ch/ch_ppocr_mobile_v2.0_rec_infer.tar
     wget -nc  -P ./inference https://paddleocr.bj.bcebos.com/dygraph_v2.0/ch/ch_ppocr_server_v2.0_det_infer.tar