From 810046e3df4910c8f5c1a90e4b53aca45b3397e8 Mon Sep 17 00:00:00 2001
From: wuhongsheng <664116298@qq.com>
Date: 星期一, 01 七月 2024 10:42:58 +0800
Subject: [PATCH] 优化merge segments 参数，解决新闻联播男女主持人“晚上好”合并一个speakid问题 (#1861)
---
funasr/auto/auto_model.py | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/funasr/auto/auto_model.py b/funasr/auto/auto_model.py
index 01e6aaf..1b39e3f 100644
--- a/funasr/auto/auto_model.py
+++ b/funasr/auto/auto_model.py
@@ -121,9 +121,6 @@
log_level = getattr(logging, kwargs.get("log_level", "INFO").upper())
logging.basicConfig(level=log_level)
- if not kwargs.get("disable_log", True):
- tables.print()
-
model, kwargs = self.build_model(**kwargs)
# if vad_model is not None, build vad model else None
@@ -171,7 +168,8 @@
self.spk_kwargs = spk_kwargs
self.model_path = kwargs.get("model_path")
- def build_model(self, **kwargs):
+ @staticmethod
+ def build_model(**kwargs):
assert "model" in kwargs
if "model_conf" not in kwargs:
logging.info("download models from model hub: {}".format(kwargs.get("hub", "ms")))
@@ -217,6 +215,7 @@
kwargs["frontend"] = frontend
# build model
model_class = tables.model_classes.get(kwargs["model"])
+ assert model_class is not None, f'{kwargs["model"]} is not registered'
model_conf = {}
deep_update(model_conf, kwargs.get("model_conf", {}))
deep_update(model_conf, kwargs)
@@ -244,6 +243,10 @@
elif kwargs.get("bf16", False):
model.to(torch.bfloat16)
model.to(device)
+
+ if not kwargs.get("disable_log", True):
+ tables.print()
+
return model, kwargs
def __call__(self, *args, **cfg):
--
Gitblit v1.9.1