fix model name and add sast

test_tipc/configs/ch_PP-OCRv2_det/train_infer_python.txt

@@ -1,5 +1,5 @@
 ===========================train_params===========================
-model_name:PPOCRv2_ocr_det
+model_name:ch_PPOCRv2_det
 python:python3.7
 gpu_list:0|0,1
 Global.use_gpu:True|True

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

@@ -1,5 +1,5 @@
 ===========================train_params===========================
-model_name:ocr_det
+model_name:ch_ppocr_mobile_v2.0_det
 python:python3.7
 gpu_list:0|0,1
 Global.use_gpu:True|True

test_tipc/configs/ch_ppocr_server_v2.0_det/train_infer_python.txt

@@ -1,5 +1,5 @@
 ===========================train_params===========================
-model_name:ocr_server_det
+model_name:ch_ppocr_server_v2.0_det
 python:python3.7
 gpu_list:0|0,1
 Global.use_gpu:True|True

test_tipc/configs/det_r50_vd_sast_icdar15_v2.0/train_infer_python.txt

@@ -1,5 +1,5 @@
 ===========================train_params===========================
-model_name:sast_icdar15
+model_name:det_r50_vd_sast_icdar15_v2.0
 python:python3.7
 gpu_list:0|0,1
 Global.use_gpu:True|True

test_tipc/configs/det_r50_vd_sast_totaltext_v2.0/train_infer_python.txt

@@ -1,5 +1,5 @@
 ===========================train_params===========================
-model_name:sast_icdar15
+model_name:det_r50_vd_sast_totaltext_v2.0
 python:python3.7
 gpu_list:0|0,1
 Global.use_gpu:True|True
@@ -13,7 +13,7 @@ train_infer_img_dir:./train_data/icdar2015/text_localization/ch4_test_images/
 null:null
 ##
 trainer:norm_train
-norm_train:tools/train.py -c test_tipc/configs/det_r50_vd_sast_icdar15_v2.0/det_r50_vd_sast_icdar2015.yml -o Global.pretrained_model=./pretrain_models/ResNet50_vd_ssld_pretrained
+norm_train:tools/train.py -c test_tipc/configs/det_r50_vd_sast_totaltext_v2.0/det_r50_vd_sast_totaltext.yml -o Global.pretrained_model=./pretrain_models/ResNet50_vd_ssld_pretrained
 pact_train:null
 fpgm_train:null
 distill_train:null
@@ -27,15 +27,15 @@ null:null
 ===========================infer_params===========================
 Global.save_inference_dir:./output/
 Global.pretrained_model:
-norm_export:tools/export_model.py -c test_tipc/configs/det_r50_vd_sast_icdar15_v2.0/det_r50_vd_sast_icdar2015.yml -o 
+norm_export:tools/export_model.py -c test_tipc/configs/det_r50_vd_sast_totaltext_v2.0/det_r50_vd_sast_totaltext.yml -o 
 quant_export:null
 fpgm_export:null
 distill_export:null
 export1:null
 export2:null
 inference_dir:null
-train_model:./inference/det_r50_vd_sast_icdar15_v2.0_train/best_accuracy
-infer_export:tools/export_model.py -c test_tipc/configs/det_r50_vd_sast_icdar15_v2.0/det_r50_vd_sast_icdar2015.yml -o
+train_model:./inference/det_r50_vd_sast_totaltext_v2.0/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
 --use_gpu:True|False

test_tipc/configs/en_server_pgnetA/train_infer_python.txt

@@ -1,5 +1,5 @@
 ===========================train_params===========================
-model_name:en_pgnetA
+model_name:en_server_pgnetA
 python:python3.7
 gpu_list:0|0,1
 Global.use_gpu:True|True

test_tipc/prepare.sh

@@ -25,7 +25,7 @@ if [ ${MODE} = "lite_train_lite_infer" ];then
  # pretrain lite train data
  wget -nc -P ./pretrain_models/ https://paddle-imagenet-models-name.bj.bcebos.com/dygraph/MobileNetV3_large_x0_5_pretrained.pdparams --no-check-certificate
  wget -nc -P ./pretrain_models/ https://paddleocr.bj.bcebos.com/dygraph_v2.0/en/det_mv3_db_v2.0_train.tar --no-check-certificate
- if [ ${model_name} == "PPOCRv2_ocr_det" ]; then
+ if [ ${model_name} == "ch_PPOCRv2_det" ]; then
  wget -nc -P ./pretrain_models/ https://paddleocr.bj.bcebos.com/PP-OCRv2/chinese/ch_PP-OCRv2_det_distill_train.tar --no-check-certificate
  cd ./pretrain_models/ && tar xf ch_PP-OCRv2_det_distill_train.tar && cd ../
  fi
@@ -41,13 +41,13 @@ if [ ${MODE} = "lite_train_lite_infer" ];then
  ln -s ./icdar2015_lite ./icdar2015
  cd ../
  cd ./inference && tar xf rec_inference.tar && cd ../
- if [ ${model_name} == "en_pgnetA" ]; then
+ if [ ${model_name} == "en_server_pgnetA" ]; then
  wget -nc -P ./train_data/ https://paddleocr.bj.bcebos.com/dygraph_v2.0/test/total_text_lite.tar --no-check-certificate
  wget -nc -P ./pretrain_models/ https://paddleocr.bj.bcebos.com/dygraph_v2.0/pgnet/en_server_pgnetA.tar --no-check-certificate
  cd ./pretrain_models/ && tar xf en_server_pgnetA.tar && cd ../
  cd ./train_data && tar xf total_text_lite.tar && ln -s total_text && cd ../
  fi
- if [ ${model_name} == "sast_icdar15" ] || [ ${model_name} == "sast_totaltext" ]; then
+ if [ ${model_name} == "det_r50_vd_sast_icdar15_v2.0" ] || [ ${model_name} == "det_r50_vd_sast_totaltext_v2.0" ]; then
  wget -nc -P ./pretrain_models/ https://paddle-imagenet-models-name.bj.bcebos.com/dygraph/ResNet50_vd_ssld_pretrained.pdparams --no-check-certificate
  wget -nc -P ./train_data/ wget -nc -P ./train_data/ https://paddleocr.bj.bcebos.com/dygraph_v2.0/test/total_text_lite.tar --no-check-certificate
  cd ./train_data && tar xf total_text_lite.tar && ln -s total_text && cd ../
@@ -60,17 +60,17 @@ elif [ ${MODE} = "whole_train_whole_infer" ];then
  wget -nc -P ./train_data/ https://paddleocr.bj.bcebos.com/dygraph_v2.0/test/icdar2015.tar --no-check-certificate
  wget -nc -P ./train_data/ https://paddleocr.bj.bcebos.com/dygraph_v2.0/test/ic15_data.tar --no-check-certificate
  cd ./train_data/ && tar xf icdar2015.tar && tar xf ic15_data.tar && cd ../
- if [ ${model_name} == "PPOCRv2_ocr_det" ]; then
+ if [ ${model_name} == "ch_PPOCRv2_det" ]; then
  wget -nc -P ./pretrain_models/ https://paddleocr.bj.bcebos.com/PP-OCRv2/chinese/ch_PP-OCRv2_det_distill_train.tar --no-check-certificate
  cd ./pretrain_models/ && tar xf ch_PP-OCRv2_det_distill_train.tar && cd ../
  fi
- if [ ${model_name} == "en_pgnetA" ]; then
+ if [ ${model_name} == "en_server_pgnetA" ]; then
  wget -nc -P ./train_data/ https://paddleocr.bj.bcebos.com/dataset/total_text.tar --no-check-certificate
  wget -nc -P ./pretrain_models/ https://paddleocr.bj.bcebos.com/dygraph_v2.0/pgnet/en_server_pgnetA.tar --no-check-certificate
  cd ./pretrain_models/ && tar xf en_server_pgnetA.tar && cd ../
  cd ./train_data && tar xf total_text.tar && ln -s total_text && cd ../
  fi
- if [ ${model_name} == "sast_totaltext" ]; then
+ if [ ${model_name} == "det_r50_vd_sast_totaltext_v2.0" ]; then
  wget -nc -P ./pretrain_models/ https://paddle-imagenet-models-name.bj.bcebos.com/dygraph/ResNet50_vd_ssld_pretrained.pdparams --no-check-certificate
  wget -nc -P ./train_data/ https://paddleocr.bj.bcebos.com/dataset/total_text.tar --no-check-certificate
  cd ./train_data && tar xf total_text.tar && ln -s total_text && cd ../
@@ -84,20 +84,20 @@ elif [ ${MODE} = "lite_train_whole_infer" ];then
  cd ./train_data/ && tar xf icdar2015_infer.tar && tar xf ic15_data.tar
  ln -s ./icdar2015_infer ./icdar2015
  cd ../
- if [ ${model_name} == "PPOCRv2_ocr_det" ]; then
+ if [ ${model_name} == "ch_PPOCRv2_det" ]; then
  wget -nc -P ./pretrain_models/ https://paddleocr.bj.bcebos.com/PP-OCRv2/chinese/ch_PP-OCRv2_det_distill_train.tar --no-check-certificate
  cd ./pretrain_models/ && tar xf ch_PP-OCRv2_det_distill_train.tar && cd ../
  fi
 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
- if [ ${model_name} = "ocr_det" ]; then
+ 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
  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/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} = "ocr_server_det" ]; then
+ 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
  wget -nc -P ./inference https://paddleocr.bj.bcebos.com/dygraph_v2.0/test/ch_det_data_50.tar --no-check-certificate
  cd ./inference && tar xf ch_ppocr_server_v2.0_det_train.tar && tar xf ch_det_data_50.tar && cd ../
@@ -124,33 +124,33 @@ 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 && tar xf rec_inference.tar && cd ../
  fi 
- elif [ ${model_name} = "PPOCRv2_ocr_det" ]; then
+ elif [ ${model_name} = "ch_PPOCRv2_det" ]; then
  eval_model_name="ch_PP-OCRv2_det_infer"
  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/PP-OCRv2/chinese/ch_PP-OCRv2_det_infer.tar --no-check-certificate
  cd ./inference && tar xf ${eval_model_name}.tar && tar xf ch_det_data_50.tar && cd ../
  fi
- elif [ ${model_name} = "PPOCRv2_ocr_det" ]; then
+ elif [ ${model_name} = "ch_PPOCRv2_det" ]; 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/pgnet/e2e_server_pgnetA_infer.tar --no-check-certificate
  cd ./inference && tar xf e2e_server_pgnetA_infer.tar && tar xf ch_det_data_50.tar && cd ../ 
  fi
- if [ ${model_name} == "en_pgnetA" ]; then
+ 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
  cd ./inference && tar xf en_server_pgnetA.tar && cd ../
  fi
- if [ ${model_name} == "sast_icdar15" ]; then
+ if [ ${model_name} == "det_r50_vd_sast_icdar15_v2.0" ]; then
  wget -nc -P ./inference/ https://paddleocr.bj.bcebos.com/dygraph_v2.0/en/det_r50_vd_sast_icdar15_v2.0_train.tar --no-check-certificate
  cd ./inference/ && tar det_r50_vd_sast_icdar15_v2.0_train.tar && cd ../
  fi
 
 if [ ${MODE} = "klquant_whole_infer" ]; then
- if [ ${model_name} = "ocr_det" ]; then
+ if [ ${model_name} = "ch_ppocr_mobile_v2.0_det" ]; then
  wget -nc -P ./inference https://paddleocr.bj.bcebos.com/dygraph_v2.0/ch/ch_ppocr_mobile_v2.0_det_infer.tar --no-check-certificate
  wget -nc -P ./inference https://paddleocr.bj.bcebos.com/dygraph_v2.0/test/ch_det_data_50.tar --no-check-certificate
  cd ./inference && tar xf ch_ppocr_mobile_v2.0_det_infer.tar && tar xf ch_det_data_50.tar && cd ../ 
  fi
- if [ ${model_name} = "PPOCRv2_ocr_det" ]; then
+ if [ ${model_name} = "ch_PPOCRv2_det" ]; then
  eval_model_name="ch_PP-OCRv2_det_infer"
  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/PP-OCRv2/chinese/ch_PP-OCRv2_det_infer.tar --no-check-certificate