Merge pull request #205 from alibaba-damo-academy/dev_onnx

zhifu gao

2023-03-10 ef9fb6316245d18525be559163a63b9458e588dd

Merge pull request #205 from alibaba-damo-academy/dev_onnx

export bug fix

 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:

 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)

 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)