Simpify train infer python

test_tipc/configs/ch_PP-OCRv2_det/train_infer_python.txt

@@ -40,7 +40,7 @@ infer_quant:False
 inference:tools/infer/predict_det.py
 --use_gpu:True|False
 --enable_mkldnn:False
---cpu_threads:6
+--cpu_threads:1
 --rec_batch_num:1
 --use_tensorrt:False
 --precision:fp32

test_tipc/configs/ch_PP-OCRv2_rec/train_infer_python.txt

@@ -40,8 +40,8 @@ infer_quant:False
 inference:tools/infer/predict_rec.py
 --use_gpu:True|False
 --enable_mkldnn:False
---cpu_threads:6
---rec_batch_num:1|6
+--cpu_threads:1
+--rec_batch_num:1
 --use_tensorrt:False
 --precision:fp32
 --rec_model_dir:

test_tipc/configs/ch_PP-OCRv3_det/train_infer_python.txt

@@ -40,7 +40,7 @@ infer_quant:False
 inference:tools/infer/predict_det.py
 --use_gpu:True|False
 --enable_mkldnn:False
---cpu_threads:6
+--cpu_threads:1
 --rec_batch_num:1
 --use_tensorrt:False
 --precision:fp32

test_tipc/configs/ch_PP-OCRv3_rec/train_infer_python.txt

@@ -40,8 +40,8 @@ infer_quant:False
 inference:tools/infer/predict_rec.py --rec_image_shape="3,48,320"
 --use_gpu:True|False
 --enable_mkldnn:False
---cpu_threads:6
---rec_batch_num:1|6
+--cpu_threads:1
+--rec_batch_num:1
 --use_tensorrt:False
 --precision:fp32
 --rec_model_dir:

test_tipc/configs/ch_ppocr_mobile_v2_0_det/train_infer_python.txt

@@ -40,7 +40,7 @@ infer_quant:False
 inference:tools/infer/predict_det.py
 --use_gpu:True|False
 --enable_mkldnn:False
---cpu_threads:6
+--cpu_threads:1
 --rec_batch_num:1
 --use_tensorrt:False
 --precision:fp32

test_tipc/configs/ch_ppocr_mobile_v2_0_rec/train_infer_python.txt

@@ -40,8 +40,8 @@ infer_quant:False
 inference:tools/infer/predict_rec.py
 --use_gpu:True|False
 --enable_mkldnn:False
---cpu_threads:6
---rec_batch_num:1|6
+--cpu_threads:1
+--rec_batch_num:1
 --use_tensorrt:False
 --precision:fp32
 --rec_model_dir:

test_tipc/configs/ch_ppocr_server_v2_0_det/train_infer_python.txt

@@ -40,7 +40,7 @@ infer_quant:False
 inference:tools/infer/predict_det.py
 --use_gpu:True|False
 --enable_mkldnn:False
---cpu_threads:6
+--cpu_threads:1
 --rec_batch_num:1
 --use_tensorrt:False
 --precision:fp32

test_tipc/configs/ch_ppocr_server_v2_0_rec/train_infer_python.txt

@@ -40,8 +40,8 @@ infer_quant:False
 inference:tools/infer/predict_rec.py
 --use_gpu:True|False
 --enable_mkldnn:False
---cpu_threads:6
---rec_batch_num:1|6
+--cpu_threads:1
+--rec_batch_num:1
 --use_tensorrt:False
 --precision:fp32
 --rec_model_dir:

test_tipc/configs/det_mv3_db_v2_0/train_infer_python.txt

@@ -40,7 +40,7 @@ infer_quant:False
 inference:tools/infer/predict_det.py
 --use_gpu:True|False
 --enable_mkldnn:False
---cpu_threads:6
+--cpu_threads:1
 --rec_batch_num:1
 --use_tensorrt:False
 --precision:fp32

test_tipc/configs/det_mv3_east_v2_0/train_infer_python.txt

@@ -40,7 +40,7 @@ infer_quant:False
 inference:tools/infer/predict_det.py
 --use_gpu:True|False
 --enable_mkldnn:False
---cpu_threads:6
+--cpu_threads:1
 --rec_batch_num:1
 --use_tensorrt:False
 --precision:fp32

test_tipc/configs/det_mv3_pse_v2_0/train_infer_python.txt

@@ -40,7 +40,7 @@ infer_quant:False
 inference:tools/infer/predict_det.py
 --use_gpu:True|False
 --enable_mkldnn:False
---cpu_threads:6
+--cpu_threads:1
 --rec_batch_num:1
 --use_tensorrt:False
 --precision:fp32

test_tipc/configs/det_r50_db_plusplus/train_infer_python.txt

@@ -40,7 +40,7 @@ infer_quant:False
 inference:tools/infer/predict_det.py --det_algorithm="DB++"
 --use_gpu:True|False
 --enable_mkldnn:False
---cpu_threads:6
+--cpu_threads:1
 --rec_batch_num:1
 --use_tensorrt:False
 --precision:fp32

test_tipc/configs/det_r50_db_v2_0/train_infer_python.txt

@@ -40,7 +40,7 @@ infer_quant:False
 inference:tools/infer/predict_det.py
 --use_gpu:True|False
 --enable_mkldnn:False
---cpu_threads:6
+--cpu_threads:1
 --rec_batch_num:1
 --use_tensorrt:False
 --precision:fp32

test_tipc/configs/det_r50_dcn_fce_ctw_v2_0/train_infer_python.txt

@@ -40,7 +40,7 @@ infer_quant:False
 inference:tools/infer/predict_det.py
 --use_gpu:True|False
 --enable_mkldnn:False
---cpu_threads:6
+--cpu_threads:1
 --rec_batch_num:1
 --use_tensorrt:False
 --precision:fp32

test_tipc/configs/det_r50_vd_east_v2_0/train_infer_python.txt

@@ -40,7 +40,7 @@ infer_quant:False
 inference:tools/infer/predict_det.py
 --use_gpu:True|False
 --enable_mkldnn:False
---cpu_threads:6
+--cpu_threads:1
 --rec_batch_num:1
 --use_tensorrt:False
 --precision:fp32

test_tipc/configs/det_r50_vd_pse_v2_0/train_infer_python.txt

@@ -40,7 +40,7 @@ infer_quant:False
 inference:tools/infer/predict_det.py
 --use_gpu:True|False
 --enable_mkldnn:False
---cpu_threads:6
+--cpu_threads:1
 --rec_batch_num:1
 --use_tensorrt:False
 --precision:fp32

test_tipc/configs/det_r50_vd_sast_icdar15_v2_0/train_infer_python.txt

@@ -40,7 +40,7 @@ infer_quant:False
 inference:tools/infer/predict_det.py
 --use_gpu:True|False
 --enable_mkldnn:False
---cpu_threads:6
+--cpu_threads:1
 --rec_batch_num:1
 --use_tensorrt:False
 --precision:fp32

test_tipc/configs/det_r50_vd_sast_totaltext_v2_0/train_infer_python.txt

@@ -40,7 +40,7 @@ infer_quant:False
 inference:tools/infer/predict_det.py
 --use_gpu:True|False
 --enable_mkldnn:False
---cpu_threads:6
+--cpu_threads:1
 --rec_batch_num:1
 --use_tensorrt:False
 --precision:fp32

test_tipc/configs/en_server_pgnetA/train_infer_python.txt

@@ -40,7 +40,7 @@ infer_quant:False
 inference:tools/infer/predict_e2e.py
 --use_gpu:True|False
 --enable_mkldnn:False
---cpu_threads:6
+--cpu_threads:1
 --rec_batch_num:1
 --use_tensorrt:False
 --precision:fp32

test_tipc/configs/en_table_structure/table_mv3.yml

@@ -4,7 +4,7 @@ Global:
   log_smooth_window: 20
   print_batch_step: 5
   save_model_dir: ./output/table_mv3/
-  save_epoch_step: 3
+  save_epoch_step: 400
   # evaluation is run every 400 iterations after the 0th iteration
   eval_batch_step: [0, 40000]
   cal_metric_during_train: True
@@ -17,7 +17,8 @@ Global:
   # for data or label process
   character_dict_path: ppocr/utils/dict/table_structure_dict.txt
   character_type: en
-  max_text_length: 800
+  max_text_length: &max_text_length 500
+  box_format: &box_format 'xyxy' # 'xywh', 'xyxy', 'xyxyxyxy'
   infer_mode: False
 
 Optimizer:
@@ -37,12 +38,14 @@ Architecture:
   Backbone:
     name: MobileNetV3
     scale: 1.0
-    model_name: large
+    model_name: small
+    disable_se: true
   Head:
     name: TableAttentionHead
     hidden_size: 256
     loc_type: 2
-    max_text_length: 800
+    max_text_length: *max_text_length
+    loc_reg_num: &loc_reg_num 4
 
 Loss:
   name: TableAttentionLoss
@@ -70,6 +73,8 @@ Train:
           learn_empty_box: False
           merge_no_span_structure: False
           replace_empty_cell_token: False
