Merge branch 'dygraph' into support_whole_infer

test_tipc/configs/ch_PP-OCRv2_det/train_infer_python.txt

@@ -12,9 +12,9 @@ train_model_name:latest
 train_infer_img_dir:./train_data/icdar2015/text_localization/ch4_test_images/
 null:null
 ##
-trainer:norm_train|pact_train
+trainer:norm_train
 norm_train:tools/train.py -c configs/det/ch_PP-OCRv2/ch_PP-OCRv2_det_cml.yml -o 
-pact_train:deploy/slim/quantization/quant.py -c configs/det/ch_PP-OCRv2/ch_PP-OCRv2_det_cml.yml -o
+pact_train:null
 fpgm_train:null
 distill_train:null
 null:null
@@ -28,7 +28,7 @@ null:null
 Global.save_inference_dir:./output/
 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 
+quant_export:null
 fpgm_export: 
 distill_export:null
 export1:null

test_tipc/configs/det_mv3_east_v2.0/train_infer_python.txt

@@ -34,7 +34,7 @@ distill_export:null
 export1:null
 export2:null
 ##
-train_model:./inference/det_mv3_east/best_accuracy
+train_model:./inference/det_mv3_east_v2.0_train/best_accuracy
 infer_export:tools/export_model.py -c test_tipc/configs/det_mv3_east_v2.0/det_mv3_east.yml  -o
 infer_quant:False
 inference:tools/infer/predict_det.py
@@ -42,7 +42,7 @@ inference:tools/infer/predict_det.py
 --enable_mkldnn:True|False
 --cpu_threads:1|6
 --rec_batch_num:1
---use_tensorrt:False|True
+--use_tensorrt:False
 --precision:fp32|fp16|int8
 --det_model_dir:
 --image_dir:./inference/ch_det_data_50/all-sum-510/

test_tipc/configs/det_mv3_pse_v2.0/train_infer_python.txt

@@ -34,7 +34,7 @@ distill_export:null
 export1:null
 export2:null
 ##
-train_model:./inference/det_mv3_pse/best_accuracy
+train_model:./inference/det_mv3_pse_v2.0_train/best_accuracy
 infer_export:tools/export_model.py -c test_tipc/configs/det_mv3_pse_v2.0/det_mv3_pse.yml  -o
 infer_quant:False
 inference:tools/infer/predict_det.py
@@ -42,8 +42,8 @@ inference:tools/infer/predict_det.py
 --enable_mkldnn:True|False
 --cpu_threads:1|6
 --rec_batch_num:1
---use_tensorrt:False|True
---precision:fp32|fp16|int8
+--use_tensorrt:False
+--precision:fp32|fp16
 --det_model_dir:
 --image_dir:./inference/ch_det_data_50/all-sum-510/
 --save_log_path:null

test_tipc/configs/det_r50_vd_east_v2.0/train_infer_python.txt

@@ -34,7 +34,7 @@ distill_export:null
 export1:null
 export2:null
 ##
-train_model:./inference/det_r50_vd_east/best_accuracy
+train_model:./inference/det_r50_vd_east_v2.0_train/best_accuracy
 infer_export:tools/export_model.py -c test_tipc/configs/det_r50_vd_east_v2.0/det_r50_vd_east.yml  -o
 infer_quant:False
 inference:tools/infer/predict_det.py
@@ -42,7 +42,7 @@ inference:tools/infer/predict_det.py
 --enable_mkldnn:True|False
 --cpu_threads:1|6
 --rec_batch_num:1
---use_tensorrt:False|True
+--use_tensorrt:False
 --precision:fp32|fp16|int8
 --det_model_dir:
 --image_dir:./inference/ch_det_data_50/all-sum-510/

test_tipc/configs/det_r50_vd_pse_v2.0/train_infer_python.txt

@@ -34,7 +34,7 @@ distill_export:null
 export1:null
 export2:null
 ##
-train_model:./inference/det_r50_vd_pse/best_accuracy
+train_model:./inference/det_r50_vd_pse_v2.0_train/best_accuracy
 infer_export:tools/export_model.py -c test_tipc/configs/det_r50_vd_pse_v2.0/det_r50_vd_pse.yml  -o
 infer_quant:False
 inference:tools/infer/predict_det.py
@@ -42,7 +42,7 @@ inference:tools/infer/predict_det.py
 --enable_mkldnn:True|False
 --cpu_threads:1|6
 --rec_batch_num:1
---use_tensorrt:False|True
+--use_tensorrt:False
 --precision:fp32|fp16|int8
 --det_model_dir:
 --image_dir:./inference/ch_det_data_50/all-sum-510/

test_tipc/configs/det_r50_vd_sast_icdar15_v2.0/train_infer_python.txt

@@ -42,7 +42,7 @@ inference:tools/infer/predict_det.py
 --enable_mkldnn:True|False
 --cpu_threads:1|6
 --rec_batch_num:1
---use_tensorrt:False|True
+--use_tensorrt:False
 --precision:fp32|fp16|int8
 --det_model_dir:
 --image_dir:./inference/ch_det_data_50/all-sum-510/

