Merge branch 'main' of https://github.com/alibaba-damo-academy/FunASR

wucong.lyb

2023-06-29 a4beddbe757ff34d90591c79d9ed8462752ee47c

 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: