From ca43dd6ba27bd228d64da4704dffa9022ccd821e Mon Sep 17 00:00:00 2001
From: LDOUBLEV <liuvv0203@outlook.com>
Date: Thu, 11 Nov 2021 19:00:36 +0800
Subject: [PATCH 1/4] rename train_infer_params

---
 .../train_infer_python.txt}                   | 35 +------------
 .../ppocr_rec_mobile/train_infer_python.txt   | 51 +++++++++++++++++++
 .../ppocr_rec_server/train_infer_python.txt   | 51 +++++++++++++++++++
 3 files changed, 103 insertions(+), 34 deletions(-)
 rename test_tipc/configs/{ppocr_det_server_params.txt => ppocr_det_server/train_infer_python.txt} (57%)
 create mode 100644 test_tipc/configs/ppocr_rec_mobile/train_infer_python.txt
 create mode 100644 test_tipc/configs/ppocr_rec_server/train_infer_python.txt

diff --git a/test_tipc/configs/ppocr_det_server_params.txt b/test_tipc/configs/ppocr_det_server/train_infer_python.txt
similarity index 57%
rename from test_tipc/configs/ppocr_det_server_params.txt
rename to test_tipc/configs/ppocr_det_server/train_infer_python.txt
index f688fffac8..1b4ae484bc 100644
--- a/test_tipc/configs/ppocr_det_server_params.txt
+++ b/test_tipc/configs/ppocr_det_server/train_infer_python.txt
@@ -48,37 +48,4 @@ inference:tools/infer/predict_det.py
 --image_dir:./inference/ch_det_data_50/all-sum-510/
 --save_log_path:null
 --benchmark:True
