Merge branch 'dygraph' into test_v11

test_tipc/configs/ch_PP-OCRv2_det/train_infer_python.txt

@@ -26,7 +26,7 @@ null:null
 ##
 ===========================infer_params===========================
 Global.save_inference_dir:./output/
-Global.pretrained_model:
+Global.checkpoints:
 norm_export:tools/export_model.py -c configs/det/ch_PP-OCRv2/ch_PP-OCRv2_det_cml.yml -o 
 quant_export:deploy/slim/quantization/export_model.py -c configs/det/ch_PP-OCRv2/ch_PP-OCRv2_det_cml.yml -o 
 fpgm_export: 

test_tipc/configs/ch_PP-OCRv2_det_PACT/train_infer_python.txt

 ===========================train_params===========================
-model_name:PPOCRv2_det
+model_name:ch_PPOCRv2_det_PACT
 python:python3.7
 gpu_list:0|0,1
 Global.use_gpu:True|True

test_tipc/configs/ch_PP-OCRv2_rec_PACT/train_infer_python.txt

@@ -34,7 +34,7 @@ distill_export:null
 export1:null
 export2:null
 inference_dir:Student
-infer_model:./inference/ch_PP-OCRv2_rec_infer
+infer_model:./inference/ch_PP-OCRv2_rec_slim_quant_infer
 infer_export:null
 infer_quant:True
 inference:tools/infer/predict_rec.py

test_tipc/configs/ch_ppocr_mobile_v2.0_det_PACT/train_infer_python.txt

 ===========================train_params===========================
-model_name:ocr_det
+model_name:ch_ppocr_mobile_v2.0_det_PACT
 python:python3.7
 gpu_list:0|0,1
 Global.use_gpu:True|True
@@ -34,7 +34,7 @@ distill_export:null
 export1:null
 export2:null
 inference_dir:null
-train_model:null
+train_model:./inference/ch_ppocr_mobile_v2.0_det_prune_infer/
 infer_export:null
 infer_quant:False
 inference:tools/infer/predict_det.py

test_tipc/configs/ch_ppocr_mobile_v2.0_rec_PACT/train_infer_python.txt

@@ -34,7 +34,7 @@ distill_export:null
 export1:null
 export2:null
 inference_dir:null
-train_model:null
+train_model:./inference/ch_ppocr_mobile_v2.0_rec_slim_infer/
 infer_export:null
 infer_quant:False
 inference:tools/infer/predict_rec.py --rec_char_dict_path=./ppocr/utils/ppocr_keys_v1.txt --rec_image_shape="3,32,100"

test_tipc/prepare.sh

@@ -111,6 +111,10 @@ elif [ ${MODE} = "whole_infer" ];then
         wget -nc  -P ./inference https://paddleocr.bj.bcebos.com/dygraph_v2.0/ch/ch_ppocr_mobile_v2.0_det_train.tar --no-check-certificate
         wget -nc  -P ./inference https://paddleocr.bj.bcebos.com/dygraph_v2.0/ch/ch_ppocr_mobile_v2.0_det_infer.tar --no-check-certificate
         cd ./inference && tar xf ${eval_model_name}.tar && tar xf ch_det_data_50.tar && tar xf ch_ppocr_mobile_v2.0_det_infer.tar && cd ../
+    elif [ ${model_name} = "ch_ppocr_mobile_v2.0_det_PACT" ]; then
+        eval_model_name="ch_ppocr_mobile_v2.0_det_prune_infer"
+        wget -nc -P ./inference https://paddleocr.bj.bcebos.com/dygraph_v2.0/slim/ch_ppocr_mobile_v2.0_det_prune_infer.tar --no-check-certificate
+        cd ./inference && tar xf ${eval_model_name}.tar && tar xf ch_det_data_50.tar && cd ../
     elif [ ${model_name} = "ch_ppocr_server_v2.0_det" ]; then
         wget -nc -P ./inference https://paddleocr.bj.bcebos.com/dygraph_v2.0/ch/ch_ppocr_server_v2.0_det_train.tar --no-check-certificate
         cd ./inference && tar xf ch_ppocr_server_v2.0_det_train.tar && tar xf ch_det_data_50.tar && cd ../
@@ -131,12 +135,12 @@ elif [ ${MODE} = "whole_infer" ];then
         wget -nc  -P ./inference https://paddleocr.bj.bcebos.com/dygraph_v2.0/ch/ch_ppocr_server_v2.0_rec_infer.tar --no-check-certificate
         cd ./inference && tar xf ${eval_model_name}.tar && cd ../
     elif [ ${model_name} = "ch_ppocr_mobile_v2.0_rec_PACT" ]; then
-        eval_model_name="ch_PP-OCRv2_rec_slim_quant_train"
-        wget -nc  -P ./inference https://paddleocr.bj.bcebos.com/PP-OCRv2/chinese/ch_PP-OCRv2_rec_slim_quant_train.tar --no-check-certificate
+        eval_model_name="ch_ppocr_mobile_v2.0_rec_slim_infer"
+        wget -nc  -P ./inference https://paddleocr.bj.bcebos.com/dygraph_v2.0/ch/ch_ppocr_mobile_v2.0_rec_slim_infer.tar --no-check-certificate
         cd ./inference && tar xf ${eval_model_name}.tar && cd ../
     elif [ ${model_name} = "ch_ppocr_mobile_v2.0_rec_FPGM" ]; then
-        eval_model_name="ch_PP-OCRv2_rec_train"
-        wget -nc  -P ./inference https://paddleocr.bj.bcebos.com/PP-OCRv2/chinese/ch_PP-OCRv2_rec_train.tar --no-check-certificate
+        eval_model_name="ch_PP-OCRv2_rec_infer"
+        wget -nc  -P ./inference https://paddleocr.bj.bcebos.com/PP-OCRv2/chinese/ch_PP-OCRv2_rec_infer.tar --no-check-certificate
         cd ./inference && tar xf ${eval_model_name}.tar && cd ../
     fi 
     if [[ ${model_name} =~ "ch_PPOCRv2_det" ]]; then
@@ -147,7 +151,8 @@ elif [ ${MODE} = "whole_infer" ];then
     if [[ ${model_name} =~ "PPOCRv2_ocr_rec" ]]; then
         eval_model_name="ch_PP-OCRv2_rec_infer"
         wget -nc -P ./inference/ https://paddleocr.bj.bcebos.com/PP-OCRv2/chinese/ch_PP-OCRv2_rec_infer.tar --no-check-certificate
-        cd ./inference && tar xf ${eval_model_name}.tar && cd ../
+        wget -nc -P ./inference/ https://paddleocr.bj.bcebos.com/PP-OCRv2/chinese/ch_PP-OCRv2_rec_slim_quant_infer.tar --no-check-certificate
+        cd ./inference && tar xf ${eval_model_name}.tar && tar xf ch_PP-OCRv2_rec_slim_quant_infer.tar && cd ../
     fi   
     if [ ${model_name} == "en_server_pgnetA" ]; then
         wget -nc -P ./inference/  https://paddleocr.bj.bcebos.com/dygraph_v2.0/pgnet/en_server_pgnetA.tar  --no-check-certificate