test_tipc/configs/det_r50_vd_sast_totaltext_v2.0/train_infer_python.txt

@@ -34,7 +34,7 @@ distill_export:null
 export1:null
 export2:null
 inference_dir:null
-train_model:./inference/det_r50_vd_sast_totaltext_v2.0/best_accuracy
+train_model:./inference/det_r50_vd_sast_totaltext_v2.0_train/best_accuracy
 infer_export:tools/export_model.py -c test_tipc/configs/det_r50_vd_sast_totaltext_v2.0/det_r50_vd_sast_totaltext.yml -o
 infer_quant:False
 inference:tools/infer/predict_det.py
@@ -42,7 +42,7 @@ inference:tools/infer/predict_det.py
 --enable_mkldnn:True|False
 --cpu_threads:1|6
 --rec_batch_num:1
---use_tensorrt:False|True
+--use_tensorrt:False
 --precision:fp32|fp16|int8
 --det_model_dir:
 --image_dir:./inference/ch_det_data_50/all-sum-510/

test_tipc/prepare.sh

@@ -104,7 +104,7 @@ elif [ ${MODE} = "lite_train_whole_infer" ];then
 elif [ ${MODE} = "whole_infer" ];then
     wget -nc -P ./inference https://paddleocr.bj.bcebos.com/dygraph_v2.0/test/ch_det_data_50.tar --no-check-certificate
     wget -nc -P ./inference/ https://paddleocr.bj.bcebos.com/dygraph_v2.0/test/rec_inference.tar --no-check-certificate
-    cd ./inference && tar xf rec_inference.tar && cd ../
+    cd ./inference && tar xf rec_inference.tar  && tar xf ch_det_data_50.tar && cd ../
     if [ ${model_name} = "ch_ppocr_mobile_v2.0_det" ]; then
         eval_model_name="ch_ppocr_mobile_v2.0_det_train"
         rm -rf ./train_data/icdar2015
@@ -191,6 +191,10 @@ elif [ ${MODE} = "whole_infer" ];then
         cd ./inference/ && tar xf ch_ppocr_server_v2.0_rec_train.tar && cd ../
     fi
     
+    if [ ${model_name} == "det_r50_vd_sast_totaltext_v2.0" ]; then
+        wget -nc -P  ./inference/ https://paddleocr.bj.bcebos.com/dygraph_v2.0/en/det_r50_vd_sast_totaltext_v2.0_train.tar --no-check-certificate
+        cd ./inference/ && tar xf det_r50_vd_sast_totaltext_v2.0_train.tar && cd ../
+    fi
     if [ ${model_name} == "det_mv3_db_v2.0" ]; then
         wget -nc -P ./inference/ https://paddleocr.bj.bcebos.com/dygraph_v2.0/en/det_mv3_db_v2.0_train.tar  --no-check-certificate
         cd ./inference/ && tar xf det_mv3_db_v2.0_train.tar && tar xf ch_det_data_50.tar && cd ../
@@ -199,7 +203,24 @@ elif [ ${MODE} = "whole_infer" ];then
         wget -nc -P ./inference/ https://paddleocr.bj.bcebos.com/dygraph_v2.0/en/det_r50_vd_db_v2.0_train.tar  --no-check-certificate
         cd ./inference/ && tar xf det_r50_vd_db_v2.0_train.tar && tar xf ch_det_data_50.tar && cd ../
     fi
+    if [ ${model_name} == "det_mv3_pse_v2.0" ]; then
+        wget -nc -P ./inference/ https://paddleocr.bj.bcebos.com/dygraph_v2.1/en_det/det_mv3_pse_v2.0_train.tar --no-check-certificate
+        cd ./inference/ && tar xf det_mv3_pse_v2.0_train.tar & cd ../
+    fi
+    if [ ${model_name} == "det_r50_vd_pse_v2.0" ]; then
+        wget -nc -P ./inference/  https://paddleocr.bj.bcebos.com/dygraph_v2.1/en_det/det_r50_vd_pse_v2.0_train.tar  --no-check-certificate
+        cd ./inference/ && tar xf det_r50_vd_pse_v2.0_train.tar & cd ../
+    fi
+    if [ ${model_name} == "det_mv3_east_v2.0" ]; then
+        wget -nc -P ./inference/ https://paddleocr.bj.bcebos.com/dygraph_v2.0/en/det_mv3_east_v2.0_train.tar --no-check-certificate
+        cd ./inference/ && tar xf det_mv3_east_v2.0_train.tar & cd ../
+    fi
+    if [ ${model_name} == "det_r50_vd_east_v2.0" ]; then
+        wget -nc -P ./inference/ https://paddleocr.bj.bcebos.com/dygraph_v2.0/en/det_r50_vd_east_v2.0_train.tar --no-check-certificate
+        cd ./inference/ && tar xf det_r50_vd_east_v2.0_train.tar & cd ../
+    fi
 fi
+
 if [ ${MODE} = "klquant_whole_infer" ]; then
     wget -nc -P ./train_data/ https://paddleocr.bj.bcebos.com/dygraph_v2.0/test/icdar2015_lite.tar --no-check-certificate
     cd ./train_data/ && tar xf icdar2015_lite.tar