From e42f539eb8acd106463a5bc466a39497691fb4ca Mon Sep 17 00:00:00 2001
From: 游雁 <zhifu.gzf@alibaba-inc.com>
Date: 星期一, 22 七月 2024 15:03:35 +0800
Subject: [PATCH] bugfix
---
funasr/models/paraformer_streaming/export_meta.py | 30 ++----------------------------
1 files changed, 2 insertions(+), 28 deletions(-)
diff --git a/funasr/models/paraformer_streaming/export_meta.py b/funasr/models/paraformer_streaming/export_meta.py
index 9740ecc..6815688 100644
--- a/funasr/models/paraformer_streaming/export_meta.py
+++ b/funasr/models/paraformer_streaming/export_meta.py
@@ -9,32 +9,6 @@
def export_rebuild_model(model, **kwargs):
- model.device = kwargs.get("device")
- is_onnx = kwargs.get("type", "onnx") == "onnx"
- encoder_class = tables.encoder_classes.get(kwargs["encoder"] + "Export")
- model.encoder = encoder_class(model.encoder, onnx=is_onnx)
-
- predictor_class = tables.predictor_classes.get(kwargs["predictor"] + "Export")
- model.predictor = predictor_class(model.predictor, onnx=is_onnx)
-
- decoder_class = tables.decoder_classes.get(kwargs["decoder"] + "Export")
- model.decoder = decoder_class(model.decoder, onnx=is_onnx)
-
- from funasr.utils.torch_function import sequence_mask
-
- model.make_pad_mask = sequence_mask(kwargs["max_seq_len"], flip=False)
-
- model.forward = types.MethodType(export_forward, model)
- model.export_dummy_inputs = types.MethodType(export_dummy_inputs, model)
- model.export_input_names = types.MethodType(export_input_names, model)
- model.export_output_names = types.MethodType(export_output_names, model)
- model.export_dynamic_axes = types.MethodType(export_dynamic_axes, model)
- model.export_name = types.MethodType(export_name, model)
-
- return model
-
-
-def export_rebuild_model(model, **kwargs):
# self.device = kwargs.get("device")
is_onnx = kwargs.get("type", "onnx") == "onnx"
encoder_class = tables.encoder_classes.get(kwargs["encoder"] + "Export")
@@ -64,7 +38,7 @@
encoder_model.export_input_names = types.MethodType(export_encoder_input_names, encoder_model)
encoder_model.export_output_names = types.MethodType(export_encoder_output_names, encoder_model)
encoder_model.export_dynamic_axes = types.MethodType(export_encoder_dynamic_axes, encoder_model)
- encoder_model.export_name = types.MethodType(export_encoder_name, encoder_model)
+ encoder_model.export_name = "model" # types.MethodType(export_encoder_name, encoder_model)
# decoder
decoder_model.forward = types.MethodType(export_decoder_forward, decoder_model)
@@ -72,7 +46,7 @@
decoder_model.export_input_names = types.MethodType(export_decoder_input_names, decoder_model)
decoder_model.export_output_names = types.MethodType(export_decoder_output_names, decoder_model)
decoder_model.export_dynamic_axes = types.MethodType(export_decoder_dynamic_axes, decoder_model)
- decoder_model.export_name = types.MethodType(export_decoder_name, decoder_model)
+ decoder_model.export_name = "decoder" # types.MethodType(export_decoder_name, decoder_model)
return encoder_model, decoder_model
--
Gitblit v1.9.1