From cc59310dbf51a2c4891892b7359a5b68937ce12c Mon Sep 17 00:00:00 2001
From: zhifu gao <zhifu.gzf@alibaba-inc.com>
Date: 星期一, 11 三月 2024 19:37:50 +0800
Subject: [PATCH] Dev gzf (#1469)
---
funasr/models/paraformer_streaming/model.py | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/funasr/models/paraformer_streaming/model.py b/funasr/models/paraformer_streaming/model.py
index cebbfc1..518fe93 100644
--- a/funasr/models/paraformer_streaming/model.py
+++ b/funasr/models/paraformer_streaming/model.py
@@ -566,7 +566,7 @@
max_seq_len=512,
**kwargs,
):
-
+ self.device = kwargs.get("device")
is_onnx = kwargs.get("type", "onnx") == "onnx"
encoder_class = tables.encoder_classes.get(kwargs["encoder"] + "Export")
self.encoder = encoder_class(self.encoder, onnx=is_onnx)
@@ -587,7 +587,6 @@
else:
self.make_pad_mask = sequence_mask(max_seq_len, flip=False)
- self.forward = self._export_forward
import copy
import types
@@ -595,7 +594,7 @@
decoder_model = copy.copy(self)
# encoder
- encoder_model.forward = types.MethodType(ParaformerStreaming._export_encoder_forward, encoder_model)
+ encoder_model.forward = types.MethodType(ParaformerStreaming.export_encoder_forward, encoder_model)
encoder_model.export_dummy_inputs = types.MethodType(ParaformerStreaming.export_encoder_dummy_inputs, encoder_model)
encoder_model.export_input_names = types.MethodType(ParaformerStreaming.export_encoder_input_names, encoder_model)
encoder_model.export_output_names = types.MethodType(ParaformerStreaming.export_encoder_output_names, encoder_model)
@@ -603,7 +602,7 @@
encoder_model.export_name = types.MethodType(ParaformerStreaming.export_encoder_name, encoder_model)
# decoder
- decoder_model.forward = types.MethodType(ParaformerStreaming._export_decoder_forward, decoder_model)
+ decoder_model.forward = types.MethodType(ParaformerStreaming.export_decoder_forward, decoder_model)
decoder_model.export_dummy_inputs = types.MethodType(ParaformerStreaming.export_decoder_dummy_inputs, decoder_model)
decoder_model.export_input_names = types.MethodType(ParaformerStreaming.export_decoder_input_names, decoder_model)
decoder_model.export_output_names = types.MethodType(ParaformerStreaming.export_decoder_output_names, decoder_model)
@@ -612,7 +611,7 @@
return encoder_model, decoder_model
- def _export_encoder_forward(
+ def export_encoder_forward(
self,
speech: torch.Tensor,
speech_lengths: torch.Tensor,
@@ -663,7 +662,7 @@
def export_encoder_name(self):
return "model.onnx"
- def _export_decoder_forward(
+ def export_decoder_forward(
self,
enc: torch.Tensor,
enc_len: torch.Tensor,
--
Gitblit v1.9.1