From f920ca62984a6b73b8d755b906c8bbda18d8e275 Mon Sep 17 00:00:00 2001
From: 游雁 <zhifu.gzf@alibaba-inc.com>
Date: 星期四, 21 十二月 2023 13:30:27 +0800
Subject: [PATCH] Merge branch 'dev_gzf_funasr2' of github.com:alibaba-damo-academy/FunASR into dev_gzf_funasr2 add
---
funasr/bin/inference.py | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/funasr/bin/inference.py b/funasr/bin/inference.py
index 09e28f3..50ea4d4 100644
--- a/funasr/bin/inference.py
+++ b/funasr/bin/inference.py
@@ -81,7 +81,7 @@
class AutoModel:
def __init__(self, **kwargs):
- registry_tables.print_register_tables()
+ registry_tables.print()
assert "model" in kwargs
if "model_conf" not in kwargs:
logging.info("download models from model hub: {}".format(kwargs.get("model_hub", "ms")))
@@ -101,6 +101,7 @@
tokenizer_class = registry_tables.tokenizer_classes.get(tokenizer.lower())
tokenizer = tokenizer_class(**kwargs["tokenizer_conf"])
kwargs["tokenizer"] = tokenizer
+ kwargs["token_list"] = tokenizer.token_list
# build frontend
frontend = kwargs.get("frontend", None)
@@ -108,14 +109,13 @@
frontend_class = registry_tables.frontend_classes.get(frontend.lower())
frontend = frontend_class(**kwargs["frontend_conf"])
kwargs["frontend"] = frontend
+ kwargs["input_size"] = frontend.output_size()
# build model
model_class = registry_tables.model_classes.get(kwargs["model"].lower())
- model = model_class(**kwargs, **kwargs["model_conf"], vocab_size=len(tokenizer.token_list))
+ model = model_class(**kwargs, **kwargs["model_conf"], vocab_size=len(tokenizer.token_list) if tokenizer is not None else -1)
model.eval()
model.to(device)
-
- kwargs["token_list"] = tokenizer.token_list
# init_param
init_param = kwargs.get("init_param", None)
--
Gitblit v1.9.1