diff --git a/test_tipc/benchmark_train.sh b/test_tipc/benchmark_train.sh index 3e41ad9a7158e7e2b33a6d213848f925f3fda3b9..96692c0e81bdb242c33bab8bed9f85c2e0ec7dac 100644 --- a/test_tipc/benchmark_train.sh +++ b/test_tipc/benchmark_train.sh @@ -183,7 +183,7 @@ fi -if [[ ${model_name} =~ "higherhrnet" ]] || [[ ${model_name} =~ "hrnet" ]] || [[ ${model_name} =~ "tinypose" ]];then +if [[ ${model_name} =~ "higherhrnet" ]] || [[ ${model_name} =~ "hrnet" ]] || [[ ${model_name} =~ "tinypose" ]] || [[ ${model_name} =~ "ppyoloe_r_crn_s_3x_spine_coco" ]] ;then echo "${model_name} run on full coco dataset" epoch=$(set_dynamic_epoch $device_num $epoch) else diff --git a/test_tipc/configs/rotate/ppyoloe_r/ppyoloe_r_crn_s_3x_spine_coco_train_infer_python.txt b/test_tipc/configs/rotate/ppyoloe_r/ppyoloe_r_crn_s_3x_spine_coco_train_infer_python.txt index e5442e883df146f84adcaf75a491657a9f200dc5..13d5cc456890d720fd88263dc4d4380cdd99c869 100644 --- a/test_tipc/configs/rotate/ppyoloe_r/ppyoloe_r_crn_s_3x_spine_coco_train_infer_python.txt +++ b/test_tipc/configs/rotate/ppyoloe_r/ppyoloe_r_crn_s_3x_spine_coco_train_infer_python.txt @@ -49,5 +49,12 @@ inference:./deploy/python/infer.py --save_log_path:null --run_benchmark:False null:null +===========================train_benchmark_params========================== +batch_size:2 +fp_items:fp32 +epoch:5 +repeat:12 +--profiler_options:batch_range=[10,20];state=GPU;tracer_option=Default;profile_path=model.profile +flags:null ===========================infer_benchmark_params=========================== numpy_infer_input:3x1024x1024.npy \ No newline at end of file diff --git a/test_tipc/configs/vitdet/cascade_rcnn_vit_base_hrfpn_cae_1x_coco_train_infer_python.txt b/test_tipc/configs/vitdet/cascade_rcnn_vit_base_hrfpn_cae_1x_coco_train_infer_python.txt deleted file mode 100644 index 69a0dc08be92adb9836ecb5c247751a36f571aa7..0000000000000000000000000000000000000000 --- a/test_tipc/configs/vitdet/cascade_rcnn_vit_base_hrfpn_cae_1x_coco_train_infer_python.txt +++ /dev/null @@ -1,60 +0,0 @@ -===========================train_params=========================== -model_name:cascade_rcnn_vit_base_hrfpn_cae_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=300 -save_dir:null -TrainReader.batch_size:lite_train_lite_infer=2|lite_train_whole_infer=2|whole_train_whole_infer=2 -pretrain_weights:https://bj.bcebos.com/v1/paddledet/models/cascade_rcnn_vit_base_hrfpn_cae_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/vitdet/cascade_rcnn_vit_base_hrfpn_cae_1x_coco.yml -o -pact_train:tools/train.py -c configs/vitdet/cascade_rcnn_vit_base_hrfpn_cae_1x_coco.yml --slim_config _template_pact -o -fpgm_train:tools/train.py -c configs/vitdet/cascade_rcnn_vit_base_hrfpn_cae_1x_coco.yml --slim_config _template_fpgm -o -distill_train:null -null:null -null:null -## -===========================eval_params=========================== -eval:tools/eval.py -c configs/vitdet/cascade_rcnn_vit_base_hrfpn_cae_1x_coco.yml -o -null:null -## -===========================infer_params=========================== ---output_dir:./output_inference -weights:https://bj.bcebos.com/v1/paddledet/models/pretrained/vit_base_cae_pretrained.pdparams -norm_export:tools/export_model.py -c configs/vitdet/cascade_rcnn_vit_base_hrfpn_cae_1x_coco.yml -o -pact_export:tools/export_model.py -c configs/vitdet/cascade_rcnn_vit_base_hrfpn_cae_1x_coco.yml --slim_config _template_pact -o -fpgm_export:tools/export_model.py -c configs/vitdet/cascade_rcnn_vit_base_hrfpn_cae_1x_coco.yml --slim_config _template_fpgm -o -distill_export:null -export1:null -export2:null -kl_quant_export:tools/post_quant.py -c configs/vitdet/cascade_rcnn_vit_base_hrfpn_cae_1x_coco.yml --slim_config configs/slim/post_quant/ppyoloe_crn_s_300e_coco_ptq.yml -o -## -infer_mode:norm|kl_quant -infer_quant:False|True -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 ---trt_max_shape:1600 -===========================disable_train_benchmark========================== -batch_size:8 -fp_items:fp32|fp16 -epoch:1 -repeat:12 ---profiler_options:batch_range=[10,20];state=GPU;tracer_option=Default;profile_path=model.profile -flags:null -===========================infer_benchmark_params=========================== -numpy_infer_input:3x640x640.npy \ No newline at end of file diff --git a/test_tipc/configs/vitdet/ppyoloe_vit_base_csppan_cae_36e_coco_train_infer_python.txt b/test_tipc/configs/vitdet/ppyoloe_vit_base_csppan_cae_36e_coco_train_infer_python.txt new file mode 100644 index 0000000000000000000000000000000000000000..c9e962d9e5ffe80d804e3a89e1da4dfc7db3eefb --- /dev/null +++ b/test_tipc/configs/vitdet/ppyoloe_vit_base_csppan_cae_36e_coco_train_infer_python.txt @@ -0,0 +1,60 @@ +===========================train_params=========================== +model_name:ppyoloe_vit_base_csppan_cae_36e_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=1|lite_train_whole_infer=2|whole_train_whole_infer=2 +pretrain_weights:https://bj.bcebos.com/v1/paddledet/models/pretrained/vit_base_cae_pretrained.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/vitdet/ppyoloe_vit_base_csppan_cae_36e_coco.yml -o +pact_train:tools/train.py -c configs/vitdet/ppyoloe_vit_base_csppan_cae_36e_coco.yml --slim_config _template_pact -o +fpgm_train:tools/train.py -c configs/vitdet/ppyoloe_vit_base_csppan_cae_36e_coco.yml --slim_config _template_fpgm -o +distill_train:null +null:null +null:null +## +===========================eval_params=========================== +eval:tools/eval.py -c configs/vitdet/ppyoloe_vit_base_csppan_cae_36e_coco.yml -o +null:null +## +===========================infer_params=========================== +--output_dir:./output_inference +weights:https://bj.bcebos.com/v1/paddledet/models/pretrained/vit_base_cae_pretrained.pdparams +norm_export:tools/export_model.py -c configs/vitdet/ppyoloe_vit_base_csppan_cae_36e_coco.yml -o +pact_export:tools/export_model.py -c configs/vitdet/ppyoloe_vit_base_csppan_cae_36e_coco.yml --slim_config _template_pact -o +fpgm_export:tools/export_model.py -c configs/vitdet/ppyoloe_vit_base_csppan_cae_36e_coco.yml --slim_config _template_fpgm -o +distill_export:null +export1:null +export2:null +kl_quant_export:tools/post_quant.py -c configs/vitdet/ppyoloe_vit_base_csppan_cae_36e_coco.yml --slim_config configs/slim/post_quant/ppyoloe_crn_s_300e_coco_ptq.yml -o +## +infer_mode:norm|kl_quant +infer_quant:False|True +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 +--trt_max_shape:1600 +===========================train_benchmark_params========================== +batch_size:2 +fp_items:fp32|fp16 +epoch:1 +repeat:2 +--profiler_options:batch_range=[10,20];state=GPU;tracer_option=Default;profile_path=model.profile +flags:null +===========================infer_benchmark_params=========================== +numpy_infer_input:3x640x640.npy \ No newline at end of file diff --git a/test_tipc/prepare.sh b/test_tipc/prepare.sh index cb4e0109cd8cf040ad8a55bd971f5072f714b61c..5d3d890f8808fe7218408b451cb1d38e3aa3bec6 100644 --- a/test_tipc/prepare.sh +++ b/test_tipc/prepare.sh @@ -91,6 +91,12 @@ elif [ ${MODE} = "benchmark_train" ];then cd ./dataset/ && tar -xf coco.tar ls ./coco/ cd ../ + elif [[ ${model_name} =~ "ppyoloe_r_crn_s_3x_spine_coco" ]];then + wget -nc -P ./dataset/spine_coco/ https://paddledet.bj.bcebos.com/data/tipc/spine_coco_tipc.tar --no-check-certificate + cd ./dataset/spine_coco/ && tar -xvf spine_coco_tipc.tar && mv -n spine_coco_tipc/* . + rm -rf spine_coco_tipc/ && cd ../../ + cd ./ppdet/ext_op && eval "${python} setup.py install" + cd ../../ else # prepare lite benchmark coco data wget -nc -P ./dataset/coco/ https://paddledet.bj.bcebos.com/data/coco_benchmark.tar --no-check-certificate @@ -154,7 +160,7 @@ else # download spine_coco lite data wget -nc -P ./dataset/spine_coco/ https://paddledet.bj.bcebos.com/data/tipc/spine_coco_tipc.tar --no-check-certificate cd ./dataset/spine_coco/ && tar -xvf spine_coco_tipc.tar && mv -n spine_coco_tipc/* . - rm -rf spine_tipc/ && cd ../../ + rm -rf spine_coco_tipc/ && cd ../../ if [[ ${model_name} =~ "s2anet" ]]; then cd ./ppdet/ext_op && eval "${python} setup.py install" cd ../../