From d194b4bcd497838085529376e2dda2825b9db5ee Mon Sep 17 00:00:00 2001
From: 游雁 <zhifu.gzf@alibaba-inc.com>
Date: 星期五, 31 三月 2023 15:06:38 +0800
Subject: [PATCH] Merge branch 'dev_cmz2' of github.com:alibaba-damo-academy/FunASR into dev_cmz2 add
---
funasr/export/models/encoder/sanm_encoder.py | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/funasr/export/models/encoder/sanm_encoder.py b/funasr/export/models/encoder/sanm_encoder.py
index 8390f68..44a48ff 100644
--- a/funasr/export/models/encoder/sanm_encoder.py
+++ b/funasr/export/models/encoder/sanm_encoder.py
@@ -164,6 +164,7 @@
speech = speech * self._output_size ** 0.5
mask = self.make_pad_mask(speech_lengths)
mask = self.prepare_mask(mask, sub_masks)
+ vad_mask = self.prepare_mask(mask, vad_mask)
if self.embed is None:
xs_pad = speech
else:
@@ -175,7 +176,7 @@
# encoder_outs = self.model.encoders(xs_pad, mask)
for layer_idx, encoder_layer in enumerate(self.model.encoders):
if layer_idx == len(self.model.encoders) - 1:
- mask = (mask[0], vad_mask)
+ mask = vad_mask
encoder_outs = encoder_layer(xs_pad, mask)
xs_pad, masks = encoder_outs[0], encoder_outs[1]
--
Gitblit v1.9.1