From 557b913c5d78945e49cb2ac2bf254a2de40b6cd5 Mon Sep 17 00:00:00 2001
From: 游雁 <zhifu.gzf@alibaba-inc.com>
Date: 星期四, 14 三月 2024 11:48:31 +0800
Subject: [PATCH] v1.0.16
---
funasr/auto/auto_model.py | 37 ++++++++++++++++++++++---------------
1 files changed, 22 insertions(+), 15 deletions(-)
diff --git a/funasr/auto/auto_model.py b/funasr/auto/auto_model.py
index 28b9e94..2df1910 100644
--- a/funasr/auto/auto_model.py
+++ b/funasr/auto/auto_model.py
@@ -155,31 +155,32 @@
device = "cpu"
kwargs["batch_size"] = 1
kwargs["device"] = device
-
- if kwargs.get("ncpu", 4):
- torch.set_num_threads(kwargs.get("ncpu"))
+
+ torch.set_num_threads(kwargs.get("ncpu", 4))
# build tokenizer
tokenizer = kwargs.get("tokenizer", None)
if tokenizer is not None:
tokenizer_class = tables.tokenizer_classes.get(tokenizer)
- tokenizer = tokenizer_class(**kwargs["tokenizer_conf"])
- kwargs["tokenizer"] = tokenizer
+ tokenizer_conf = kwargs.get("tokenizer_conf", {})
+ tokenizer = tokenizer_class(**tokenizer_conf)
+
kwargs["token_list"] = tokenizer.token_list if hasattr(tokenizer, "token_list") else None
kwargs["token_list"] = tokenizer.get_vocab() if hasattr(tokenizer, "get_vocab") else kwargs["token_list"]
vocab_size = len(kwargs["token_list"]) if kwargs["token_list"] is not None else -1
else:
vocab_size = -1
+ kwargs["tokenizer"] = tokenizer
+
# build frontend
frontend = kwargs.get("frontend", None)
kwargs["input_size"] = None
if frontend is not None:
frontend_class = tables.frontend_classes.get(frontend)
frontend = frontend_class(**kwargs["frontend_conf"])
- kwargs["frontend"] = frontend
kwargs["input_size"] = frontend.output_size() if hasattr(frontend, "output_size") else None
-
+ kwargs["frontend"] = frontend
# build model
model_class = tables.model_classes.get(kwargs["model"])
model = model_class(**kwargs, **kwargs.get("model_conf", {}), vocab_size=vocab_size)
@@ -469,13 +470,19 @@
# f"time_escape_all: {time_escape_total_all_samples:0.3f}")
return results_ret_list
- def export(self, input=None,
- type : str = "onnx",
- quantize: bool = False,
- fallback_num: int = 5,
- calib_num: int = 100,
- opset_version: int = 14,
- **cfg):
+ def export(self, input=None, **cfg):
+
+ """
+
+ :param input:
+ :param type:
+ :param quantize:
+ :param fallback_num:
+ :param calib_num:
+ :param opset_version:
+ :param cfg:
+ :return:
+ """
device = cfg.get("device", "cpu")
model = self.model.to(device=device)
@@ -485,7 +492,7 @@
del kwargs["model"]
model.eval()
- batch_size = 1
+ type = kwargs.get("type", "onnx")
key_list, data_list = prepare_data_iterator(input, input_len=None, data_type=kwargs.get("data_type", None), key=None)
--
Gitblit v1.9.1