-null:null
-===========================cpp_infer_params===========================
-use_opencv:True
-infer_model:./inference/ch_ppocr_server_v2.0_det_infer/
-infer_quant:False
-inference:./deploy/cpp_infer/build/ppocr det
---use_gpu:True|False
---enable_mkldnn:True|False
---cpu_threads:1|6
---rec_batch_num:1
---use_tensorrt:False|True
---precision:fp32|fp16
---det_model_dir:
---image_dir:./inference/ch_det_data_50/all-sum-510/
-null:null
---benchmark:True
-===========================serving_params===========================
-model_name:ocr_det_server
-python:python3.7
-trans_model:-m paddle_serving_client.convert
---dirname:./inference/ch_ppocr_server_v2.0_det_infer/
---model_filename:inference.pdmodel
---params_filename:inference.pdiparams
---serving_server:./deploy/pdserving/ppocr_det_mobile_2.0_serving/
---serving_client:./deploy/pdserving/ppocr_det_mobile_2.0_client/
-serving_dir:./deploy/pdserving
-web_service:web_service_det.py --config=config.yml --opt op.det.concurrency=1
-op.det.local_service_conf.devices:null|0
-op.det.local_service_conf.use_mkldnn:True|False
-op.det.local_service_conf.thread_num:1|6
-op.det.local_service_conf.use_trt:False|True
-op.det.local_service_conf.precision:fp32|fp16|int8
-pipline:pipeline_http_client.py|pipeline_rpc_client.py
---image_dir=../../doc/imgs
+null:null
\ No newline at end of file
diff --git a/test_tipc/configs/ppocr_rec_mobile/train_infer_python.txt b/test_tipc/configs/ppocr_rec_mobile/train_infer_python.txt
new file mode 100644
index 0000000000..7860801218
--- /dev/null
+++ b/test_tipc/configs/ppocr_rec_mobile/train_infer_python.txt
@@ -0,0 +1,51 @@
+===========================train_params===========================
+model_name:ocr_rec
+python:python3.7
+gpu_list:0|0,1
+Global.use_gpu:True|True
+Global.auto_cast:null
+Global.epoch_num:lite_train_infer=2|whole_train_infer=300
+Global.save_model_dir:./output/
+Train.loader.batch_size_per_card:lite_train_infer=128|whole_train_infer=128
+Global.pretrained_model:null
+train_model_name:latest
+train_infer_img_dir:./inference/rec_inference
+null:null
+##
+trainer:norm_train|pact_train
+norm_train:tools/train.py -c configs/rec/rec_icdar15_train.yml -o
+pact_train:deploy/slim/quantization/quant.py -c configs/rec/rec_icdar15_train.yml -o
+fpgm_train:null
+distill_train:null
+null:null
+null:null
+##
+===========================eval_params===========================
+eval:tools/eval.py -c configs/rec/rec_icdar15_train.yml -o
+null:null
+##
+===========================infer_params===========================
+Global.save_inference_dir:./output/
+Global.pretrained_model:
+norm_export:tools/export_model.py -c configs/rec/rec_icdar15_train.yml -o
+quant_export:deploy/slim/quantization/export_model.py -c configs/rec/rec_icdar15_train.yml -o
+fpgm_export:null
+distill_export:null
+export1:null
+export2:null
+##
+infer_model:./inference/ch_ppocr_mobile_v2.0_rec_infer/
+infer_export:null
+infer_quant:False
+inference:tools/infer/predict_rec.py
+--use_gpu:True|False
+--enable_mkldnn:True|False
+--cpu_threads:1|6
+--rec_batch_num:1|6
+--use_tensorrt:True|False
+--precision:fp32|fp16|int8
+--rec_model_dir:
+--image_dir:./inference/rec_inference
+--save_log_path:./test/output/
+--benchmark:True
+null:null
\ No newline at end of file
diff --git a/test_tipc/configs/ppocr_rec_server/train_infer_python.txt b/test_tipc/configs/ppocr_rec_server/train_infer_python.txt
new file mode 100644
index 0000000000..fc688f678c
--- /dev/null
+++ b/test_tipc/configs/ppocr_rec_server/train_infer_python.txt
@@ -0,0 +1,51 @@
+===========================train_params===========================
+model_name:ocr_server_rec
+python:python3.7
+gpu_list:0|0,1
+Global.use_gpu:True|True
+Global.auto_cast:null
+Global.epoch_num:lite_train_infer=2|whole_train_infer=300
+Global.save_model_dir:./output/
+Train.loader.batch_size_per_card:lite_train_infer=128|whole_train_infer=128
+Global.pretrained_model:null
+train_model_name:latest
+train_infer_img_dir:./inference/rec_inference
+null:null
+##
+trainer:norm_train|pact_train
+norm_train:tools/train.py -c tests/configs/rec_icdar15_r34_train.yml -o
+pact_train:deploy/slim/quantization/quant.py -c tests/configs/rec_icdar15_r34_train.yml -o
+fpgm_train:null
+distill_train:null
+null:null
+null:null
+##
+===========================eval_params===========================
+eval:tools/eval.py -c tests/configs/rec_icdar15_r34_train.yml -o
+null:null
+##
+===========================infer_params===========================
+Global.save_inference_dir:./output/
+Global.pretrained_model:
+norm_export:tools/export_model.py -c tests/configs/rec_icdar15_r34_train.yml -o
+quant_export:deploy/slim/quantization/export_model.py -c tests/configs/rec_icdar15_r34_train.yml -o
+fpgm_export:null
+distill_export:null
+export1:null
+export2:null
+##
+infer_model:./inference/ch_ppocr_server_v2.0_rec_infer/
+infer_export:null
+infer_quant:False
+inference:tools/infer/predict_rec.py
+--use_gpu:True|False
+--enable_mkldnn:True|False
+--cpu_threads:1|6
+--rec_batch_num:1|6
+--use_tensorrt:True|False
+--precision:fp32|fp16|int8
+--rec_model_dir:
+--image_dir:./inference/rec_inference
+--save_log_path:./test/output/
+--benchmark:True
+null:null

From 606d98e3d404e89795beda78cc7f7583c072b22b Mon Sep 17 00:00:00 2001
From: LDOUBLEV <liuvv0203@outlook.com>
Date: Fri, 12 Nov 2021 14:32:52 +0800
Subject: [PATCH 2/4] move config

