From 2d66aeeb77018413dd6f2a48f53d48b1ab335353 Mon Sep 17 00:00:00 2001 From: gaotingquan Date: Wed, 18 Jan 2023 09:09:30 +0000 Subject: [PATCH] support specify model_type in config such as norm_train and to_static_train --- test_tipc/benchmark_train.sh | 262 +++++++++--------- ...ransformer_tiny_224_train_infer_python.txt | 1 + .../DenseNet121_train_infer_python.txt | 7 + ...nition_PPLCNet_x2_5_train_infer_python.txt | 3 +- ...onV2_PPLCNetV2_base_train_infer_python.txt | 3 +- .../HRNet/HRNet_W18_C_train_infer_python.txt | 5 +- .../HRNet/HRNet_W48_C_train_infer_python.txt | 5 +- .../MobileNetV1_train_infer_python.txt | 5 +- .../MobileNetV2_train_infer_python.txt | 5 +- ...ileNetV3_large_x1_0_train_infer_python.txt | 3 +- ...leet_normal_infer_python_linux_gpu_cpu.txt | 3 +- ...tV3_large_x1_0_train_pact_infer_python.txt | 5 +- ...etV3_large_x1_0_train_ptq_infer_python.txt | 5 +- .../MobileViT_S_train_infer_python.txt | 1 + .../PPHGNet_small_train_infer_python.txt | 3 +- .../PPHGNet_tiny_train_infer_python.txt | 3 +- .../PPLCNet_x0_25_train_infer_python.txt | 1 + .../PPLCNet_x0_35_train_infer_python.txt | 1 + .../PPLCNet_x0_5_train_infer_python.txt | 1 + .../PPLCNet_x0_75_train_infer_python.txt | 1 + .../PPLCNet_x1_0_train_infer_python.txt | 1 + .../PPLCNet_x1_5_train_infer_python.txt | 1 + .../PPLCNet_x2_0_train_infer_python.txt | 1 + .../PPLCNet_x2_5_train_infer_python.txt | 1 + .../PPLCNetV2_base_train_infer_python.txt | 1 + .../PVT_V2_B2_Linear_train_infer_python.txt | 1 + .../ResNeXt50_32x4d_train_infer_python.txt | 7 + .../ResNet/ResNet152_train_infer_python.txt | 5 +- .../ResNet50_train_ampfp16_infer_python.txt | 3 +- .../ResNet/ResNet50_train_infer_python.txt | 5 +- ...leet_normal_infer_python_linux_gpu_cpu.txt | 3 +- ..._normal_amp_infer_python_linux_gpu_cpu.txt | 1 + .../ResNet50_train_pact_infer_python.txt | 3 +- .../ResNet50_train_ptq_infer_python.txt | 5 +- .../ResNet/ResNet50_vd_train_infer_python.txt | 3 +- .../ResNet50_vd_train_pact_infer_python.txt | 3 +- .../ResNet50_vd_train_ptq_infer_python.txt | 5 +- .../ShuffleNetV2_x1_0_train_infer_python.txt | 5 +- ..._patch4_window7_224_train_infer_python.txt | 5 +- ...leet_normal_infer_python_linux_gpu_cpu.txt | 5 +- ...h4_window7_224_train_pact_infer_python.txt | 5 +- ...ch4_window7_224_train_ptq_infer_python.txt | 5 +- .../Twins/alt_gvt_base_train_infer_python.txt | 3 +- .../alt_gvt_small_train_infer_python.txt | 5 +- 44 files changed, 237 insertions(+), 168 deletions(-) diff --git a/test_tipc/benchmark_train.sh b/test_tipc/benchmark_train.sh index 1406431b9..2bb9b8410 100644 --- a/test_tipc/benchmark_train.sh +++ b/test_tipc/benchmark_train.sh @@ -90,6 +90,8 @@ line_num=`expr $line_num + 1` fp_items=$(func_parser_value "${lines[line_num]}") line_num=`expr $line_num + 1` epoch=$(func_parser_value "${lines[line_num]}") +line_num=`expr $line_num + 1` +model_type=$(func_parser_value "${lines[line_num]}") line_num=`expr $line_num + 1` profile_option_key=$(func_parser_key "${lines[line_num]}") @@ -118,6 +120,7 @@ line_gpuid=4 line_precision=6 line_epoch=7 line_batchsize=9 +line_model_type=15 line_profile=13 line_eval_py=24 line_export_py=30 @@ -138,6 +141,7 @@ if [[ ! -n "$PARAMS" ]];then batch_size_list=(${batch_size}) fp_items_list=(${fp_items}) device_num_list=(N1C4) + model_type_list=(${model_type}) run_mode="DP" elif [[ ${PARAMS} = "dynamicTostatic" ]];then IFS="|" @@ -165,14 +169,13 @@ else fp_items_list=($precision) batch_size_list=($batch_size) device_num_list=($device_num) -fi -# for log name -to_static="" -# parse "to_static" options and modify trainer into "to_static_trainer" -if [[ ${model_type} = "dynamicTostatic" ]];then - to_static="d2sT_" - sed -i 's/trainer:norm_train/trainer:to_static_train/g' $FILENAME + # parse "to_static" options and modify trainer into "to_static_trainer" + if [[ ${model_type} = "dynamicTostatic" ]];then + model_type_list="to_static_train" + else + model_type_list="norm_train" + fi fi @@ -180,131 +183,142 @@ IFS="|" for batch_size in ${batch_size_list[*]}; do for precision in ${fp_items_list[*]}; do for device_num in ${device_num_list[*]}; do - # sed batchsize and precision - func_sed_params "$FILENAME" "${line_precision}" "$precision" - func_sed_params "$FILENAME" "${line_batchsize}" "$batch_size" - func_sed_params "$FILENAME" "${line_epoch}" "$epoch" - gpu_id=$(set_gpu_id $device_num) + for model_type in ${model_type_list[*]}; do + # sed batchsize and precision + func_sed_params "$FILENAME" "${line_precision}" "$precision" + func_sed_params "$FILENAME" "${line_batchsize}" "$batch_size" + func_sed_params "$FILENAME" "${line_epoch}" "$epoch" + func_sed_params "$FILENAME" "${line_model_type}" "$model_type" - # It is needed that using dali, NHWC and 4 channels when training ResNet50 with AMPO2 - if [[ $model_name == "ResNet50" && $precision == "fp16" ]]; then - sed -i "s/ResNet50.yaml/ResNet50_amp_O2_ultra.yaml/g" $FILENAME - fi - - # if bs is big, then copy train_list.txt to generate more train log - # At least 25 log number would be good to calculate ips for benchmark system. - # So the copy number for train_list is as follows: - total_batch_size=`echo $[$batch_size*${device_num:1:1}*${device_num:3:3}]` - if [[ $model_name == *GeneralRecognition* ]]; then - cd dataset/ - train_list_length=`cat train_reg_all_data.txt | wc -l` - copy_num=`echo $[25*10*$total_batch_size/$train_list_length]` - if [[ $copy_num -gt 1 ]];then - rm -rf train_reg_all_data.txt - for ((i=1; i <=$copy_num; i++));do - cat tipc_shitu_demo_data/demo_train.txt >> train_reg_all_data.txt - done - fi - cd .. - else - cd dataset/ILSVRC2012 - val_list_length=`cat val_list.txt | wc -l` - copy_num=`echo $[25*10*$total_batch_size/$val_list_length]` - rm -rf train_list.txt - if [[ $copy_num -gt 1 ]];then - for ((i=1; i <=$copy_num; i++));do - cat val_list.txt >> train_list.txt - done + # for log name + if [[ ${model_type} = "to_static_train" ]];then + to_static="d2sT_" else - ln -s val_list.txt train_list.txt + to_static="" fi - cd ../../ - fi - if [[ ${#gpu_id} -le 1 ]];then - log_path="$SAVE_LOG/profiling_log" - mkdir -p $log_path - log_name="${repo_name}_${model_name}_bs${batch_size}_${precision}_${run_mode}_${device_num}_${to_static}profiling" - func_sed_params "$FILENAME" "${line_gpuid}" "0" # sed used gpu_id - # set profile_option params - tmp=`sed -i "${line_profile}s/.*/${profile_option}/" "${FILENAME}"` + gpu_id=$(set_gpu_id $device_num) - # run test_train_inference_python.sh - cmd="bash test_tipc/test_train_inference_python.sh ${FILENAME} benchmark_train > ${log_path}/${log_name} 2>&1 " - echo $cmd - eval $cmd - eval "cat ${log_path}/${log_name}" + # It is needed that using dali, NHWC and 4 channels when training ResNet50 with AMPO2 + if [[ $model_name == "ResNet50" && $precision == "fp16" ]]; then + sed -i "s/ResNet50.yaml/ResNet50_amp_O2_ultra.yaml/g" $FILENAME + fi - # without profile - log_path="$SAVE_LOG/train_log" - speed_log_path="$SAVE_LOG/index" - mkdir -p $log_path - mkdir -p $speed_log_path - log_name="${repo_name}_${model_name}_bs${batch_size}_${precision}_${run_mode}_${device_num}_${to_static}log" - speed_log_name="${repo_name}_${model_name}_bs${batch_size}_${precision}_${run_mode}_${device_num}_${to_static}speed" - func_sed_params "$FILENAME" "${line_profile}" "null" # sed profile_id as null - cmd="bash test_tipc/test_train_inference_python.sh ${FILENAME} benchmark_train > ${log_path}/${log_name} 2>&1 " - echo $cmd - job_bt=`date '+%Y%m%d%H%M%S'` - eval $cmd - job_et=`date '+%Y%m%d%H%M%S'` - export model_run_time=$((${job_et}-${job_bt})) - eval "cat ${log_path}/${log_name}" + # if bs is big, then copy train_list.txt to generate more train log + # At least 25 log number would be good to calculate ips for benchmark system. + # So the copy number for train_list is as follows: + total_batch_size=`echo $[$batch_size*${device_num:1:1}*${device_num:3:3}]` + if [[ $model_name == *GeneralRecognition* ]]; then + cd dataset/ + train_list_length=`cat train_reg_all_data.txt | wc -l` + copy_num=`echo $[25*10*$total_batch_size/$train_list_length]` + if [[ $copy_num -gt 1 ]];then + rm -rf train_reg_all_data.txt + for ((i=1; i <=$copy_num; i++));do + cat tipc_shitu_demo_data/demo_train.txt >> train_reg_all_data.txt + done + fi + cd .. + else + cd dataset/ILSVRC2012 + val_list_length=`cat val_list.txt | wc -l` + copy_num=`echo $[25*10*$total_batch_size/$val_list_length]` + rm -rf train_list.txt + if [[ $copy_num -gt 1 ]];then + for ((i=1; i <=$copy_num; i++));do + cat val_list.txt >> train_list.txt + done + else + ln -s val_list.txt train_list.txt + fi + cd ../../ + fi - # parser log - _model_name="${model_name}_bs${batch_size}_${precision}_${run_mode}" - cmd="${python} ${BENCHMARK_ROOT}/scripts/analysis.py --filename ${log_path}/${log_name} \ - --speed_log_file '${speed_log_path}/${speed_log_name}' \ - --model_name ${_model_name} \ - --base_batch_size ${batch_size} \ - --run_mode ${run_mode} \ - --fp_item ${precision} \ - --keyword ips: \ - --skip_steps 100 \ - --device_num ${device_num} \ - --speed_unit samples/s \ - --convergence_key loss: " - echo $cmd - eval $cmd - last_status=${PIPESTATUS[0]} - status_check $last_status "${cmd}" "${status_log}" "${model_name}" - else - IFS=";" - unset_env=`unset CUDA_VISIBLE_DEVICES` - log_path="$SAVE_LOG/train_log" - speed_log_path="$SAVE_LOG/index" - mkdir -p $log_path - mkdir -p $speed_log_path - log_name="${repo_name}_${model_name}_bs${batch_size}_${precision}_${run_mode}_${device_num}_${to_static}log" - speed_log_name="${repo_name}_${model_name}_bs${batch_size}_${precision}_${run_mode}_${device_num}_${to_static}speed" - func_sed_params "$FILENAME" "${line_gpuid}" "$gpu_id" # sed used gpu_id - func_sed_params "$FILENAME" "${line_profile}" "null" # sed --profile_option as null - cmd="bash test_tipc/test_train_inference_python.sh ${FILENAME} benchmark_train > ${log_path}/${log_name} 2>&1 " - echo $cmd - job_bt=`date '+%Y%m%d%H%M%S'` - eval $cmd - job_et=`date '+%Y%m%d%H%M%S'` - export model_run_time=$((${job_et}-${job_bt})) - eval "cat ${log_path}/${log_name}" - # parser log - _model_name="${model_name}_bs${batch_size}_${precision}_${run_mode}" + if [[ ${#gpu_id} -le 1 ]];then + log_path="$SAVE_LOG/profiling_log" + mkdir -p $log_path + log_name="${repo_name}_${model_name}_bs${batch_size}_${precision}_${run_mode}_${device_num}_${to_static}profiling" + func_sed_params "$FILENAME" "${line_gpuid}" "0" # sed used gpu_id + # set profile_option params + tmp=`sed -i "${line_profile}s/.*/${profile_option}/" "${FILENAME}"` - cmd="${python} ${BENCHMARK_ROOT}/scripts/analysis.py --filename ${log_path}/${log_name} \ - --speed_log_file '${speed_log_path}/${speed_log_name}' \ - --model_name ${_model_name} \ - --base_batch_size ${batch_size} \ - --run_mode ${run_mode} \ - --fp_item ${precision} \ - --keyword ips: \ - --skip_steps 100 \ - --device_num ${device_num} \ - --speed_unit images/s \ - --convergence_key loss: " - echo $cmd - eval $cmd - last_status=${PIPESTATUS[0]} - status_check $last_status "${cmd}" "${status_log}" "${model_name}" - fi + # run test_train_inference_python.sh + cmd="bash test_tipc/test_train_inference_python.sh ${FILENAME} benchmark_train > ${log_path}/${log_name} 2>&1 " + echo $cmd + eval $cmd + eval "cat ${log_path}/${log_name}" + + # without profile + log_path="$SAVE_LOG/train_log" + speed_log_path="$SAVE_LOG/index" + mkdir -p $log_path + mkdir -p $speed_log_path + log_name="${repo_name}_${model_name}_bs${batch_size}_${precision}_${run_mode}_${device_num}_${to_static}log" + speed_log_name="${repo_name}_${model_name}_bs${batch_size}_${precision}_${run_mode}_${device_num}_${to_static}speed" + func_sed_params "$FILENAME" "${line_profile}" "null" # sed profile_id as null + cmd="bash test_tipc/test_train_inference_python.sh ${FILENAME} benchmark_train > ${log_path}/${log_name} 2>&1 " + echo $cmd + job_bt=`date '+%Y%m%d%H%M%S'` + eval $cmd + job_et=`date '+%Y%m%d%H%M%S'` + export model_run_time=$((${job_et}-${job_bt})) + eval "cat ${log_path}/${log_name}" + + # parser log + _model_name="${model_name}_bs${batch_size}_${precision}_${run_mode}" + cmd="${python} ${BENCHMARK_ROOT}/scripts/analysis.py --filename ${log_path}/${log_name} \ + --speed_log_file '${speed_log_path}/${speed_log_name}' \ + --model_name ${_model_name} \ + --base_batch_size ${batch_size} \ + --run_mode ${run_mode} \ + --fp_item ${precision} \ + --keyword ips: \ + --skip_steps 100 \ + --device_num ${device_num} \ + --speed_unit samples/s \ + --convergence_key loss: " + echo $cmd + eval $cmd + last_status=${PIPESTATUS[0]} + status_check $last_status "${cmd}" "${status_log}" "${model_name}" + else + IFS=";" + unset_env=`unset CUDA_VISIBLE_DEVICES` + log_path="$SAVE_LOG/train_log" + speed_log_path="$SAVE_LOG/index" + mkdir -p $log_path + mkdir -p $speed_log_path + log_name="${repo_name}_${model_name}_bs${batch_size}_${precision}_${run_mode}_${device_num}_${to_static}log" + speed_log_name="${repo_name}_${model_name}_bs${batch_size}_${precision}_${run_mode}_${device_num}_${to_static}speed" + func_sed_params "$FILENAME" "${line_gpuid}" "$gpu_id" # sed used gpu_id + func_sed_params "$FILENAME" "${line_profile}" "null" # sed --profile_option as null + cmd="bash test_tipc/test_train_inference_python.sh ${FILENAME} benchmark_train > ${log_path}/${log_name} 2>&1 " + echo $cmd + job_bt=`date '+%Y%m%d%H%M%S'` + eval $cmd + job_et=`date '+%Y%m%d%H%M%S'` + export model_run_time=$((${job_et}-${job_bt})) + eval "cat ${log_path}/${log_name}" + # parser log + _model_name="${model_name}_bs${batch_size}_${precision}_${run_mode}" + + cmd="${python} ${BENCHMARK_ROOT}/scripts/analysis.py --filename ${log_path}/${log_name} \ + --speed_log_file '${speed_log_path}/${speed_log_name}' \ + --model_name ${_model_name} \ + --base_batch_size ${batch_size} \ + --run_mode ${run_mode} \ + --fp_item ${precision} \ + --keyword ips: \ + --skip_steps 100 \ + --device_num ${device_num} \ + --speed_unit images/s \ + --convergence_key loss: " + echo $cmd + eval $cmd + last_status=${PIPESTATUS[0]} + status_check $last_status "${cmd}" "${status_log}" "${model_name}" + fi + done done done done diff --git a/test_tipc/configs/CSWinTransformer/CSWinTransformer_tiny_224_train_infer_python.txt b/test_tipc/configs/CSWinTransformer/CSWinTransformer_tiny_224_train_infer_python.txt index b8b95f2f4..05856f032 100644 --- a/test_tipc/configs/CSWinTransformer/CSWinTransformer_tiny_224_train_infer_python.txt +++ b/test_tipc/configs/CSWinTransformer/CSWinTransformer_tiny_224_train_infer_python.txt @@ -54,6 +54,7 @@ null:null batch_size:128 fp_items:fp32 epoch:1 +model_type:norm_train --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 ===========================infer_benchmark_params========================== diff --git a/test_tipc/configs/DenseNet/DenseNet121_train_infer_python.txt b/test_tipc/configs/DenseNet/DenseNet121_train_infer_python.txt index a1532be0a..afcfd172d 100644 --- a/test_tipc/configs/DenseNet/DenseNet121_train_infer_python.txt +++ b/test_tipc/configs/DenseNet/DenseNet121_train_infer_python.txt @@ -50,5 +50,12 @@ inference:python/predict_cls.py -c configs/inference_cls.yaml -o Global.benchmark:False null:null null:null +===========================train_benchmark_params========================== +batch_size:64 +fp_items:fp32|fp16 +epoch:1 +model_type:norm_train|to_static_train +--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 ===========================infer_benchmark_params========================== random_infer_input:[{float32,[3,224,224]}] \ No newline at end of file diff --git a/test_tipc/configs/GeneralRecognition/GeneralRecognition_PPLCNet_x2_5_train_infer_python.txt b/test_tipc/configs/GeneralRecognition/GeneralRecognition_PPLCNet_x2_5_train_infer_python.txt index bdefd9476..ec6d1cd49 100644 --- a/test_tipc/configs/GeneralRecognition/GeneralRecognition_PPLCNet_x2_5_train_infer_python.txt +++ b/test_tipc/configs/GeneralRecognition/GeneralRecognition_PPLCNet_x2_5_train_infer_python.txt @@ -54,7 +54,8 @@ null:null batch_size:256 fp_items:fp32|fp16 epoch:1 +model_type:norm_train --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 ===========================infer_benchmark_params========================== -random_infer_input:[{float32,[3,224,224]}] \ No newline at end of file +random_infer_input:[{float32,[3,224,224]}] diff --git a/test_tipc/configs/GeneralRecognitionV2/GeneralRecognitionV2_PPLCNetV2_base_train_infer_python.txt b/test_tipc/configs/GeneralRecognitionV2/GeneralRecognitionV2_PPLCNetV2_base_train_infer_python.txt index f1f66a831..0e5ed2d0d 100644 --- a/test_tipc/configs/GeneralRecognitionV2/GeneralRecognitionV2_PPLCNetV2_base_train_infer_python.txt +++ b/test_tipc/configs/GeneralRecognitionV2/GeneralRecognitionV2_PPLCNetV2_base_train_infer_python.txt @@ -54,7 +54,8 @@ null:null batch_size:128 fp_items:fp32|fp16 epoch:1 +model_type:norm_train --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 ===========================infer_benchmark_params========================== -random_infer_input:[{float32,[3,224,224]}] \ No newline at end of file +random_infer_input:[{float32,[3,224,224]}] diff --git a/test_tipc/configs/HRNet/HRNet_W18_C_train_infer_python.txt b/test_tipc/configs/HRNet/HRNet_W18_C_train_infer_python.txt index 23765fc43..2090553e6 100644 --- a/test_tipc/configs/HRNet/HRNet_W18_C_train_infer_python.txt +++ b/test_tipc/configs/HRNet/HRNet_W18_C_train_infer_python.txt @@ -20,7 +20,7 @@ distill_train:null null:null null:null ## -===========================eval_params=========================== +===========================eval_params=========================== eval:tools/eval.py -c ppcls/configs/ImageNet/HRNet/HRNet_W18_C.yaml null:null ## @@ -54,7 +54,8 @@ null:null batch_size:64 fp_items:fp32|fp16 epoch:1 +model_type:norm_train --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 ===========================infer_benchmark_params========================== -random_infer_input:[{float32,[3,224,224]}] \ No newline at end of file +random_infer_input:[{float32,[3,224,224]}] diff --git a/test_tipc/configs/HRNet/HRNet_W48_C_train_infer_python.txt b/test_tipc/configs/HRNet/HRNet_W48_C_train_infer_python.txt index c83d9a6e8..cf944c6d2 100644 --- a/test_tipc/configs/HRNet/HRNet_W48_C_train_infer_python.txt +++ b/test_tipc/configs/HRNet/HRNet_W48_C_train_infer_python.txt @@ -20,7 +20,7 @@ distill_train:null to_static_train:-o Global.to_static=True null:null ## -===========================eval_params=========================== +===========================eval_params=========================== eval:tools/eval.py -c ppcls/configs/ImageNet/HRNet/HRNet_W48_C.yaml null:null ## @@ -54,7 +54,8 @@ null:null batch_size:64|128 fp_items:fp32 epoch:1 +model_type:norm_train --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 ===========================infer_benchmark_params========================== -random_infer_input:[{float32,[3,224,224]}] \ No newline at end of file +random_infer_input:[{float32,[3,224,224]}] diff --git a/test_tipc/configs/MobileNetV1/MobileNetV1_train_infer_python.txt b/test_tipc/configs/MobileNetV1/MobileNetV1_train_infer_python.txt index be065e3e1..8343b06d6 100644 --- a/test_tipc/configs/MobileNetV1/MobileNetV1_train_infer_python.txt +++ b/test_tipc/configs/MobileNetV1/MobileNetV1_train_infer_python.txt @@ -20,7 +20,7 @@ distill_train:null to_static_train:-o Global.to_static=True null:null ## -===========================eval_params=========================== +===========================eval_params=========================== eval:tools/eval.py -c ppcls/configs/ImageNet/MobileNetV1/MobileNetV1.yaml null:null ## @@ -54,7 +54,8 @@ null:null batch_size:64|128 fp_items:fp32|fp16 epoch:1 +model_type:norm_train --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 ===========================infer_benchmark_params========================== -random_infer_input:[{float32,[3,224,224]}] \ No newline at end of file +random_infer_input:[{float32,[3,224,224]}] diff --git a/test_tipc/configs/MobileNetV2/MobileNetV2_train_infer_python.txt b/test_tipc/configs/MobileNetV2/MobileNetV2_train_infer_python.txt index 9f8128108..76f905c27 100644 --- a/test_tipc/configs/MobileNetV2/MobileNetV2_train_infer_python.txt +++ b/test_tipc/configs/MobileNetV2/MobileNetV2_train_infer_python.txt @@ -20,7 +20,7 @@ distill_train:null to_static_train:-o Global.to_static=True null:null ## -===========================eval_params=========================== +===========================eval_params=========================== eval:tools/eval.py -c ppcls/configs/ImageNet/MobileNetV2/MobileNetV2.yaml null:null ## @@ -54,7 +54,8 @@ null:null batch_size:64|128 fp_items:fp32|fp16 epoch:1 +model_type:norm_train --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 ===========================infer_benchmark_params========================== -random_infer_input:[{float32,[3,224,224]}] \ No newline at end of file +random_infer_input:[{float32,[3,224,224]}] diff --git a/test_tipc/configs/MobileNetV3/MobileNetV3_large_x1_0_train_infer_python.txt b/test_tipc/configs/MobileNetV3/MobileNetV3_large_x1_0_train_infer_python.txt index 61aaee186..584719689 100644 --- a/test_tipc/configs/MobileNetV3/MobileNetV3_large_x1_0_train_infer_python.txt +++ b/test_tipc/configs/MobileNetV3/MobileNetV3_large_x1_0_train_infer_python.txt @@ -54,7 +54,8 @@ null:null batch_size:256|640 fp_items:fp32|fp16 epoch:1 +model_type:norm_train|to_static_train --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 ===========================infer_benchmark_params========================== -random_infer_input:[{float32,[3,224,224]}] \ No newline at end of file +random_infer_input:[{float32,[3,224,224]}] diff --git a/test_tipc/configs/MobileNetV3/MobileNetV3_large_x1_0_train_linux_gpu_fleet_normal_infer_python_linux_gpu_cpu.txt b/test_tipc/configs/MobileNetV3/MobileNetV3_large_x1_0_train_linux_gpu_fleet_normal_infer_python_linux_gpu_cpu.txt index cac730739..ac4915825 100644 --- a/test_tipc/configs/MobileNetV3/MobileNetV3_large_x1_0_train_linux_gpu_fleet_normal_infer_python_linux_gpu_cpu.txt +++ b/test_tipc/configs/MobileNetV3/MobileNetV3_large_x1_0_train_linux_gpu_fleet_normal_infer_python_linux_gpu_cpu.txt @@ -54,7 +54,8 @@ null:null batch_size:256|640 fp_items:fp32 epoch:1 +model_type:norm_train --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 ===========================infer_benchmark_params========================== -random_infer_input:[{float32,[3,224,224]}] \ No newline at end of file +random_infer_input:[{float32,[3,224,224]}] diff --git a/test_tipc/configs/MobileNetV3/MobileNetV3_large_x1_0_train_pact_infer_python.txt b/test_tipc/configs/MobileNetV3/MobileNetV3_large_x1_0_train_pact_infer_python.txt index 5637a8453..e1672b46e 100644 --- a/test_tipc/configs/MobileNetV3/MobileNetV3_large_x1_0_train_pact_infer_python.txt +++ b/test_tipc/configs/MobileNetV3/MobileNetV3_large_x1_0_train_pact_infer_python.txt @@ -20,7 +20,7 @@ distill_train:null to_static_train:-o Global.to_static=True null:null ## -===========================eval_params=========================== +===========================eval_params=========================== eval:tools/eval.py -c ppcls/configs/ImageNet/MobileNetV3/MobileNetV3_large_x1_0.yaml -o Slim.quant.name=pact null:null ## @@ -54,7 +54,8 @@ null:null batch_size:256|640 fp_items:fp32 epoch:1 +model_type:norm_train --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 ===========================infer_benchmark_params========================== -random_infer_input:[{float32,[3,224,224]}] \ No newline at end of file +random_infer_input:[{float32,[3,224,224]}] diff --git a/test_tipc/configs/MobileNetV3/MobileNetV3_large_x1_0_train_ptq_infer_python.txt b/test_tipc/configs/MobileNetV3/MobileNetV3_large_x1_0_train_ptq_infer_python.txt index 53628ef5f..c14221173 100644 --- a/test_tipc/configs/MobileNetV3/MobileNetV3_large_x1_0_train_ptq_infer_python.txt +++ b/test_tipc/configs/MobileNetV3/MobileNetV3_large_x1_0_train_ptq_infer_python.txt @@ -20,7 +20,7 @@ distill_train:null to_static_train:-o Global.to_static=True null:null ## -===========================eval_params=========================== +===========================eval_params=========================== eval:tools/eval.py -c ppcls/configs/ImageNet/MobileNetV3/MobileNetV3_large_x1_0.yaml null:null ## @@ -54,7 +54,8 @@ null:null batch_size:256|640 fp_items:fp32 epoch:1 +model_type:norm_train --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 ===========================infer_benchmark_params========================== -random_infer_input:[{float32,[3,224,224]}] \ No newline at end of file +random_infer_input:[{float32,[3,224,224]}] diff --git a/test_tipc/configs/MobileViT/MobileViT_S_train_infer_python.txt b/test_tipc/configs/MobileViT/MobileViT_S_train_infer_python.txt index 0c54292e2..a8bda5b6d 100644 --- a/test_tipc/configs/MobileViT/MobileViT_S_train_infer_python.txt +++ b/test_tipc/configs/MobileViT/MobileViT_S_train_infer_python.txt @@ -54,6 +54,7 @@ null:null batch_size:128 fp_items:fp32 epoch:1 +model_type:norm_train --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 ===========================infer_benchmark_params========================== diff --git a/test_tipc/configs/PPHGNet/PPHGNet_small_train_infer_python.txt b/test_tipc/configs/PPHGNet/PPHGNet_small_train_infer_python.txt index b8333344f..d6476ffb6 100644 --- a/test_tipc/configs/PPHGNet/PPHGNet_small_train_infer_python.txt +++ b/test_tipc/configs/PPHGNet/PPHGNet_small_train_infer_python.txt @@ -20,7 +20,7 @@ distill_train:null null:null null:null ## -===========================eval_params=========================== +===========================eval_params=========================== eval:tools/eval.py -c ppcls/configs/ImageNet/PPHGNet/PPHGNet_small.yaml null:null ## @@ -53,6 +53,7 @@ null:null batch_size:128 fp_items:fp32|fp16 epoch:1 +model_type:norm_train --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 ===========================infer_benchmark_params========================== diff --git a/test_tipc/configs/PPHGNet/PPHGNet_tiny_train_infer_python.txt b/test_tipc/configs/PPHGNet/PPHGNet_tiny_train_infer_python.txt index 586c6e6be..50d0e8241 100644 --- a/test_tipc/configs/PPHGNet/PPHGNet_tiny_train_infer_python.txt +++ b/test_tipc/configs/PPHGNet/PPHGNet_tiny_train_infer_python.txt @@ -20,7 +20,7 @@ distill_train:null null:null null:null ## -===========================eval_params=========================== +===========================eval_params=========================== eval:tools/eval.py -c ppcls/configs/ImageNet/PPHGNet/PPHGNet_tiny.yaml null:null ## @@ -53,6 +53,7 @@ null:null batch_size:128 fp_items:fp32|fp16 epoch:1 +model_type:norm_train --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 ===========================infer_benchmark_params========================== diff --git a/test_tipc/configs/PPLCNet/PPLCNet_x0_25_train_infer_python.txt b/test_tipc/configs/PPLCNet/PPLCNet_x0_25_train_infer_python.txt index 8a5578be5..25c43392f 100644 --- a/test_tipc/configs/PPLCNet/PPLCNet_x0_25_train_infer_python.txt +++ b/test_tipc/configs/PPLCNet/PPLCNet_x0_25_train_infer_python.txt @@ -53,6 +53,7 @@ null:null batch_size:512 fp_items:fp32|fp16 epoch:1 +model_type:norm_train --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 ===========================infer_benchmark_params========================== diff --git a/test_tipc/configs/PPLCNet/PPLCNet_x0_35_train_infer_python.txt b/test_tipc/configs/PPLCNet/PPLCNet_x0_35_train_infer_python.txt index 6ad7be89b..b3c5cbfad 100644 --- a/test_tipc/configs/PPLCNet/PPLCNet_x0_35_train_infer_python.txt +++ b/test_tipc/configs/PPLCNet/PPLCNet_x0_35_train_infer_python.txt @@ -53,6 +53,7 @@ null:null batch_size:512 fp_items:fp32|fp16 epoch:1 +model_type:norm_train --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 ===========================infer_benchmark_params========================== diff --git a/test_tipc/configs/PPLCNet/PPLCNet_x0_5_train_infer_python.txt b/test_tipc/configs/PPLCNet/PPLCNet_x0_5_train_infer_python.txt index d2e796c9e..c095addbc 100644 --- a/test_tipc/configs/PPLCNet/PPLCNet_x0_5_train_infer_python.txt +++ b/test_tipc/configs/PPLCNet/PPLCNet_x0_5_train_infer_python.txt @@ -53,6 +53,7 @@ null:null batch_size:512 fp_items:fp32|fp16 epoch:1 +model_type:norm_train --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 ===========================infer_benchmark_params========================== diff --git a/test_tipc/configs/PPLCNet/PPLCNet_x0_75_train_infer_python.txt b/test_tipc/configs/PPLCNet/PPLCNet_x0_75_train_infer_python.txt index f090a3c47..af44a17ce 100644 --- a/test_tipc/configs/PPLCNet/PPLCNet_x0_75_train_infer_python.txt +++ b/test_tipc/configs/PPLCNet/PPLCNet_x0_75_train_infer_python.txt @@ -53,6 +53,7 @@ null:null batch_size:512 fp_items:fp32|fp16 epoch:1 +model_type:norm_train --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 ===========================infer_benchmark_params========================== diff --git a/test_tipc/configs/PPLCNet/PPLCNet_x1_0_train_infer_python.txt b/test_tipc/configs/PPLCNet/PPLCNet_x1_0_train_infer_python.txt index 254abf81c..38f1d4df9 100644 --- a/test_tipc/configs/PPLCNet/PPLCNet_x1_0_train_infer_python.txt +++ b/test_tipc/configs/PPLCNet/PPLCNet_x1_0_train_infer_python.txt @@ -53,6 +53,7 @@ null:null batch_size:512 fp_items:fp32|fp16 epoch:1 +model_type:norm_train --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 ===========================infer_benchmark_params========================== diff --git a/test_tipc/configs/PPLCNet/PPLCNet_x1_5_train_infer_python.txt b/test_tipc/configs/PPLCNet/PPLCNet_x1_5_train_infer_python.txt index 31681d997..8d803e218 100644 --- a/test_tipc/configs/PPLCNet/PPLCNet_x1_5_train_infer_python.txt +++ b/test_tipc/configs/PPLCNet/PPLCNet_x1_5_train_infer_python.txt @@ -53,6 +53,7 @@ null:null batch_size:512 fp_items:fp32|fp16 epoch:1 +model_type:norm_train --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 ===========================infer_benchmark_params========================== diff --git a/test_tipc/configs/PPLCNet/PPLCNet_x2_0_train_infer_python.txt b/test_tipc/configs/PPLCNet/PPLCNet_x2_0_train_infer_python.txt index 7cbca6446..a597ffe16 100644 --- a/test_tipc/configs/PPLCNet/PPLCNet_x2_0_train_infer_python.txt +++ b/test_tipc/configs/PPLCNet/PPLCNet_x2_0_train_infer_python.txt @@ -53,6 +53,7 @@ null:null batch_size:512 fp_items:fp32|fp16 epoch:1 +model_type:norm_train --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 ===========================infer_benchmark_params========================== diff --git a/test_tipc/configs/PPLCNet/PPLCNet_x2_5_train_infer_python.txt b/test_tipc/configs/PPLCNet/PPLCNet_x2_5_train_infer_python.txt index 5db7cb4eb..ad6a819f4 100644 --- a/test_tipc/configs/PPLCNet/PPLCNet_x2_5_train_infer_python.txt +++ b/test_tipc/configs/PPLCNet/PPLCNet_x2_5_train_infer_python.txt @@ -53,6 +53,7 @@ null:null batch_size:256 fp_items:fp32|fp16 epoch:1 +model_type:norm_train --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 ===========================infer_benchmark_params========================== diff --git a/test_tipc/configs/PPLCNetV2/PPLCNetV2_base_train_infer_python.txt b/test_tipc/configs/PPLCNetV2/PPLCNetV2_base_train_infer_python.txt index 2dfe1e35a..e0dc93af0 100644 --- a/test_tipc/configs/PPLCNetV2/PPLCNetV2_base_train_infer_python.txt +++ b/test_tipc/configs/PPLCNetV2/PPLCNetV2_base_train_infer_python.txt @@ -53,6 +53,7 @@ null:null batch_size:500 fp_items:fp32|fp16 epoch:1 +model_type:norm_train --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 ===========================infer_benchmark_params========================== diff --git a/test_tipc/configs/PVTV2/PVT_V2_B2_Linear_train_infer_python.txt b/test_tipc/configs/PVTV2/PVT_V2_B2_Linear_train_infer_python.txt index cc412d47c..51572b8c5 100644 --- a/test_tipc/configs/PVTV2/PVT_V2_B2_Linear_train_infer_python.txt +++ b/test_tipc/configs/PVTV2/PVT_V2_B2_Linear_train_infer_python.txt @@ -54,6 +54,7 @@ null:null batch_size:128 fp_items:fp32 epoch:1 +model_type:norm_train --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 ===========================infer_benchmark_params========================== diff --git a/test_tipc/configs/ResNeXt/ResNeXt50_32x4d_train_infer_python.txt b/test_tipc/configs/ResNeXt/ResNeXt50_32x4d_train_infer_python.txt index 50a2884e6..138c90a32 100644 --- a/test_tipc/configs/ResNeXt/ResNeXt50_32x4d_train_infer_python.txt +++ b/test_tipc/configs/ResNeXt/ResNeXt50_32x4d_train_infer_python.txt @@ -50,5 +50,12 @@ inference:python/predict_cls.py -c configs/inference_cls.yaml -o Global.benchmark:False null:null null:null +===========================train_benchmark_params========================== +batch_size:64 +fp_items:fp32|fp16 +epoch:1 +model_type:norm_train|to_static_train +--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 ===========================infer_benchmark_params========================== random_infer_input:[{float32,[3,224,224]}] \ No newline at end of file diff --git a/test_tipc/configs/ResNet/ResNet152_train_infer_python.txt b/test_tipc/configs/ResNet/ResNet152_train_infer_python.txt index 1b2fe7acb..50645c133 100644 --- a/test_tipc/configs/ResNet/ResNet152_train_infer_python.txt +++ b/test_tipc/configs/ResNet/ResNet152_train_infer_python.txt @@ -20,7 +20,7 @@ distill_train:null to_static_train:-o Global.to_static=True null:null ## -===========================eval_params=========================== +===========================eval_params=========================== eval:tools/eval.py -c ppcls/configs/ImageNet/ResNet/ResNet152.yaml null:null ## @@ -54,7 +54,8 @@ null:null batch_size:32|64 fp_items:fp32|fp16 epoch:1 +model_type:norm_train --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 ===========================infer_benchmark_params========================== -random_infer_input:[{float32,[3,224,224]}] \ No newline at end of file +random_infer_input:[{float32,[3,224,224]}] diff --git a/test_tipc/configs/ResNet/ResNet50_train_ampfp16_infer_python.txt b/test_tipc/configs/ResNet/ResNet50_train_ampfp16_infer_python.txt index 3c7592779..3eb3bb874 100644 --- a/test_tipc/configs/ResNet/ResNet50_train_ampfp16_infer_python.txt +++ b/test_tipc/configs/ResNet/ResNet50_train_ampfp16_infer_python.txt @@ -20,7 +20,7 @@ distill_train:null to_static_train:-o Global.to_static=True null:null ## -===========================eval_params=========================== +===========================eval_params=========================== eval:tools/eval.py -c ppcls/configs/ImageNet/ResNet/ResNet50.yaml null:null ## @@ -54,3 +54,4 @@ null:null batch_size:128|256 fp_items:ampfp16 epoch:1 +model_type:norm_train diff --git a/test_tipc/configs/ResNet/ResNet50_train_infer_python.txt b/test_tipc/configs/ResNet/ResNet50_train_infer_python.txt index 8d42fc2db..74f3fcc73 100644 --- a/test_tipc/configs/ResNet/ResNet50_train_infer_python.txt +++ b/test_tipc/configs/ResNet/ResNet50_train_infer_python.txt @@ -20,7 +20,7 @@ distill_train:null to_static_train:-o Global.to_static=True null:null ## -===========================eval_params=========================== +===========================eval_params=========================== eval:tools/eval.py -c ppcls/configs/ImageNet/ResNet/ResNet50.yaml null:null ## @@ -54,7 +54,8 @@ null:null batch_size:128|64 fp_items:fp32|fp16 epoch:1 +model_type:norm_train|to_static_train --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 ===========================infer_benchmark_params========================== -random_infer_input:[{float32,[3,224,224]}] \ No newline at end of file +random_infer_input:[{float32,[3,224,224]}] diff --git a/test_tipc/configs/ResNet/ResNet50_train_linux_gpu_fleet_normal_infer_python_linux_gpu_cpu.txt b/test_tipc/configs/ResNet/ResNet50_train_linux_gpu_fleet_normal_infer_python_linux_gpu_cpu.txt index 808c71c8b..9d132660f 100644 --- a/test_tipc/configs/ResNet/ResNet50_train_linux_gpu_fleet_normal_infer_python_linux_gpu_cpu.txt +++ b/test_tipc/configs/ResNet/ResNet50_train_linux_gpu_fleet_normal_infer_python_linux_gpu_cpu.txt @@ -54,7 +54,8 @@ null:null batch_size:128 fp_items:fp32 epoch:1 +model_type:norm_train --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 ===========================infer_benchmark_params========================== -random_infer_input:[{float32,[3,224,224]}] \ No newline at end of file +random_infer_input:[{float32,[3,224,224]}] diff --git a/test_tipc/configs/ResNet/ResNet50_train_linux_gpu_normal_amp_infer_python_linux_gpu_cpu.txt b/test_tipc/configs/ResNet/ResNet50_train_linux_gpu_normal_amp_infer_python_linux_gpu_cpu.txt index 1438098f6..d6d0064df 100644 --- a/test_tipc/configs/ResNet/ResNet50_train_linux_gpu_normal_amp_infer_python_linux_gpu_cpu.txt +++ b/test_tipc/configs/ResNet/ResNet50_train_linux_gpu_normal_amp_infer_python_linux_gpu_cpu.txt @@ -54,3 +54,4 @@ null:null batch_size:128|256 fp_items:purefp16 epoch:1 +model_type:norm_train diff --git a/test_tipc/configs/ResNet/ResNet50_train_pact_infer_python.txt b/test_tipc/configs/ResNet/ResNet50_train_pact_infer_python.txt index 152918e07..349f76856 100644 --- a/test_tipc/configs/ResNet/ResNet50_train_pact_infer_python.txt +++ b/test_tipc/configs/ResNet/ResNet50_train_pact_infer_python.txt @@ -54,7 +54,8 @@ null:null batch_size:128 fp_items:fp32 epoch:1 +model_type:norm_train --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 ===========================infer_benchmark_params========================== -random_infer_input:[{float32,[3,224,224]}] \ No newline at end of file +random_infer_input:[{float32,[3,224,224]}] diff --git a/test_tipc/configs/ResNet/ResNet50_train_ptq_infer_python.txt b/test_tipc/configs/ResNet/ResNet50_train_ptq_infer_python.txt index 0f38b6474..fe931877c 100644 --- a/test_tipc/configs/ResNet/ResNet50_train_ptq_infer_python.txt +++ b/test_tipc/configs/ResNet/ResNet50_train_ptq_infer_python.txt @@ -20,7 +20,7 @@ distill_train:null to_static_train:-o Global.to_static=True null:null ## -===========================eval_params=========================== +===========================eval_params=========================== eval:tools/eval.py -c ppcls/configs/ImageNet/ResNet/ResNet50.yaml null:null ## @@ -54,7 +54,8 @@ null:null batch_size:128 fp_items:fp32 epoch:1 +model_type:norm_train --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 ===========================infer_benchmark_params========================== -random_infer_input:[{float32,[3,224,224]}] \ No newline at end of file +random_infer_input:[{float32,[3,224,224]}] diff --git a/test_tipc/configs/ResNet/ResNet50_vd_train_infer_python.txt b/test_tipc/configs/ResNet/ResNet50_vd_train_infer_python.txt index f9e432837..3ec673fa6 100644 --- a/test_tipc/configs/ResNet/ResNet50_vd_train_infer_python.txt +++ b/test_tipc/configs/ResNet/ResNet50_vd_train_infer_python.txt @@ -54,7 +54,8 @@ null:null batch_size:64 fp_items:fp32|fp16 epoch:1 +model_type:norm_train --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 ===========================infer_benchmark_params========================== -random_infer_input:[{float32,[3,224,224]}] \ No newline at end of file +random_infer_input:[{float32,[3,224,224]}] diff --git a/test_tipc/configs/ResNet/ResNet50_vd_train_pact_infer_python.txt b/test_tipc/configs/ResNet/ResNet50_vd_train_pact_infer_python.txt index 5b4779dbf..bff3adc66 100644 --- a/test_tipc/configs/ResNet/ResNet50_vd_train_pact_infer_python.txt +++ b/test_tipc/configs/ResNet/ResNet50_vd_train_pact_infer_python.txt @@ -54,7 +54,8 @@ null:null batch_size:128 fp_items:fp32 epoch:1 +model_type:norm_train --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 ===========================infer_benchmark_params========================== -random_infer_input:[{float32,[3,224,224]}] \ No newline at end of file +random_infer_input:[{float32,[3,224,224]}] diff --git a/test_tipc/configs/ResNet/ResNet50_vd_train_ptq_infer_python.txt b/test_tipc/configs/ResNet/ResNet50_vd_train_ptq_infer_python.txt index 6398becee..6668b2b38 100644 --- a/test_tipc/configs/ResNet/ResNet50_vd_train_ptq_infer_python.txt +++ b/test_tipc/configs/ResNet/ResNet50_vd_train_ptq_infer_python.txt @@ -20,7 +20,7 @@ distill_train:null to_static_train:-o Global.to_static=True null:null ## -===========================eval_params=========================== +===========================eval_params=========================== eval:tools/eval.py -c ppcls/configs/ImageNet/ResNet/ResNet50_vd.yaml null:null ## @@ -54,7 +54,8 @@ null:null batch_size:128 fp_items:fp32 epoch:1 +model_type:norm_train --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 ===========================infer_benchmark_params========================== -random_infer_input:[{float32,[3,224,224]}] \ No newline at end of file +random_infer_input:[{float32,[3,224,224]}] diff --git a/test_tipc/configs/ShuffleNet/ShuffleNetV2_x1_0_train_infer_python.txt b/test_tipc/configs/ShuffleNet/ShuffleNetV2_x1_0_train_infer_python.txt index f51ae9dad..6d516b68a 100644 --- a/test_tipc/configs/ShuffleNet/ShuffleNetV2_x1_0_train_infer_python.txt +++ b/test_tipc/configs/ShuffleNet/ShuffleNetV2_x1_0_train_infer_python.txt @@ -20,7 +20,7 @@ distill_train:null to_static_train:-o Global.to_static=True null:null ## -===========================eval_params=========================== +===========================eval_params=========================== eval:tools/eval.py -c ppcls/configs/ImageNet/ShuffleNet/ShuffleNetV2_x1_0.yaml null:null ## @@ -54,7 +54,8 @@ null:null batch_size:256|1536 fp_items:fp32|fp16 epoch:2 +model_type:norm_train --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 ===========================infer_benchmark_params========================== -random_infer_input:[{float32,[3,224,224]}] \ No newline at end of file +random_infer_input:[{float32,[3,224,224]}] diff --git a/test_tipc/configs/SwinTransformer/SwinTransformer_tiny_patch4_window7_224_train_infer_python.txt b/test_tipc/configs/SwinTransformer/SwinTransformer_tiny_patch4_window7_224_train_infer_python.txt index 941acf69d..4d2caee36 100644 --- a/test_tipc/configs/SwinTransformer/SwinTransformer_tiny_patch4_window7_224_train_infer_python.txt +++ b/test_tipc/configs/SwinTransformer/SwinTransformer_tiny_patch4_window7_224_train_infer_python.txt @@ -20,7 +20,7 @@ distill_train:null null:null null:null ## -===========================eval_params=========================== +===========================eval_params=========================== eval:tools/eval.py -c ppcls/configs/ImageNet/SwinTransformer/SwinTransformer_tiny_patch4_window7_224.yaml null:null ## @@ -54,7 +54,8 @@ null:null batch_size:104|128 fp_items:fp32|fp16 epoch:1 +model_type:norm_train|to_static_train --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 ===========================infer_benchmark_params========================== -random_infer_input:[{float32,[3,224,224]}] \ No newline at end of file +random_infer_input:[{float32,[3,224,224]}] diff --git a/test_tipc/configs/SwinTransformer/SwinTransformer_tiny_patch4_window7_224_train_linux_gpu_fleet_normal_infer_python_linux_gpu_cpu.txt b/test_tipc/configs/SwinTransformer/SwinTransformer_tiny_patch4_window7_224_train_linux_gpu_fleet_normal_infer_python_linux_gpu_cpu.txt index a8ed5d95f..d1d30f9bf 100644 --- a/test_tipc/configs/SwinTransformer/SwinTransformer_tiny_patch4_window7_224_train_linux_gpu_fleet_normal_infer_python_linux_gpu_cpu.txt +++ b/test_tipc/configs/SwinTransformer/SwinTransformer_tiny_patch4_window7_224_train_linux_gpu_fleet_normal_infer_python_linux_gpu_cpu.txt @@ -20,7 +20,7 @@ distill_train:null null:null null:null ## -===========================eval_params=========================== +===========================eval_params=========================== eval:tools/eval.py -c ppcls/configs/ImageNet/SwinTransformer/SwinTransformer_tiny_patch4_window7_224.yaml null:null ## @@ -54,7 +54,8 @@ null:null batch_size:64|104 fp_items:fp32 epoch:1 +model_type:norm_train --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 ===========================infer_benchmark_params========================== -random_infer_input:[{float32,[3,224,224]}] \ No newline at end of file +random_infer_input:[{float32,[3,224,224]}] diff --git a/test_tipc/configs/SwinTransformer/SwinTransformer_tiny_patch4_window7_224_train_pact_infer_python.txt b/test_tipc/configs/SwinTransformer/SwinTransformer_tiny_patch4_window7_224_train_pact_infer_python.txt index 536c848b3..3592117da 100644 --- a/test_tipc/configs/SwinTransformer/SwinTransformer_tiny_patch4_window7_224_train_pact_infer_python.txt +++ b/test_tipc/configs/SwinTransformer/SwinTransformer_tiny_patch4_window7_224_train_pact_infer_python.txt @@ -20,7 +20,7 @@ distill_train:null null:null null:null ## -===========================eval_params=========================== +===========================eval_params=========================== eval:tools/eval.py -c ppcls/configs/ImageNet/SwinTransformer/SwinTransformer_tiny_patch4_window7_224.yaml -o Slim.quant.name=pact null:null ## @@ -54,7 +54,8 @@ null:null batch_size:64|104 fp_items:fp32 epoch:1 +model_type:norm_train --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 ===========================infer_benchmark_params========================== -random_infer_input:[{float32,[3,224,224]}] \ No newline at end of file +random_infer_input:[{float32,[3,224,224]}] diff --git a/test_tipc/configs/SwinTransformer/SwinTransformer_tiny_patch4_window7_224_train_ptq_infer_python.txt b/test_tipc/configs/SwinTransformer/SwinTransformer_tiny_patch4_window7_224_train_ptq_infer_python.txt index c87459d2e..1d9041216 100644 --- a/test_tipc/configs/SwinTransformer/SwinTransformer_tiny_patch4_window7_224_train_ptq_infer_python.txt +++ b/test_tipc/configs/SwinTransformer/SwinTransformer_tiny_patch4_window7_224_train_ptq_infer_python.txt @@ -20,7 +20,7 @@ distill_train:null null:null null:null ## -===========================eval_params=========================== +===========================eval_params=========================== eval:tools/eval.py -c ppcls/configs/ImageNet/SwinTransformer/SwinTransformer_tiny_patch4_window7_224.yaml null:null ## @@ -54,7 +54,8 @@ null:null batch_size:64|104 fp_items:fp32 epoch:1 +model_type:norm_train --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 ===========================infer_benchmark_params========================== -random_infer_input:[{float32,[3,224,224]}] \ No newline at end of file +random_infer_input:[{float32,[3,224,224]}] diff --git a/test_tipc/configs/Twins/alt_gvt_base_train_infer_python.txt b/test_tipc/configs/Twins/alt_gvt_base_train_infer_python.txt index 510e3300c..743ebcea5 100644 --- a/test_tipc/configs/Twins/alt_gvt_base_train_infer_python.txt +++ b/test_tipc/configs/Twins/alt_gvt_base_train_infer_python.txt @@ -20,7 +20,7 @@ distill_train:null null:null null:null ## -===========================eval_params=========================== +===========================eval_params=========================== eval:tools/eval.py -c ppcls/configs/ImageNet/Twins/alt_gvt_base.yaml null:null ## @@ -54,6 +54,7 @@ null:null batch_size:64|144 fp_items:fp32 epoch:1 +model_type:norm_train --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 ===========================infer_benchmark_params========================== diff --git a/test_tipc/configs/Twins/alt_gvt_small_train_infer_python.txt b/test_tipc/configs/Twins/alt_gvt_small_train_infer_python.txt index 25ca3d857..d174ca3f0 100644 --- a/test_tipc/configs/Twins/alt_gvt_small_train_infer_python.txt +++ b/test_tipc/configs/Twins/alt_gvt_small_train_infer_python.txt @@ -20,7 +20,7 @@ distill_train:null null:null null:null ## -===========================eval_params=========================== +===========================eval_params=========================== eval:tools/eval.py -c ppcls/configs/ImageNet/Twins/alt_gvt_small.yaml null:null ## @@ -54,7 +54,8 @@ null:null batch_size:128 fp_items:fp32|fp16 epoch:1 +model_type:norm_train --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 ===========================infer_benchmark_params========================== -random_infer_input:[{float32,[3,224,224]}] \ No newline at end of file +random_infer_input:[{float32,[3,224,224]}]