From bbe768987d5ba50ccd2c001f3c542d713c8cc8ea Mon Sep 17 00:00:00 2001
From: LDOUBLEV <liuvv0203@outlook.com>
Date: Tue, 26 Oct 2021 14:09:27 +0800
Subject: [PATCH] add ppocrv2 to PTDN

---
 PTDN/configs/ppocr_det_mobile_params.txt   |  2 +-
 PTDN/configs/ppocrv2_det_mobile_params.txt | 51 ++++++++++++++++++++++
 PTDN/test_train_inference_python.sh        |  9 +++-
 3 files changed, 60 insertions(+), 2 deletions(-)
 create mode 100644 PTDN/configs/ppocrv2_det_mobile_params.txt

diff --git a/PTDN/configs/ppocr_det_mobile_params.txt b/PTDN/configs/ppocr_det_mobile_params.txt
index 3d2117d7..33bd3e9d 100644
--- a/PTDN/configs/ppocr_det_mobile_params.txt
+++ b/PTDN/configs/ppocr_det_mobile_params.txt
@@ -33,7 +33,7 @@ fpgm_export:deploy/slim/prune/export_prune_model.py -c tests/configs/det_mv3_db.
 distill_export:null
 export1:null
 export2:null
-##
+inference_dir:null
 train_model:./inference/ch_ppocr_mobile_v2.0_det_train/best_accuracy
 infer_export:tools/export_model.py -c configs/det/ch_ppocr_v2.0/ch_det_mv3_db_v2.0.yml -o
 infer_quant:False
diff --git a/PTDN/configs/ppocrv2_det_mobile_params.txt b/PTDN/configs/ppocrv2_det_mobile_params.txt
new file mode 100644
index 00000000..f4073ec6
--- /dev/null
+++ b/PTDN/configs/ppocrv2_det_mobile_params.txt
@@ -0,0 +1,51 @@
+===========================train_params===========================
+model_name:PPOCRv2_ocr_det
+python:python3.7
+gpu_list:0|0,1
+Global.use_gpu:True|True
+Global.auto_cast:fp32
+Global.epoch_num:lite_train_infer=1|whole_train_infer=500
+Global.save_model_dir:./output/
+Train.loader.batch_size_per_card:lite_train_infer=2|whole_train_infer=4
+Global.pretrained_model:null
+train_model_name:latest
+train_infer_img_dir:./train_data/icdar2015/text_localization/ch4_test_images/
+null:null
+##
+trainer:norm_train|pact_train
+norm_train:tools/train.py -c configs/det/ch_PP-OCRv2/ch_PP-OCR_det_cml.yml -o 
+pact_train:deploy/slim/quantization/quant.py -c configs/det/ch_PP-OCRv2/ch_PP-OCR_det_cml.yml -o
+fpgm_train:null
+distill_train:null
+null:null
+null:null
+##
+===========================eval_params=========================== 
+eval:null
+null:null
+##
+===========================infer_params===========================
+Global.save_inference_dir:./output/
+Global.pretrained_model:
+norm_export:tools/export_model.py -c configs/det/ch_PP-OCRv2/ch_PP-OCR_det_cml.yml -o 
+quant_export:deploy/slim/quantization/export_model.py -c configs/det/ch_PP-OCRv2/ch_PP-OCR_det_cml.yml -o 
+fpgm_export:deploy/slim/prune/export_prune_model.py -c configs/det/ch_PP-OCRv2/ch_PP-OCR_det_cml.yml -o 
+distill_export:null
+export1:null
+export2:null
+inference_dir:Student
+train_model:./inference/ch_PP-OCRv2_det_distill_train/best_accuracy
+infer_export:tools/export_model.py -c configs/det/ch_PP-OCRv2/ch_PP-OCR_det_cml.yml -o
+infer_quant:False
+inference:tools/infer/predict_det.py
+--use_gpu:True|False
+--enable_mkldnn:True|False
+--cpu_threads:1|6
+--rec_batch_num:1
+--use_tensorrt:False|True
+--precision:fp32|fp16|int8
+--det_model_dir:
+--image_dir:./inference/ch_det_data_50/all-sum-510/
+null:null
+--benchmark:True
+null:null
diff --git a/PTDN/test_train_inference_python.sh b/PTDN/test_train_inference_python.sh
index 756e1f89..46b5c4cb 100644
--- a/PTDN/test_train_inference_python.sh
+++ b/PTDN/test_train_inference_python.sh
@@ -59,6 +59,7 @@ export_key1=$(func_parser_key "${lines[33]}")
 export_value1=$(func_parser_value "${lines[33]}")
 export_key2=$(func_parser_key "${lines[34]}")
 export_value2=$(func_parser_value "${lines[34]}")
+inference_dir=$(func_parser_value "${lines[35]}")
 
 # parser inference model 
 infer_model_dir_list=$(func_parser_value "${lines[36]}")
@@ -347,7 +348,13 @@ else
                     #run inference
                     eval $env
                     save_infer_path="${save_log}"
-                    func_inference "${python}" "${inference_py}" "${save_infer_path}" "${LOG_PATH}" "${train_infer_img_dir}" "${flag_quant}"
+                    if [ ${inference_dir} != "null" ] && [ ${inference_dir} != '##' ]; then
+                        infer_model_dir="${save_infer_path}/${inference_dir}"
+                    else
+                        infer_model_dir=${save_infer_path}
+                    fi
+                    func_inference "${python}" "${inference_py}" "${infer_model_dir}" "${LOG_PATH}" "${train_infer_img_dir}" "${flag_quant}"
+                    
                     eval "unset CUDA_VISIBLE_DEVICES"
                 fi
             done  # done with:    for trainer in ${trainer_list[*]}; do 
-- 
GitLab