From 7817db2e202f9790cb6a6e832fd688c01b3be643 Mon Sep 17 00:00:00 2001
From: zhifu gao <zhifu.gzf@alibaba-inc.com>
Date: 星期一, 12 十二月 2022 09:59:46 +0800
Subject: [PATCH] Merge pull request #13 from alibaba-damo-academy/dev

---
 egs/aishell/paraformerbert/run.sh      |    4 ++--
 funasr/bin/asr_inference_paraformer.py |    2 +-
 funasr/models/predictor/cif.py         |    4 +++-
 egs/aishell/paraformer/run.sh          |    4 ++--
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/egs/aishell/paraformer/run.sh b/egs/aishell/paraformer/run.sh
index 06322ce..c5ee1f2 100755
--- a/egs/aishell/paraformer/run.sh
+++ b/egs/aishell/paraformer/run.sh
@@ -8,7 +8,7 @@
 count=1
 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=8
+njob=1
 train_cmd=utils/run.pl
 infer_cmd=utils/run.pl
 
@@ -219,7 +219,7 @@
         fi
         ${infer_cmd} --gpu "${_ngpu}" --max-jobs-run "${_nj}" JOB=1:"${_nj}" "${_logdir}"/asr_inference.JOB.log \
             python -m funasr.bin.asr_inference_launch \
-                --batch_size 1 \
+                --batch_size 100 \
                 --ngpu "${_ngpu}" \
                 --njob ${njob} \
                 --gpuid_list ${gpuid_list} \
diff --git a/egs/aishell/paraformerbert/run.sh b/egs/aishell/paraformerbert/run.sh
index 6f331ec..a39ac77 100755
--- a/egs/aishell/paraformerbert/run.sh
+++ b/egs/aishell/paraformerbert/run.sh
@@ -8,7 +8,7 @@
 count=1
 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=8
+njob=1
 train_cmd=utils/run.pl
 infer_cmd=utils/run.pl
 
@@ -235,7 +235,7 @@
         fi
         ${infer_cmd} --gpu "${_ngpu}" --max-jobs-run "${_nj}" JOB=1:"${_nj}" "${_logdir}"/asr_inference.JOB.log \
             python -m funasr.bin.asr_inference_launch \
-                --batch_size 1 \
+                --batch_size 100 \
                 --ngpu "${_ngpu}" \
                 --njob ${njob} \
                 --gpuid_list ${gpuid_list} \
diff --git a/funasr/bin/asr_inference_paraformer.py b/funasr/bin/asr_inference_paraformer.py
index 15a37f7..9dcd0b8 100755
--- a/funasr/bin/asr_inference_paraformer.py
+++ b/funasr/bin/asr_inference_paraformer.py
@@ -441,7 +441,7 @@
             "decoding, feature length: {}, forward_time: {:.4f}, rtf: {:.4f}".
                 format(length, forward_time, 100 * forward_time / (length*lfr_factor)))
         
-        for batch_id in range(len(results)):
+        for batch_id in range(_bs):
             result = [results[batch_id][:-2]]
     
             key = keys[batch_id]
diff --git a/funasr/models/predictor/cif.py b/funasr/models/predictor/cif.py
index 2eba4e2..1d196a7 100644
--- a/funasr/models/predictor/cif.py
+++ b/funasr/models/predictor/cif.py
@@ -31,10 +31,12 @@
         alphas = torch.sigmoid(output)
         alphas = torch.nn.functional.relu(alphas * self.smooth_factor - self.noise_threshold)
         if mask is not None:
-            alphas = alphas * mask.transpose(-1, -2).float()
+            mask = mask.transpose(-1, -2).float()
+            alphas = alphas * mask
         if mask_chunk_predictor is not None:
             alphas = alphas * mask_chunk_predictor
         alphas = alphas.squeeze(-1)
+        mask = mask.squeeze(-1)
         if target_label_length is not None:
             target_length = target_label_length
         elif target_label is not None:

--
Gitblit v1.9.1