Merge pull request #5622 from LDOUBLEV/dygraph

[tipc]add model_name to save_log

test_tipc/configs/ch_PP-OCRv2_det/train_infer_python.txt

@@ -49,3 +49,5 @@ inference:tools/infer/predict_det.py
 null:null
 --benchmark:True
 null:null
+===========================infer_benchmark_params==========================
+random_infer_input:[{float32,[3,640,640]}];[{float32,[3,960,960]}]

test_tipc/configs/ch_PP-OCRv2_det_PACT/train_infer_python.txt

@@ -49,3 +49,5 @@ inference:tools/infer/predict_det.py
 null:null
 --benchmark:True
 null:null
+===========================infer_benchmark_params==========================
+random_infer_input:[{float32,[3,640,640]}];[{float32,[3,960,960]}]

test_tipc/configs/ch_ppocr_mobile_V2.0_det_FPGM/train_infer_python.txt

@@ -48,4 +48,6 @@ inference:tools/infer/predict_det.py
 --image_dir:./inference/ch_det_data_50/all-sum-510/
 null:null
 --benchmark:True
-null:null
\ No newline at end of file
+null:null
+===========================infer_benchmark_params==========================
+random_infer_input:[{float32,[3,640,640]}];[{float32,[3,960,960]}]
\ No newline at end of file

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

@@ -48,4 +48,6 @@ inference:tools/infer/predict_det.py
 --image_dir:./inference/ch_det_data_50/all-sum-510/
 null:null
 --benchmark:True
-null:null
\ No newline at end of file
+null:null
+===========================infer_benchmark_params==========================
+random_infer_input:[{float32,[3,640,640]}];[{float32,[3,960,960]}]
\ No newline at end of file

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

@@ -49,3 +49,5 @@ inference:tools/infer/predict_det.py
 null:null
 --benchmark:True
 null:null
+===========================infer_benchmark_params==========================
+random_infer_input:[{float32,[3,640,640]}];[{float32,[3,960,960]}]

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

@@ -48,4 +48,6 @@ inference:tools/infer/predict_det.py
 --image_dir:./inference/ch_det_data_50/all-sum-510/
 --save_log_path:null
 --benchmark:True
-null:null
\ No newline at end of file
+null:null
+===========================infer_benchmark_params==========================
+random_infer_input:[{float32,[3,640,640]}];[{float32,[3,960,960]}]
\ No newline at end of file

test_tipc/configs/det_mv3_db_v2_0/train_infer_python.txt

@@ -49,9 +49,11 @@ inference:tools/infer/predict_det.py
 null:null
 --benchmark:True
 null:null
+===========================infer_benchmark_params==========================
+random_infer_input:[{float32,[3,640,640]}];[{float32,[3,960,960]}]
 ===========================train_benchmark_params==========================
 batch_size:8|16
 fp_items:fp32|fp16
 epoch:2
 --profiler_options:batch_range=[10,20];state=GPU;tracer_option=Default;profile_path=model.profile
-flags:FLAGS_eager_delete_tensor_gb=0.0;FLAGS_fraction_of_gpu_memory_to_use=0.98;FLAGS_conv_workspace_size_limit=4096
\ No newline at end of file
+flags:FLAGS_eager_delete_tensor_gb=0.0;FLAGS_fraction_of_gpu_memory_to_use=0.98;FLAGS_conv_workspace_size_limit=4096

test_tipc/configs/det_mv3_east_v2.0/train_infer_python.txt

@@ -49,3 +49,5 @@ inference:tools/infer/predict_det.py
 --save_log_path:null
 --benchmark:True
 --det_algorithm:EAST
+===========================infer_benchmark_params==========================
+random_infer_input:[{float32,[3,640,640]}];[{float32,[3,960,960]}]

test_tipc/configs/det_mv3_pse_v2.0/train_infer_python.txt

@@ -49,3 +49,5 @@ inference:tools/infer/predict_det.py
 --save_log_path:null
 --benchmark:True
 --det_algorithm:PSE
+===========================infer_benchmark_params==========================
+random_infer_input:[{float32,[3,640,640]}];[{float32,[3,960,960]}]

test_tipc/configs/det_r18_vd_v2_0/train_infer_python.txt

@@ -49,6 +49,8 @@ inference:tools/infer/predict_det.py
 --save_log_path:null
 --benchmark:True
 null:null
+===========================infer_benchmark_params==========================
+random_infer_input:[{float32,[3,640,640]}];[{float32,[3,960,960]}]
 ===========================train_benchmark_params==========================
 batch_size:8|16
 fp_items:fp32|fp16

test_tipc/configs/det_r50_db_v2.0/train_infer_python.txt

@@ -48,4 +48,6 @@ inference:tools/infer/predict_det.py
 --image_dir:./inference/ch_det_data_50/all-sum-510/
 --save_log_path:null
 --benchmark:True
-null:null
\ No newline at end of file
+null:null
+===========================infer_benchmark_params==========================
+random_infer_input:[{float32,[3,640,640]}];[{float32,[3,960,960]}]
\ No newline at end of file

test_tipc/configs/det_r50_vd_east_v2_0/train_infer_python.txt

@@ -49,6 +49,8 @@ inference:tools/infer/predict_det.py
 --save_log_path:null
 --benchmark:True
 --det_algorithm:EAST
+===========================infer_benchmark_params==========================
+random_infer_input:[{float32,[3,640,640]}];[{float32,[3,960,960]}]
 ===========================train_benchmark_params==========================
 batch_size:8
 fp_items:fp32|fp16

test_tipc/configs/det_r50_vd_pse_v2_0/train_infer_python.txt

@@ -49,6 +49,8 @@ inference:tools/infer/predict_det.py
 --save_log_path:null
 --benchmark:True
 --det_algorithm:PSE
+===========================infer_benchmark_params==========================
+random_infer_input:[{float32,[3,640,640]}];[{float32,[3,960,960]}]
 ===========================train_benchmark_params==========================
 batch_size:8
 fp_items:fp32|fp16

test_tipc/configs/det_r50_vd_sast_icdar15_v2.0/train_infer_python.txt

@@ -49,3 +49,5 @@ inference:tools/infer/predict_det.py
 null:null
 --benchmark:True
 --det_algorithm:SAST
+===========================infer_benchmark_params==========================
+random_infer_input:[{float32,[3,640,640]}];[{float32,[3,960,960]}]

test_tipc/configs/det_r50_vd_sast_totaltext_v2.0/train_infer_python.txt

@@ -49,3 +49,5 @@ inference:tools/infer/predict_det.py
 null:null
 --benchmark:True
 --det_algorithm:SAST
+===========================infer_benchmark_params==========================
+random_infer_input:[{float32,[3,640,640]}];[{float32,[3,960,960]}]

test_tipc/configs/en_server_pgnetA/train_infer_python.txt

@@ -49,3 +49,5 @@ inference:tools/infer/predict_e2e.py
 null:null
 --benchmark:True
 null:null
+===========================infer_benchmark_params==========================
+random_infer_input:[{float32,[3,640,640]}];[{float32,[3,960,960]}]

test_tipc/test_train_inference_python.sh

@@ -125,7 +125,7 @@ if [ ${MODE} = "klquant_whole_infer" ]; then
     infer_value1=$(func_parser_value "${lines[19]}")
 fi
 
-LOG_PATH="./test_tipc/output"
+LOG_PATH="./test_tipc/output/${model_name}"
 mkdir -p ${LOG_PATH}
 status_log="${LOG_PATH}/results_python.log"