From d79287c37e4e7ae2694a992cbbfb03a5ca4f7670 Mon Sep 17 00:00:00 2001
From: 游雁 <zhifu.gzf@alibaba-inc.com>
Date: 星期二, 20 二月 2024 14:05:58 +0800
Subject: [PATCH] Merge branch 'main' of github.com:alibaba-damo-academy/FunASR merge
---
examples/aishell/paraformer/run.sh | 42 ++++++++++++++++++++++--------------------
1 files changed, 22 insertions(+), 20 deletions(-)
diff --git a/examples/aishell/paraformer/run.sh b/examples/aishell/paraformer/run.sh
index fd51de2..276152b 100755
--- a/examples/aishell/paraformer/run.sh
+++ b/examples/aishell/paraformer/run.sh
@@ -1,13 +1,7 @@
#!/usr/bin/env bash
-workspace=`pwd`
-# machines configuration
CUDA_VISIBLE_DEVICES="0,1"
-gpu_num=2
-gpu_inference=true # Whether to perform gpu decoding, set false for cpu decoding
-# for gpu decoding, inference_nj=ngpu*njob; for cpu decoding, inference_nj=njob
-njob=1
# general configuration
feats_dir="../DATA" #feature output dictionary
@@ -18,7 +12,12 @@
stop_stage=5
# feature configuration
-nj=64
+nj=32
+
+inference_device="cuda" #"cpu"
+inference_checkpoint="model.pt"
+inference_scp="wav.scp"
+inference_batch_size=32
# data
raw_data=../raw_data
@@ -26,6 +25,7 @@
# exp tag
tag="exp1"
+workspace=`pwd`
. utils/parse_options.sh || exit 1;
@@ -39,13 +39,8 @@
valid_set=dev
test_sets="dev test"
-config=train_asr_paraformer_conformer_12e_6d_2048_256.yaml
+config=paraformer_conformer_12e_6d_2048_256.yaml
model_dir="baseline_$(basename "${config}" .yaml)_${lang}_${token_type}_${tag}"
-
-inference_device="cuda" #"cpu"
-inference_checkpoint="model.pt"
-inference_scp="wav.scp"
-
if [ ${stage} -le -1 ] && [ ${stop_stage} -ge -1 ]; then
@@ -112,6 +107,8 @@
mkdir -p ${exp_dir}/exp/${model_dir}
log_file="${exp_dir}/exp/${model_dir}/train.log.txt"
echo "log_file: ${log_file}"
+
+ gpu_num=$(echo CUDA_VISIBLE_DEVICES | awk -F "," '{print NF}')
torchrun \
--nnodes 1 \
--nproc_per_node ${gpu_num} \
@@ -132,19 +129,18 @@
echo "stage 5: Inference"
if ${inference_device} == "cuda"; then
- nj=$(echo CUDA_VISIBLE_DEVICES | awk -F "," '{print NF}')
+ nj=$(echo $CUDA_VISIBLE_DEVICES | awk -F "," '{print NF}')
else
- nj=$njob
- batch_size=1
- gpuid_list=""
+ inference_batch_size=1
+ CUDA_VISIBLE_DEVICES=""
for JOB in $(seq ${nj}); do
- gpuid_list=CUDA_VISIBLE_DEVICES"-1,"
+ CUDA_VISIBLE_DEVICES=$CUDA_VISIBLE_DEVICES"-1,"
done
fi
for dset in ${test_sets}; do
- inference_dir="${asr_exp}/${inference_checkpoint}/${dset}"
+ inference_dir="${exp_dir}/exp/${model_dir}/${inference_checkpoint}/${dset}"
_logdir="${inference_dir}/logdir"
mkdir -p "${_logdir}"
@@ -157,8 +153,13 @@
done
utils/split_scp.pl "${key_file}" ${split_scps}
+ gpuid_list_array=(${gpuid_list//,/ })
for JOB in $(seq ${nj}); do
{
+ id=$((JOB-1))
+ gpuid=${gpuid_list_array[$id]}
+
+ export CUDA_VISIBLE_DEVICES=${gpuid}
python ../../../funasr/bin/inference.py \
--config-path="${exp_dir}/exp/${model_dir}" \
--config-name="config.yaml" \
@@ -167,7 +168,8 @@
++frontend_conf.cmvn_file="${feats_dir}/data/${train_set}/am.mvn" \
++input="${_logdir}/keys.${JOB}.scp" \
++output_dir="${inference_dir}/${JOB}" \
- ++device="${inference_device}"
+ ++device="${inference_device}" \
+ ++batch_size="${inference_batch_size}"
}&
done
--
Gitblit v1.9.1