diff --git a/paddlespeech/s2t/training/trainer.py b/paddlespeech/s2t/training/trainer.py index f5fb2db03..752208c32 100644 --- a/paddlespeech/s2t/training/trainer.py +++ b/paddlespeech/s2t/training/trainer.py @@ -245,8 +245,9 @@ class Trainer(): self.maybe_batch_sampler_step() def after_train_batch(self): - if self.args.benchmark_max_step and self.iteration > self.args.benchmark_max_step: + if self.args.benchmark_max_step: profiler.add_profiler_step(self.args.profiler_options) + if self.args.benchmark_max_step and self.iteration > self.args.benchmark_max_step: logger.info( f"Reach benchmark-max-step: {self.args.benchmark_max_step}") sys.exit( diff --git a/tests/benchmark/conformer/prepare.sh b/tests/benchmark/conformer/prepare.sh index c5fae06a5..4a7be1b69 100644 --- a/tests/benchmark/conformer/prepare.sh +++ b/tests/benchmark/conformer/prepare.sh @@ -2,7 +2,7 @@ cd ../../../ pip install -e . # 安装pdspeech cd - #Enter the example dir -pushd ../../../examples/aishell/s1 +pushd ../../../examples/aishell/asr1 #Prepare the data bash run.sh --stage 0 --stop_stage 0 diff --git a/tests/benchmark/conformer/run.sh b/tests/benchmark/conformer/run.sh index 79beb4e96..9fd13fbcb 100644 --- a/tests/benchmark/conformer/run.sh +++ b/tests/benchmark/conformer/run.sh @@ -8,7 +8,7 @@ cd ${CUR_DIR} sed -i '/set\ -xe/d' run_benchmark.sh #cd ** -pushd ../../../examples/aishell/s1 +pushd ../../../examples/aishell/asr1 # 1 安装该模型需要的依赖 (如需开启优化策略请注明) # 2 拷贝该模型需要数据、预训练模型 diff --git a/tests/benchmark/conformer/run_benchmark.sh b/tests/benchmark/conformer/run_benchmark.sh index d4efe2b96..5b83b15ce 100644 --- a/tests/benchmark/conformer/run_benchmark.sh +++ b/tests/benchmark/conformer/run_benchmark.sh @@ -1,5 +1,4 @@ #!/usr/bin/env bash -set -xe # 运行示例:CUDA_VISIBLE_DEVICES=0 bash run_benchmark.sh ${run_mode} ${bs_item} ${fp_item} 500 ${model_mode} # 参数说明 function _set_params(){ @@ -35,13 +34,15 @@ function _set_params(){ function _train(){ echo "Train on ${num_gpu_devices} GPUs" echo "current CUDA_VISIBLE_DEVICES=$CUDA_VISIBLE_DEVICES, gpus=$num_gpu_devices, batch_size=$batch_size" - train_cmd="--config=${config_path} - --output=${output} - --seed=${seed} - --ngpu=${ngpu} - --profiler-options "${profiler_options}" - --benchmark-batch-size ${batch_size} - --benchmark-max-step ${benchmark_max_step} " + train_cmd="--config=${config_path} \ + --output=${output} \ + --seed=${seed} \ + --ngpu=${ngpu} \ + --benchmark-batch-size ${batch_size} \ + --benchmark-max-step ${benchmark_max_step} " + if [ ${profiler_options} != "None" ]; then + train_cmd=${train_cmd}" --profiler-options=${profiler_options}" + fi case ${run_mode} in sp) train_cmd="python -u ${BIN_DIR}/train.py "${train_cmd} ;;