From 046c701399bd5f0e8a26760f508f60f697b4cc63 Mon Sep 17 00:00:00 2001 From: shangliang Xu Date: Thu, 15 Sep 2022 11:05:22 +0800 Subject: [PATCH] [TIPC] fix some base configs, test=document_fix (#6938) --- ...hrnet_hrnet_w32_512_train_infer_python.txt | 2 +- ..._dla34_30e_1088x608_train_infer_python.txt | 2 +- ..._dlafpn_30e_576x320_train_infer_python.txt | 2 +- ...knet53_30e_1088x608_train_infer_python.txt | 2 +- ..._alignconv_2x_spine_train_infer_python.txt | 16 +++--- ...2anet_conv_2x_spine_train_infer_python.txt | 16 +++--- ...ood_r50_fpn_1x_coco_train_infer_python.txt | 53 +++++++++++++++++++ ...darknet53_270e_coco_train_infer_python.txt | 4 +- .../yolox_s_300e_coco_train_infer_python.txt | 53 +++++++++++++++++++ 9 files changed, 128 insertions(+), 22 deletions(-) create mode 100644 test_tipc/configs/tood/tood_r50_fpn_1x_coco_train_infer_python.txt create mode 100644 test_tipc/configs/yolox/yolox_s_300e_coco_train_infer_python.txt diff --git a/test_tipc/configs/keypoint/higherhrnet_hrnet_w32_512_train_infer_python.txt b/test_tipc/configs/keypoint/higherhrnet_hrnet_w32_512_train_infer_python.txt index a652e7f4a..0bd1f61d5 100644 --- a/test_tipc/configs/keypoint/higherhrnet_hrnet_w32_512_train_infer_python.txt +++ b/test_tipc/configs/keypoint/higherhrnet_hrnet_w32_512_train_infer_python.txt @@ -41,7 +41,7 @@ inference:./deploy/python/keypoint_infer.py --device:gpu|cpu --enable_mkldnn:False --cpu_threads:4 ---batch_size:1|2 +--batch_size:1 --use_tensorrt:null --run_mode:paddle --model_dir: diff --git a/test_tipc/configs/mot/fairmot_dla34_30e_1088x608_train_infer_python.txt b/test_tipc/configs/mot/fairmot_dla34_30e_1088x608_train_infer_python.txt index 5bc67a522..6f6e63e4a 100644 --- a/test_tipc/configs/mot/fairmot_dla34_30e_1088x608_train_infer_python.txt +++ b/test_tipc/configs/mot/fairmot_dla34_30e_1088x608_train_infer_python.txt @@ -38,7 +38,7 @@ kl_quant_export:tools/post_quant.py -c configs/mot/fairmot/fairmot_dla34_30e_108 infer_mode:norm infer_quant:False inference:./deploy/pptracking/python/mot_jde_infer.py ---device:gpu|cpu +--device:gpu --enable_mkldnn:False --cpu_threads:4 --batch_size:1|2 diff --git a/test_tipc/configs/mot/fairmot_hrnetv2_w18_dlafpn_30e_576x320_train_infer_python.txt b/test_tipc/configs/mot/fairmot_hrnetv2_w18_dlafpn_30e_576x320_train_infer_python.txt index 291173442..ccc1570fb 100644 --- a/test_tipc/configs/mot/fairmot_hrnetv2_w18_dlafpn_30e_576x320_train_infer_python.txt +++ b/test_tipc/configs/mot/fairmot_hrnetv2_w18_dlafpn_30e_576x320_train_infer_python.txt @@ -38,7 +38,7 @@ kl_quant_export:tools/post_quant.py -c test_tipc/configs/mot/fairmot_hrnetv2_w18 infer_mode:norm infer_quant:False inference:./deploy/pptracking/python/mot_jde_infer.py ---device:gpu|cpu +--device:gpu --enable_mkldnn:False --cpu_threads:4 --batch_size:1|2 diff --git a/test_tipc/configs/mot/jde_darknet53_30e_1088x608_train_infer_python.txt b/test_tipc/configs/mot/jde_darknet53_30e_1088x608_train_infer_python.txt index 519722a53..423c85676 100644 --- a/test_tipc/configs/mot/jde_darknet53_30e_1088x608_train_infer_python.txt +++ b/test_tipc/configs/mot/jde_darknet53_30e_1088x608_train_infer_python.txt @@ -38,7 +38,7 @@ kl_quant_export:tools/post_quant.py -c configs/mot/jde/jde_darknet53_30e_1088x60 infer_mode:norm infer_quant:False inference:./deploy/pptracking/python/mot_jde_infer.py ---device:gpu|cpu +--device:gpu --enable_mkldnn:False --cpu_threads:4 --batch_size:1|2 diff --git a/test_tipc/configs/rotate/s2anet_alignconv_2x_spine_train_infer_python.txt b/test_tipc/configs/rotate/s2anet_alignconv_2x_spine_train_infer_python.txt index 205a4ac7f..941e37bc6 100644 --- a/test_tipc/configs/rotate/s2anet_alignconv_2x_spine_train_infer_python.txt +++ b/test_tipc/configs/rotate/s2anet_alignconv_2x_spine_train_infer_python.txt @@ -13,27 +13,27 @@ train_infer_img_dir:./dataset/spine_coco/test/ filename:null ## trainer:norm_train -norm_train:tools/train.py -c test_tipc/configs/dota/s2anet_alignconv_2x_spine.yml -o -pact_train:tools/train.py -c test_tipc/configs/dota/s2anet_alignconv_2x_spine.yml --slim_config _template_pact -o -fpgm_train:tools/train.py -c test_tipc/configs/dota/s2anet_alignconv_2x_spine.yml --slim_config _template_fpgm -o +norm_train:tools/train.py -c test_tipc/configs/rotate/s2anet_alignconv_2x_spine.yml -o +pact_train:tools/train.py -c test_tipc/configs/rotate/s2anet_alignconv_2x_spine.yml --slim_config _template_pact -o +fpgm_train:tools/train.py -c test_tipc/configs/rotate/s2anet_alignconv_2x_spine.yml --slim_config _template_fpgm -o distill_train:null null:null null:null ## ===========================eval_params=========================== -eval:tools/eval.py -c test_tipc/configs/dota/s2anet_alignconv_2x_spine.yml -o +eval:tools/eval.py -c test_tipc/configs/rotate/s2anet_alignconv_2x_spine.yml -o null:null ## ===========================infer_params=========================== --output_dir:./output_inference weights:https://paddledet.bj.bcebos.com/models/s2anet_alignconv_2x_dota.pdparams -norm_export:tools/export_model.py -c test_tipc/configs/dota/s2anet_alignconv_2x_spine.yml -o -pact_export:tools/export_model.py -c test_tipc/configs/dota/s2anet_alignconv_2x_spine.yml --slim_config _template_pact -o -fpgm_export:tools/export_model.py -c test_tipc/configs/dota/s2anet_alignconv_2x_spine.yml --slim_config _template_fpgm -o +norm_export:tools/export_model.py -c test_tipc/configs/rotate/s2anet_alignconv_2x_spine.yml -o +pact_export:tools/export_model.py -c test_tipc/configs/rotate/s2anet_alignconv_2x_spine.yml --slim_config _template_pact -o +fpgm_export:tools/export_model.py -c test_tipc/configs/rotate/s2anet_alignconv_2x_spine.yml --slim_config _template_fpgm -o distill_export:null export1:null export2:null -kl_quant_export:tools/post_quant.py -c test_tipc/configs/dota/s2anet_alignconv_2x_spine.yml --slim_config _template_kl_quant -o +kl_quant_export:tools/post_quant.py -c test_tipc/configs/rotate/s2anet_alignconv_2x_spine.yml --slim_config _template_kl_quant -o ## infer_mode:norm infer_quant:False diff --git a/test_tipc/configs/rotate/s2anet_conv_2x_spine_train_infer_python.txt b/test_tipc/configs/rotate/s2anet_conv_2x_spine_train_infer_python.txt index 0db46226e..35497303f 100644 --- a/test_tipc/configs/rotate/s2anet_conv_2x_spine_train_infer_python.txt +++ b/test_tipc/configs/rotate/s2anet_conv_2x_spine_train_infer_python.txt @@ -13,27 +13,27 @@ train_infer_img_dir:./dataset/spine_coco/test/ filename:null ## trainer:norm_train -norm_train:tools/train.py -c test_tipc/configs/dota/s2anet_conv_2x_spine.yml -o -pact_train:tools/train.py -c test_tipc/configs/dota/s2anet_conv_2x_spine.yml --slim_config _template_pact -o -fpgm_train:tools/train.py -c test_tipc/configs/dota/s2anet_conv_2x_spine.yml --slim_config _template_fpgm -o +norm_train:tools/train.py -c test_tipc/configs/rotate/s2anet_conv_2x_spine.yml -o +pact_train:tools/train.py -c test_tipc/configs/rotate/s2anet_conv_2x_spine.yml --slim_config _template_pact -o +fpgm_train:tools/train.py -c test_tipc/configs/rotate/s2anet_conv_2x_spine.yml --slim_config _template_fpgm -o distill_train:null null:null null:null ## ===========================eval_params=========================== -eval:tools/eval.py -c test_tipc/configs/dota/s2anet_conv_2x_spine.yml -o +eval:tools/eval.py -c test_tipc/configs/rotate/s2anet_conv_2x_spine.yml -o null:null ## ===========================infer_params=========================== --output_dir:./output_inference weights:https://paddledet.bj.bcebos.com/models/s2anet_conv_2x_dota.pdparams -norm_export:tools/export_model.py -c test_tipc/configs/dota/s2anet_conv_2x_spine.yml -o -pact_export:tools/export_model.py -c test_tipc/configs/dota/s2anet_conv_2x_spine.yml --slim_config _template_pact -o -fpgm_export:tools/export_model.py -c test_tipc/configs/dota/s2anet_conv_2x_spine.yml --slim_config _template_fpgm -o +norm_export:tools/export_model.py -c test_tipc/configs/rotate/s2anet_conv_2x_spine.yml -o +pact_export:tools/export_model.py -c test_tipc/configs/rotate/s2anet_conv_2x_spine.yml --slim_config _template_pact -o +fpgm_export:tools/export_model.py -c test_tipc/configs/rotate/s2anet_conv_2x_spine.yml --slim_config _template_fpgm -o distill_export:null export1:null export2:null -kl_quant_export:tools/post_quant.py -c test_tipc/configs/dota/s2anet_conv_2x_spine.yml --slim_config _template_kl_quant -o +kl_quant_export:tools/post_quant.py -c test_tipc/configs/rotate/s2anet_conv_2x_spine.yml --slim_config _template_kl_quant -o ## infer_mode:norm infer_quant:False diff --git a/test_tipc/configs/tood/tood_r50_fpn_1x_coco_train_infer_python.txt b/test_tipc/configs/tood/tood_r50_fpn_1x_coco_train_infer_python.txt new file mode 100644 index 000000000..909d80506 --- /dev/null +++ b/test_tipc/configs/tood/tood_r50_fpn_1x_coco_train_infer_python.txt @@ -0,0 +1,53 @@ +===========================train_params=========================== +model_name:tood_r50_fpn_1x_coco +python:python3.7 +gpu_list:0|0,1 +use_gpu:True +auto_cast:null +epoch:lite_train_lite_infer=1|lite_train_whole_infer=1|whole_train_whole_infer=12 +save_dir:null +TrainReader.batch_size:lite_train_lite_infer=2|lite_train_whole_infer=2|whole_train_whole_infer=4 +pretrain_weights:https://paddledet.bj.bcebos.com/models/tood_r50_fpn_1x_coco.pdparams +trained_model_name:model_final.pdparams +train_infer_img_dir:./dataset/coco/test2017/ +filename:null +## +trainer:norm_train +norm_train:tools/train.py -c configs/tood/tood_r50_fpn_1x_coco.yml -o +pact_train:tools/train.py -c configs/tood/tood_r50_fpn_1x_coco.yml --slim_config configs/slim/quant/yolov3_darknet_qat.yml -o +fpgm_train:tools/train.py -c configs/tood/tood_r50_fpn_1x_coco.yml --slim_config configs/slim/prune/yolov3_darknet_prune_fpgm.yml -o +distill_train:null +null:null +null:null +## +===========================eval_params=========================== +eval:tools/eval.py -c configs/tood/tood_r50_fpn_1x_coco.yml -o +null:null +## +===========================infer_params=========================== +--output_dir:./output_inference +weights:https://paddledet.bj.bcebos.com/models/tood_r50_fpn_1x_coco.pdparams +norm_export:tools/export_model.py -c configs/tood/tood_r50_fpn_1x_coco.yml -o +pact_export:tools/export_model.py -c configs/tood/tood_r50_fpn_1x_coco.yml --slim_config configs/slim/quant/yolov3_darknet_qat.yml -o +fpgm_export:tools/export_model.py -c configs/tood/tood_r50_fpn_1x_coco.yml --slim_config configs/slim/prune/yolov3_darknet_prune_fpgm.yml -o +distill_export:null +export1:null +export2:null +kl_quant_export:tools/post_quant.py -c configs/tood/tood_r50_fpn_1x_coco.yml --slim_config configs/slim/post_quant/yolov3_darknet53_ptq.yml -o +## +infer_mode:norm +infer_quant:False +inference:./deploy/python/infer.py +--device:gpu|cpu +--enable_mkldnn:False +--cpu_threads:4 +--batch_size:1|2 +--use_tensorrt:null +--run_mode:paddle +--model_dir: +--image_dir:./dataset/coco/test2017/ +--save_log_path:null +--run_benchmark:False +null:null +===========================infer_benchmark_params=========================== +numpy_infer_input:3x800x1344.npy \ No newline at end of file diff --git a/test_tipc/configs/yolov3/yolov3_darknet53_270e_coco_train_infer_python.txt b/test_tipc/configs/yolov3/yolov3_darknet53_270e_coco_train_infer_python.txt index ce2476249..8f85d6374 100644 --- a/test_tipc/configs/yolov3/yolov3_darknet53_270e_coco_train_infer_python.txt +++ b/test_tipc/configs/yolov3/yolov3_darknet53_270e_coco_train_infer_python.txt @@ -35,8 +35,8 @@ export1:null export2:null kl_quant_export:tools/post_quant.py -c configs/yolov3/yolov3_darknet53_270e_coco.yml --slim_config configs/slim/post_quant/yolov3_darknet53_ptq.yml -o ## -infer_mode:norm|kl_quant -infer_quant:False|True +infer_mode:norm +infer_quant:False inference:./deploy/python/infer.py --device:gpu|cpu --enable_mkldnn:False diff --git a/test_tipc/configs/yolox/yolox_s_300e_coco_train_infer_python.txt b/test_tipc/configs/yolox/yolox_s_300e_coco_train_infer_python.txt new file mode 100644 index 000000000..fa1bf1d69 --- /dev/null +++ b/test_tipc/configs/yolox/yolox_s_300e_coco_train_infer_python.txt @@ -0,0 +1,53 @@ +===========================train_params=========================== +model_name:yolox_s_300e_coco +python:python3.7 +gpu_list:0|0,1 +use_gpu:True +auto_cast:null +epoch:lite_train_lite_infer=1|lite_train_whole_infer=1|whole_train_whole_infer=300 +save_dir:null +TrainReader.batch_size:lite_train_lite_infer=2|lite_train_whole_infer=2|whole_train_whole_infer=8 +pretrain_weights:https://paddledet.bj.bcebos.com/models/yolox_s_300e_coco.pdparams +trained_model_name:model_final.pdparams +train_infer_img_dir:./dataset/coco/test2017/ +filename:null +## +trainer:norm_train +norm_train:tools/train.py -c configs/yolox/yolox_s_300e_coco.yml -o +pact_train:tools/train.py -c configs/yolox/yolox_s_300e_coco.yml --slim_config configs/slim/quant/yolov3_darknet_qat.yml -o +fpgm_train:tools/train.py -c configs/yolox/yolox_s_300e_coco.yml --slim_config configs/slim/prune/yolov3_darknet_prune_fpgm.yml -o +distill_train:null +null:null +null:null +## +===========================eval_params=========================== +eval:tools/eval.py -c configs/yolox/yolox_s_300e_coco.yml -o +null:null +## +===========================infer_params=========================== +--output_dir:./output_inference +weights:https://paddledet.bj.bcebos.com/models/yolox_s_300e_coco.pdparams +norm_export:tools/export_model.py -c configs/yolox/yolox_s_300e_coco.yml -o +pact_export:tools/export_model.py -c configs/yolox/yolox_s_300e_coco.yml --slim_config configs/slim/quant/yolov3_darknet_qat.yml -o +fpgm_export:tools/export_model.py -c configs/yolox/yolox_s_300e_coco.yml --slim_config configs/slim/prune/yolov3_darknet_prune_fpgm.yml -o +distill_export:null +export1:null +export2:null +kl_quant_export:tools/post_quant.py -c configs/yolox/yolox_s_300e_coco.yml --slim_config configs/slim/post_quant/yolov3_darknet53_ptq.yml -o +## +infer_mode:norm +infer_quant:False +inference:./deploy/python/infer.py +--device:gpu|cpu +--enable_mkldnn:False +--cpu_threads:4 +--batch_size:1|2 +--use_tensorrt:null +--run_mode:paddle +--model_dir: +--image_dir:./dataset/coco/test2017/ +--save_log_path:null +--run_benchmark:False +null:null +===========================infer_benchmark_params=========================== +numpy_infer_input:3x640x640.npy \ No newline at end of file -- GitLab