---
 test_tipc/configs/{ => ppocr_det_mobile}/det_mv3_db.yml           | 0
 test_tipc/configs/{ => ppocr_det_server}/det_r50_vd_db.yml        | 0
 .../configs/{ => ppocr_rec_server}/rec_icdar15_r34_train.yml      | 0
 3 files changed, 0 insertions(+), 0 deletions(-)
 rename test_tipc/configs/{ => ppocr_det_mobile}/det_mv3_db.yml (100%)
 rename test_tipc/configs/{ => ppocr_det_server}/det_r50_vd_db.yml (100%)
 rename test_tipc/configs/{ => ppocr_rec_server}/rec_icdar15_r34_train.yml (100%)

diff --git a/test_tipc/configs/det_mv3_db.yml b/test_tipc/configs/ppocr_det_mobile/det_mv3_db.yml
similarity index 100%
rename from test_tipc/configs/det_mv3_db.yml
rename to test_tipc/configs/ppocr_det_mobile/det_mv3_db.yml
diff --git a/test_tipc/configs/det_r50_vd_db.yml b/test_tipc/configs/ppocr_det_server/det_r50_vd_db.yml
similarity index 100%
rename from test_tipc/configs/det_r50_vd_db.yml
rename to test_tipc/configs/ppocr_det_server/det_r50_vd_db.yml
diff --git a/test_tipc/configs/rec_icdar15_r34_train.yml b/test_tipc/configs/ppocr_rec_server/rec_icdar15_r34_train.yml
similarity index 100%
rename from test_tipc/configs/rec_icdar15_r34_train.yml
rename to test_tipc/configs/ppocr_rec_server/rec_icdar15_r34_train.yml

From 43c17d31d545ed848c0f3a5314a542cac7a291f7 Mon Sep 17 00:00:00 2001
From: LDOUBLEV <liuvv0203@outlook.com>
Date: Fri, 12 Nov 2021 14:44:51 +0800
Subject: [PATCH 3/4] fix doc and config path

---
 .../ppocr_det_mobile/train_infer_python.txt   | 12 +++++-----
 .../ppocr_det_server/train_infer_python.txt   | 10 ++++-----
 test_tipc/docs/test_train_inference_python.md | 22 +++++++++----------
 3 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/test_tipc/configs/ppocr_det_mobile/train_infer_python.txt b/test_tipc/configs/ppocr_det_mobile/train_infer_python.txt
index 189097327f..17cc924a5b 100644
--- a/test_tipc/configs/ppocr_det_mobile/train_infer_python.txt
+++ b/test_tipc/configs/ppocr_det_mobile/train_infer_python.txt
@@ -13,9 +13,9 @@ train_infer_img_dir:./train_data/icdar2015/text_localization/ch4_test_images/
 null:null
 ##
 trainer:norm_train|pact_train|fpgm_train
-norm_train:tools/train.py -c test_tipc/configs/det_mv3_db.yml -o Global.pretrained_model=./pretrain_models/MobileNetV3_large_x0_5_pretrained
-pact_train:deploy/slim/quantization/quant.py -c test_tipc/configs/det_mv3_db.yml -o
-fpgm_train:deploy/slim/prune/sensitivity_anal.py -c test_tipc/configs/det_mv3_db.yml -o Global.pretrained_model=./pretrain_models/det_mv3_db_v2.0_train/best_accuracy
+norm_train:tools/train.py -c test_tipc/configs/ppocr_det_mobile/det_mv3_db.yml -o Global.pretrained_model=./pretrain_models/MobileNetV3_large_x0_5_pretrained
+pact_train:deploy/slim/quantization/quant.py -c test_tipc/configs/ppocr_det_mobile/det_mv3_db.yml -o
+fpgm_train:deploy/slim/prune/sensitivity_anal.py -c test_tipc/configs/ppocr_det_mobile/det_mv3_db.yml -o Global.pretrained_model=./pretrain_models/det_mv3_db_v2.0_train/best_accuracy
 distill_train:null
 null:null
 null:null
@@ -27,9 +27,9 @@ null:null
 ===========================infer_params===========================
 Global.save_inference_dir:./output/
 Global.pretrained_model:
