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/model.py | 2 +-
funasr/models/ct_transformer_streaming/model.py | 2 +-
funasr/models/fsmn_vad_streaming/model.py | 2 +-
funasr/auto/auto_model.py | 1 -
funasr/models/ct_transformer/model.py | 2 +-
funasr/models/paraformer_streaming/model.py | 5 ++---
funasr/models/bicif_paraformer/model.py | 2 +-
7 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/funasr/auto/auto_model.py b/funasr/auto/auto_model.py
index c8cd30c..edcede5 100644
--- a/funasr/auto/auto_model.py
+++ b/funasr/auto/auto_model.py
@@ -157,7 +157,6 @@
kwargs["device"] = device
torch.set_num_threads(kwargs.get("ncpu", 4))
-
# build tokenizer
tokenizer = kwargs.get("tokenizer", None)
diff --git a/funasr/models/bicif_paraformer/model.py b/funasr/models/bicif_paraformer/model.py
index 4802da0..b93f93a 100644
--- a/funasr/models/bicif_paraformer/model.py
+++ b/funasr/models/bicif_paraformer/model.py
@@ -367,7 +367,7 @@
else:
self.make_pad_mask = sequence_mask(max_seq_len, flip=False)
- self.forward = self._export_forward
+ self.forward = self.export_forward
return self
diff --git a/funasr/models/ct_transformer/model.py b/funasr/models/ct_transformer/model.py
index 88ee867..9f680fd 100644
--- a/funasr/models/ct_transformer/model.py
+++ b/funasr/models/ct_transformer/model.py
@@ -373,7 +373,7 @@
encoder_class = tables.encoder_classes.get(kwargs["encoder"]+"Export")
self.encoder = encoder_class(self.encoder, onnx=is_onnx)
- self.forward = self._export_forward
+ self.forward = self.export_forward
return self
diff --git a/funasr/models/ct_transformer_streaming/model.py b/funasr/models/ct_transformer_streaming/model.py
index 4752c4b..129cc95 100644
--- a/funasr/models/ct_transformer_streaming/model.py
+++ b/funasr/models/ct_transformer_streaming/model.py
@@ -182,7 +182,7 @@
encoder_class = tables.encoder_classes.get(kwargs["encoder"] + "Export")
self.encoder = encoder_class(self.encoder, onnx=is_onnx)
- self.forward = self._export_forward
+ self.forward = self.export_forward
return self
diff --git a/funasr/models/fsmn_vad_streaming/model.py b/funasr/models/fsmn_vad_streaming/model.py
index d06db20..602cf23 100644
--- a/funasr/models/fsmn_vad_streaming/model.py
+++ b/funasr/models/fsmn_vad_streaming/model.py
@@ -647,7 +647,7 @@
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)
- self.forward = self._export_forward
+ self.forward = self.export_forward
return self
diff --git a/funasr/models/paraformer/model.py b/funasr/models/paraformer/model.py
index f5f0e4e..2e2a36e 100644
--- a/funasr/models/paraformer/model.py
+++ b/funasr/models/paraformer/model.py
@@ -575,7 +575,7 @@
else:
self.make_pad_mask = sequence_mask(max_seq_len, flip=False)
- self.forward = self._export_forward
+ self.forward = self.export_forward
return self
diff --git a/funasr/models/paraformer_streaming/model.py b/funasr/models/paraformer_streaming/model.py
index 63dba5d..518fe93 100644
--- a/funasr/models/paraformer_streaming/model.py
+++ b/funasr/models/paraformer_streaming/model.py
@@ -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)
--
Gitblit v1.9.1