+          loc_reg_num: *loc_reg_num
+          max_text_length: *max_text_length
       - TableBoxEncode:
       - ResizeTableImage:
           max_len: 488
@@ -102,6 +107,8 @@ Eval:
           learn_empty_box: False
           merge_no_span_structure: False
           replace_empty_cell_token: False
+          loc_reg_num: *loc_reg_num
+          max_text_length: *max_text_length
       - TableBoxEncode:
       - ResizeTableImage:
           max_len: 488

test_tipc/configs/en_table_structure/train_infer_python.txt

@@ -40,7 +40,7 @@ infer_quant:False
 inference:ppstructure/table/predict_table.py --det_model_dir=./inference/en_ppocr_mobile_v2.0_table_det_infer --rec_model_dir=./inference/en_ppocr_mobile_v2.0_table_rec_infer  --rec_char_dict_path=./ppocr/utils/dict/table_dict.txt --table_char_dict_path=./ppocr/utils/dict/table_structure_dict.txt --image_dir=./ppstructure/docs/table/table.jpg --det_limit_side_len=736 --det_limit_type=min --output ./output/table
 --use_gpu:True|False
 --enable_mkldnn:False
---cpu_threads:6
+--cpu_threads:1
 --rec_batch_num:1
 --use_tensorrt:False
 --precision:fp32

test_tipc/configs/layoutxlm_ser/train_infer_python.txt

@@ -40,7 +40,7 @@ infer_quant:False
 inference:ppstructure/kie/predict_kie_token_ser.py  --kie_algorithm=LayoutXLM  --ser_dict_path=train_data/XFUND/class_list_xfun.txt --output=output
 --use_gpu:True|False
 --enable_mkldnn:False
---cpu_threads:6
+--cpu_threads:1
 --rec_batch_num:1
 --use_tensorrt:False
 --precision:fp32

test_tipc/configs/rec_mtb_nrtr/train_infer_python.txt

@@ -40,8 +40,8 @@ infer_quant:False
 inference:tools/infer/predict_rec.py --rec_char_dict_path=./ppocr/utils/EN_symbol_dict.txt --rec_image_shape="1,32,100" --rec_algorithm="NRTR"
 --use_gpu:True|False
 --enable_mkldnn:False
---cpu_threads:6
---rec_batch_num:1|6
+--cpu_threads:1
+--rec_batch_num:1
 --use_tensorrt:False
 --precision:fp32
 --rec_model_dir:

test_tipc/configs/rec_mv3_none_bilstm_ctc_v2_0/train_infer_python.txt

@@ -40,8 +40,8 @@ infer_quant:False
 inference:tools/infer/predict_rec.py --rec_char_dict_path=./ppocr/utils/ic15_dict.txt --rec_image_shape="3,32,100"
 --use_gpu:True|False
 --enable_mkldnn:False
---cpu_threads:6
---rec_batch_num:1|6
+--cpu_threads:1
+--rec_batch_num:1
 --use_tensorrt:False
 --precision:fp32
 --rec_model_dir:

test_tipc/configs/rec_mv3_none_none_ctc_v2_0/train_infer_python.txt

@@ -40,8 +40,8 @@ infer_quant:False
 inference:tools/infer/predict_rec.py --rec_char_dict_path=./ppocr/utils/ic15_dict.txt --rec_image_shape="3,32,100"
 --use_gpu:True|False
 --enable_mkldnn:False
---cpu_threads:6
---rec_batch_num:1|6
+--cpu_threads:1
+--rec_batch_num:1
 --use_tensorrt:False
 --precision:fp32
 --rec_model_dir:

test_tipc/configs/rec_mv3_tps_bilstm_att_v2_0/train_infer_python.txt

@@ -40,8 +40,8 @@ infer_quant:False
 inference:tools/infer/predict_rec.py --rec_char_dict_path=./ppocr/utils/ic15_dict.txt --rec_image_shape="3,32,100" --rec_algorithm="RARE" --min_subgraph_size=5
 --use_gpu:True|False
 --enable_mkldnn:False
---cpu_threads:6
---rec_batch_num:1|6
+--cpu_threads:1
+--rec_batch_num:1
 --use_tensorrt:False
 --precision:fp32
 --rec_model_dir:

test_tipc/configs/rec_mv3_tps_bilstm_ctc_v2_0/train_infer_python.txt

@@ -40,8 +40,8 @@ infer_quant:False
 inference:tools/infer/predict_rec.py --rec_char_dict_path=./ppocr/utils/ic15_dict.txt --rec_image_shape="3,32,100" --rec_algorithm="StarNet"
 --use_gpu:True|False
 --enable_mkldnn:False
---cpu_threads:6
---rec_batch_num:1|6
+--cpu_threads:1
+--rec_batch_num:1
 --use_tensorrt:False
 --precision:fp32
 --rec_model_dir:

test_tipc/configs/rec_r31_robustscanner/train_infer_python.txt

@@ -39,11 +39,11 @@ infer_export:tools/export_model.py -c test_tipc/configs/rec_r31_robustscanner/re
 infer_quant:False
 inference:tools/infer/predict_rec.py --rec_char_dict_path=./ppocr/utils/dict90.txt --rec_image_shape="3,48,48,160" --use_space_char=False --rec_algorithm="RobustScanner"
 --use_gpu:True|False
---enable_mkldnn:True|False
---cpu_threads:1|6
---rec_batch_num:1|6
---use_tensorrt:False|False
---precision:fp32|int8
+--enable_mkldnn:False
+--cpu_threads:1
+--rec_batch_num:1
+--use_tensorrt:False
+--precision:fp32
 --rec_model_dir:
 --image_dir:./inference/rec_inference
 --save_log_path:./test/output/

test_tipc/configs/rec_r31_sar/train_infer_python.txt

@@ -40,8 +40,8 @@ infer_quant:False
 inference:tools/infer/predict_rec.py --rec_char_dict_path=./ppocr/utils/dict90.txt --rec_image_shape="3,48,48,160" --rec_algorithm="SAR"
 --use_gpu:True
 --enable_mkldnn:False
---cpu_threads:6
---rec_batch_num:1|6
+--cpu_threads:1
+--rec_batch_num:1
 --use_tensorrt:False
 --precision:fp32
 --rec_model_dir:

test_tipc/configs/rec_r32_gaspin_bilstm_att/train_infer_python.txt

@@ -40,8 +40,8 @@ infer_quant:False
 inference:tools/infer/predict_rec.py --rec_char_dict_path=./ppocr/utils/dict/spin_dict.txt --use_space_char=False --rec_image_shape="3,32,100" --rec_algorithm="SPIN"
 --use_gpu:True|False
 --enable_mkldnn:False
---cpu_threads:6
---rec_batch_num:1|6
+--cpu_threads:1
+--rec_batch_num:1
 --use_tensorrt:False
 --precision:fp32
 --rec_model_dir:

test_tipc/configs/rec_r34_vd_none_bilstm_ctc_v2_0/train_infer_python.txt

@@ -40,8 +40,8 @@ infer_quant:False
 inference:tools/infer/predict_rec.py --rec_char_dict_path=./ppocr/utils/ic15_dict.txt --rec_image_shape="3,32,100"
 --use_gpu:True|False
 --enable_mkldnn:False
---cpu_threads:6
---rec_batch_num:1|6
+--cpu_threads:1
+--rec_batch_num:1
 --use_tensorrt:False
 --precision:fp32
 --rec_model_dir:

test_tipc/configs/rec_r34_vd_none_none_ctc_v2_0/train_infer_python.txt

@@ -40,8 +40,8 @@ infer_quant:False
 inference:tools/infer/predict_rec.py --rec_char_dict_path=./ppocr/utils/ic15_dict.txt --rec_image_shape="3,32,100"
 --use_gpu:True|False
 --enable_mkldnn:False
---cpu_threads:6
---rec_batch_num:1|6
+--cpu_threads:1
+--rec_batch_num:1
 --use_tensorrt:False
 --precision:fp32
 --rec_model_dir:

test_tipc/configs/rec_r34_vd_tps_bilstm_att_v2_0/train_infer_python.txt

@@ -40,8 +40,8 @@ infer_quant:False
 inference:tools/infer/predict_rec.py --rec_char_dict_path=./ppocr/utils/ic15_dict.txt --rec_image_shape="3,32,100" --rec_algorithm="RARE" --min_subgraph_size=5
 --use_gpu:True|False
 --enable_mkldnn:False
---cpu_threads:6
---rec_batch_num:1|6
+--cpu_threads:1
+--rec_batch_num:1
 --use_tensorrt:False
 --precision:fp32
 --rec_model_dir:

test_tipc/configs/rec_r34_vd_tps_bilstm_ctc_v2_0/train_infer_python.txt

