From ef9fb6316245d18525be559163a63b9458e588dd Mon Sep 17 00:00:00 2001
From: zhifu gao <zhifu.gzf@alibaba-inc.com>
Date: 星期五, 10 三月 2023 18:25:29 +0800
Subject: [PATCH] Merge pull request #205 from alibaba-damo-academy/dev_onnx
---
funasr/export/models/modules/decoder_layer.py | 1 +
funasr/export/models/modules/encoder_layer.py | 4 ++--
funasr/export/models/encoder/conformer_encoder.py | 1 -
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/funasr/export/models/encoder/conformer_encoder.py b/funasr/export/models/encoder/conformer_encoder.py
index 9f22574..0a35653 100644
--- a/funasr/export/models/encoder/conformer_encoder.py
+++ b/funasr/export/models/encoder/conformer_encoder.py
@@ -61,7 +61,6 @@
speech: torch.Tensor,
speech_lengths: torch.Tensor,
):
- speech = speech * self._output_size ** 0.5
mask = self.make_pad_mask(speech_lengths)
mask = self.prepare_mask(mask)
if self.embed is None:
diff --git a/funasr/export/models/modules/decoder_layer.py b/funasr/export/models/modules/decoder_layer.py
index f539452..9a464a4 100644
--- a/funasr/export/models/modules/decoder_layer.py
+++ b/funasr/export/models/modules/decoder_layer.py
@@ -54,6 +54,7 @@
def forward(self, tgt, tgt_mask, memory, memory_mask, cache=None):
residual = tgt
+ tgt = self.norm1(tgt)
tgt_q = tgt
tgt_q_mask = tgt_mask
x = residual + self.self_attn(tgt_q, tgt, tgt, tgt_q_mask)
diff --git a/funasr/export/models/modules/encoder_layer.py b/funasr/export/models/modules/encoder_layer.py
index 622b109..d132574 100644
--- a/funasr/export/models/modules/encoder_layer.py
+++ b/funasr/export/models/modules/encoder_layer.py
@@ -61,7 +61,7 @@
if self.feed_forward_macaron is not None:
residual = x
x = self.norm_ff_macaron(x)
- x = residual + self.feed_forward_macaron(x)
+ x = residual + self.feed_forward_macaron(x) * 0.5
residual = x
x = self.norm_mha(x)
@@ -81,7 +81,7 @@
residual = x
x = self.norm_ff(x)
- x = residual + self.feed_forward(x)
+ x = residual + self.feed_forward(x) * 0.5
x = self.norm_final(x)
--
Gitblit v1.9.1