-norm_export:tools/export_model.py -c test_tipc/configs/det_mv3_db.yml -o 
-quant_export:deploy/slim/quantization/export_model.py -c test_tipc/configs/det_mv3_db.yml -o 
-fpgm_export:deploy/slim/prune/export_prune_model.py -c test_tipc/configs/det_mv3_db.yml -o 
+norm_export:tools/export_model.py -c test_tipc/configs/ppocr_det_mobile/det_mv3_db.yml -o 
+quant_export:deploy/slim/quantization/export_model.py -c test_tipc/configs/ppocr_det_mobile/det_mv3_db.yml -o 
+fpgm_export:deploy/slim/prune/export_prune_model.py -c test_tipc/configs/ppocr_det_mobile/det_mv3_db.yml -o 
 distill_export:null
 export1:null
 export2:null
diff --git a/test_tipc/configs/ppocr_det_server/train_infer_python.txt b/test_tipc/configs/ppocr_det_server/train_infer_python.txt
index 1b4ae484bc..35aa188680 100644
--- a/test_tipc/configs/ppocr_det_server/train_infer_python.txt
+++ b/test_tipc/configs/ppocr_det_server/train_infer_python.txt
@@ -13,21 +13,21 @@ train_infer_img_dir:./train_data/icdar2015/text_localization/ch4_test_images/
 null:null
 ##
 trainer:norm_train|pact_train|fpgm_export
-norm_train:tools/train.py -c tests/configs/det_r50_vd_db.yml -o 
-quant_export:deploy/slim/quantization/export_model.py -c tests/configs/det_r50_vd_db.yml -o 
-fpgm_export:deploy/slim/prune/export_prune_model.py -c tests/configs/det_r50_vd_db.yml -o 
+norm_train:tools/train.py -c test_tipc/configs/ppocr_det_server/det_r50_vd_db.yml -o 
+quant_export:deploy/slim/quantization/export_model.py -c test_tipc/configs/ppocr_det_server/det_r50_vd_db.yml -o 
+fpgm_export:deploy/slim/prune/export_prune_model.py -c test_tipc/configs/ppocr_det_server/det_r50_vd_db.yml -o 
 distill_train:null
 null:null
 null:null
 ##
 ===========================eval_params=========================== 
-eval:tools/eval.py -c tests/configs/det_r50_vd_db.yml -o
+eval:tools/eval.py -c test_tipc/configs/ppocr_det_server/det_r50_vd_db.yml -o
 null:null
 ##
 ===========================infer_params===========================
 Global.save_inference_dir:./output/
 Global.pretrained_model:
-norm_export:tools/export_model.py -c tests/configs/det_r50_vd_db.yml -o 
+norm_export:tools/export_model.py -c test_tipc/configs/ppocr_det_server/det_r50_vd_db.yml -o 
 quant_export:null 
 fpgm_export:null
 distill_export:null
diff --git a/test_tipc/docs/test_train_inference_python.md b/test_tipc/docs/test_train_inference_python.md
index 9028e67d09..13caa2542a 100644
--- a/test_tipc/docs/test_train_inference_python.md
+++ b/test_tipc/docs/test_train_inference_python.md
@@ -64,35 +64,35 @@ Linux端基础训练预测功能测试的主程序为`test_train_inference_pytho
 
 - 模式1：lite_train_lite_infer，使用少量数据训练，用于快速验证训练到预测的走通流程，不验证精度和速度；
 ```shell
-bash test_tipc/prepare.sh ./test_tipc/configs/ppocr_det_mobile_params.txt 'lite_train_lite_infer'
-bash test_tipc/test_train_inference_python.sh ./test_tipc/configs/ppocr_det_mobile_params.txt 'lite_train_lite_infer'
+bash test_tipc/prepare.sh ./test_tipc/configs/ppocr_det_mobile/train_infer_python.txt 'lite_train_lite_infer'
+bash test_tipc/test_train_inference_python.sh ./test_tipc/configs/ppocr_det_mobile/train_infer_python.txt 'lite_train_lite_infer'
 ```  
 
 - 模式2：lite_train_whole_infer，使用少量数据训练，一定量数据预测，用于验证训练后的模型执行预测，预测速度是否合理；
 ```shell