@@ -40,8 +40,8 @@ infer_quant:False
 inference:tools/infer/predict_rec.py --rec_char_dict_path=./ppocr/utils/ic15_dict.txt --rec_image_shape="3,32,100" --rec_algorithm="StarNet"
 --use_gpu:True|False
 --enable_mkldnn:False
---cpu_threads:6
---rec_batch_num:1|6
+--cpu_threads:1
+--rec_batch_num:1
 --use_tensorrt:False
 --precision:fp32
 --rec_model_dir:

test_tipc/configs/rec_r45_abinet/train_infer_python.txt

@@ -40,8 +40,8 @@ infer_quant:False
 inference:tools/infer/predict_rec.py --rec_char_dict_path=./ppocr/utils/ic15_dict.txt --rec_image_shape="3,32,128" --rec_algorithm="ABINet"
 --use_gpu:True|False
 --enable_mkldnn:False
---cpu_threads:6
---rec_batch_num:1|6
+--cpu_threads:1
+--rec_batch_num:1
 --use_tensorrt:False
 --precision:fp32
 --rec_model_dir:

test_tipc/configs/rec_r45_visionlan/train_infer_python.txt

@@ -40,8 +40,8 @@ infer_quant:False
 inference:tools/infer/predict_rec.py --rec_char_dict_path=./ppocr/utils/ic15_dict.txt --rec_image_shape="3,64,256" --rec_algorithm="VisionLAN" --use_space_char=False
 --use_gpu:True|False
 --enable_mkldnn:False
---cpu_threads:6
---rec_batch_num:1|6
+--cpu_threads:1
+--rec_batch_num:1
 --use_tensorrt:False
 --precision:fp32
 --rec_model_dir:

test_tipc/configs/rec_r50_fpn_vd_none_srn/train_infer_python.txt

@@ -40,8 +40,8 @@ infer_quant:False
 inference:tools/infer/predict_rec.py --rec_char_dict_path=./ppocr/utils/ic15_dict.txt --rec_image_shape="1,64,256" --rec_algorithm="SRN" --use_space_char=False --min_subgraph_size=3
 --use_gpu:True|False
 --enable_mkldnn:False
---cpu_threads:6
---rec_batch_num:1|6
+--cpu_threads:1
+--rec_batch_num:1
 --use_tensorrt:False
 --precision:fp32
 --rec_model_dir:

test_tipc/configs/rec_svtrnet/train_infer_python.txt

@@ -40,8 +40,8 @@ infer_quant:False
 inference:tools/infer/predict_rec.py --rec_char_dict_path=./ppocr/utils/ic15_dict.txt --rec_image_shape="3,64,256" --rec_algorithm="SVTR"
 --use_gpu:True|False
 --enable_mkldnn:False
---cpu_threads:6
---rec_batch_num:1|6
+--cpu_threads:1
+--rec_batch_num:1
 --use_tensorrt:False
 --precision:fp32
 --rec_model_dir:

test_tipc/configs/rec_vitstr_none_ce/train_infer_python.txt

@@ -40,8 +40,8 @@ infer_quant:False
 inference:tools/infer/predict_rec.py --rec_char_dict_path=./ppocr/utils/EN_symbol_dict.txt --rec_image_shape="1,224,224" --rec_algorithm="ViTSTR"
 --use_gpu:True|False
 --enable_mkldnn:False
---cpu_threads:6
---rec_batch_num:1|6
+--cpu_threads:1
+--rec_batch_num:1
 --use_tensorrt:False
 --precision:fp32
 --rec_model_dir:

test_tipc/configs/table_master/train_infer_python.txt

@@ -40,7 +40,7 @@ infer_quant:False
 inference:ppstructure/table/predict_structure.py  --table_char_dict_path=./ppocr/utils/dict/table_master_structure_dict.txt --image_dir=./ppstructure/docs/table/table.jpg --output ./output/table --table_algorithm=TableMaster --table_max_len=480 
 --use_gpu:True|False
 --enable_mkldnn:False
---cpu_threads:6
+--cpu_threads:1
 --rec_batch_num:1
 --use_tensorrt:False
 --precision:fp32

test_tipc/configs/vi_layoutxlm_ser/train_infer_python.txt

@@ -40,7 +40,7 @@ infer_quant:False
 inference:ppstructure/kie/predict_kie_token_ser.py  --kie_algorithm=LayoutXLM  --ser_dict_path=train_data/XFUND/class_list_xfun.txt --output=output --ocr_order_method=tb-yx
 --use_gpu:True|False
 --enable_mkldnn:False
---cpu_threads:6
+--cpu_threads:1
 --rec_batch_num:1
 --use_tensorrt:False
 --precision:fp32