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/download/download_from_hub.py | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/funasr/download/download_from_hub.py b/funasr/download/download_from_hub.py
index 075b131..df4f33d 100644
--- a/funasr/download/download_from_hub.py
+++ b/funasr/download/download_from_hub.py
@@ -56,13 +56,13 @@
config = OmegaConf.load(cfg["config"])
kwargs = OmegaConf.merge(config, cfg)
kwargs["model"] = config["model"]
- elif os.path.exists(os.path.join(model_or_path, "config.yaml")) and os.path.exists(
- os.path.join(model_or_path, "model.pt")
- ):
+ elif os.path.exists(os.path.join(model_or_path, "config.yaml")):
config = OmegaConf.load(os.path.join(model_or_path, "config.yaml"))
kwargs = OmegaConf.merge(config, kwargs)
- init_param = os.path.join(model_or_path, "model.pb")
- kwargs["init_param"] = init_param
+ init_param = os.path.join(model_or_path, "model.pt")
+ if "init_param" not in kwargs or not os.path.exists(kwargs["init_param"]):
+ kwargs["init_param"] = init_param
+ assert os.path.exists(kwargs["init_param"]), "init_param does not exist"
if os.path.exists(os.path.join(model_or_path, "tokens.txt")):
kwargs["tokenizer_conf"]["token_list"] = os.path.join(model_or_path, "tokens.txt")
if os.path.exists(os.path.join(model_or_path, "tokens.json")):
@@ -84,6 +84,14 @@
from funasr.utils.install_model_requirements import install_requirements
install_requirements(requirements)
+ if kwargs.get("trust_remote_code", False):
+ from funasr.utils.dynamic_import import import_module_from_path
+
+ model_code = kwargs.get("remote_code", "model")
+ import_module_from_path(model_code)
+
+ # from funasr.register import tables
+ # tables.print("model")
return kwargs
@@ -122,7 +130,7 @@
):
config = OmegaConf.load(os.path.join(model_or_path, "config.yaml"))
kwargs = OmegaConf.merge(config, kwargs)
- init_param = os.path.join(model_or_path, "model.pb")
+ init_param = os.path.join(model_or_path, "model.pt")
kwargs["init_param"] = init_param
if os.path.exists(os.path.join(model_or_path, "tokens.txt")):
kwargs["tokenizer_conf"]["token_list"] = os.path.join(model_or_path, "tokens.txt")
--
Gitblit v1.9.1