-bash test_tipc/prepare.sh ./test_tipc/configs/ppocr_det_mobile_params.txt 'lite_train_whole_infer'
-bash test_tipc/test_train_inference_python.sh ./test_tipc/configs/ppocr_det_mobile_params.txt 'lite_train_whole_infer'
+bash test_tipc/prepare.sh ./test_tipc/configs/ppocr_det_mobile/train_infer_python.txt  'lite_train_whole_infer'
+bash test_tipc/test_train_inference_python.sh ../test_tipc/configs/ppocr_det_mobile/train_infer_python.txt 'lite_train_whole_infer'
 ```  
 
 - 模式3：whole_infer，不训练，全量数据预测，走通开源模型评估、动转静，检查inference model预测时间和精度;
 ```shell
-bash test_tipc/prepare.sh ./test_tipc/configs/ppocr_det_mobile_params.txt 'whole_infer'
+bash test_tipc/prepare.sh ./test_tipc/configs/ppocr_det_mobile/train_infer_python.txt 'whole_infer'
 # 用法1:
-bash test_tipc/test_train_inference_python.sh ./test_tipc/configs/ppocr_det_mobile_params.txt 'whole_infer'
+bash test_tipc/test_train_inference_python.sh ../test_tipc/configs/ppocr_det_mobile/train_infer_python.txt 'whole_infer'
 # 用法2: 指定GPU卡预测，第三个传入参数为GPU卡号
-bash test_tipc/test_train_inference_python.sh ./test_tipc/configs/ppocr_det_mobile_params.txt 'whole_infer' '1'
+bash test_tipc/test_train_inference_python.sh ./test_tipc/configs/ppocr_det_mobile/train_infer_python.txt 'whole_infer' '1'
 ```  
 
 - 模式4：whole_train_whole_infer，CE： 全量数据训练，全量数据预测，验证模型训练精度，预测精度，预测速度；
 ```shell
-bash test_tipc/prepare.sh ./test_tipc/configs/ppocr_det_mobile_params.txt 'whole_train_whole_infer'
-bash test_tipc/test_train_inference_python.sh ./test_tipc/configs/ppocr_det_mobile_params.txt 'whole_train_whole_infer'
+bash test_tipc/prepare.sh ./test_tipc/configs/ppocr_det_mobile/train_infer_python.txt 'whole_train_whole_infer'
+bash test_tipc/test_train_inference_python.sh ./test_tipc/configs/ppocr_det_mobile/train_infer_python.txt 'whole_train_whole_infer'
 ```  
 
 - 模式5：klquant_whole_infer，测试离线量化；
 ```shell
-bash test_tipc/prepare.sh ./test_tipc/configs/ppocr_det_mobile_params.txt 'klquant_whole_infer'
-bash test_tipc/test_train_inference_python.sh test_tipc/configs/ppocr_det_mobile_params.txt  'klquant_whole_infer'
+bash test_tipc/prepare.sh ./test_tipc/configs/ppocr_det_mobile/train_infer_python.txt  'klquant_whole_infer'
+bash test_tipc/test_train_inference_python.sh ./test_tipc/configs/ppocr_det_mobile/train_infer_python.txt  'klquant_whole_infer'
 ```
 
 运行相应指令后，在`test_tipc/output`文件夹下自动会保存运行日志。如'lite_train_lite_infer'模式下，会运行训练+inference的链条，因此，在`test_tipc/output`文件夹有以下文件：

From 9e1f25c74c0e2683a975ccd852cbbdad23ac9962 Mon Sep 17 00:00:00 2001
From: LDOUBLEV <liuvv0203@outlook.com>
Date: Fri, 12 Nov 2021 14:46:50 +0800
Subject: [PATCH 4/4] fix doc and config path

---
 .../ppocr_rec_mobile/train_infer_python.txt   | 51 -------------------
 .../ppocr_rec_server/train_infer_python.txt   | 51 -------------------
 2 files changed, 102 deletions(-)
 delete mode 100644 test_tipc/configs/ppocr_rec_mobile/train_infer_python.txt
 delete mode 100644 test_tipc/configs/ppocr_rec_server/train_infer_python.txt

diff --git a/test_tipc/configs/ppocr_rec_mobile/train_infer_python.txt b/test_tipc/configs/ppocr_rec_mobile/train_infer_python.txt
deleted file mode 100644
index 7860801218..0000000000
--- a/test_tipc/configs/ppocr_rec_mobile/train_infer_python.txt
+++ /dev/null
@@ -1,51 +0,0 @@
-===========================train_params===========================
-model_name:ocr_rec
-python:python3.7
-gpu_list:0|0,1
-Global.use_gpu:True|True
-Global.auto_cast:null
-Global.epoch_num:lite_train_infer=2|whole_train_infer=300
-Global.save_model_dir:./output/
-Train.loader.batch_size_per_card:lite_train_infer=128|whole_train_infer=128
-Global.pretrained_model:null
-train_model_name:latest
-train_infer_img_dir:./inference/rec_inference
-null:null
-##
-trainer:norm_train|pact_train
-norm_train:tools/train.py -c configs/rec/rec_icdar15_train.yml -o
-pact_train:deploy/slim/quantization/quant.py -c configs/rec/rec_icdar15_train.yml -o
-fpgm_train:null
-distill_train:null
-null:null
-null:null
-##
-===========================eval_params===========================
-eval:tools/eval.py -c configs/rec/rec_icdar15_train.yml -o
-null:null
-##
-===========================infer_params===========================
-Global.save_inference_dir:./output/
-Global.pretrained_model:
-norm_export:tools/export_model.py -c configs/rec/rec_icdar15_train.yml -o
-quant_export:deploy/slim/quantization/export_model.py -c configs/rec/rec_icdar15_train.yml -o
-fpgm_export:null
-distill_export:null
-export1:null
-export2:null
-##
-infer_model:./inference/ch_ppocr_mobile_v2.0_rec_infer/
-infer_export:null
-infer_quant:False
-inference:tools/infer/predict_rec.py
---use_gpu:True|False
---enable_mkldnn:True|False
---cpu_threads:1|6
---rec_batch_num:1|6
---use_tensorrt:True|False
---precision:fp32|fp16|int8
---rec_model_dir:
---image_dir:./inference/rec_inference
---save_log_path:./test/output/
---benchmark:True
-null:null
\ No newline at end of file
diff --git a/test_tipc/configs/ppocr_rec_server/train_infer_python.txt b/test_tipc/configs/ppocr_rec_server/train_infer_python.txt
deleted file mode 100644
index fc688f678c..0000000000
--- a/test_tipc/configs/ppocr_rec_server/train_infer_python.txt
+++ /dev/null
@@ -1,51 +0,0 @@
-===========================train_params===========================
-model_name:ocr_server_rec
-python:python3.7
-gpu_list:0|0,1
-Global.use_gpu:True|True
-Global.auto_cast:null
-Global.epoch_num:lite_train_infer=2|whole_train_infer=300
-Global.save_model_dir:./output/
-Train.loader.batch_size_per_card:lite_train_infer=128|whole_train_infer=128
-Global.pretrained_model:null
-train_model_name:latest
-train_infer_img_dir:./inference/rec_inference
-null:null
-##
-trainer:norm_train|pact_train
-norm_train:tools/train.py -c tests/configs/rec_icdar15_r34_train.yml -o
-pact_train:deploy/slim/quantization/quant.py -c tests/configs/rec_icdar15_r34_train.yml -o
-fpgm_train:null
-distill_train:null
-null:null
-null:null
-##
-===========================eval_params===========================
-eval:tools/eval.py -c tests/configs/rec_icdar15_r34_train.yml -o
-null:null
-##
-===========================infer_params===========================
-Global.save_inference_dir:./output/
-Global.pretrained_model:
-norm_export:tools/export_model.py -c tests/configs/rec_icdar15_r34_train.yml -o
-quant_export:deploy/slim/quantization/export_model.py -c tests/configs/rec_icdar15_r34_train.yml -o
-fpgm_export:null
-distill_export:null
-export1:null
-export2:null
-##
-infer_model:./inference/ch_ppocr_server_v2.0_rec_infer/
-infer_export:null
-infer_quant:False
-inference:tools/infer/predict_rec.py
---use_gpu:True|False
---enable_mkldnn:True|False
---cpu_threads:1|6
---rec_batch_num:1|6
---use_tensorrt:True|False
---precision:fp32|fp16|int8
---rec_model_dir:
---image_dir:./inference/rec_inference
---save_log_path:./test/output/
---benchmark:True
-null:null