From 806a03609df033d61f824f1ab8527eb88fe837ad Mon Sep 17 00:00:00 2001
From: 游雁 <zhifu.gzf@alibaba-inc.com>
Date: 星期三, 13 十二月 2023 19:43:13 +0800
Subject: [PATCH] funasr2 paraformer biciparaformer contextuaparaformer
---
funasr/utils/download_from_hub.py | 24 ++++++++++++++----------
1 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/funasr/utils/download_from_hub.py b/funasr/utils/download_from_hub.py
index d6e4ab4..d6b79d3 100644
--- a/funasr/utils/download_from_hub.py
+++ b/funasr/utils/download_from_hub.py
@@ -11,10 +11,10 @@
return kwargs
def download_fr_ms(**kwargs):
- model_or_path = kwargs.get("model_pretrain")
- model_revision = kwargs.get("model_pretrain_revision")
+ model_or_path = kwargs.get("model")
+ model_revision = kwargs.get("model_revision")
if not os.path.exists(model_or_path):
- model_or_path = get_or_download_model_dir(model_or_path, model_revision, third_party="funasr")
+ model_or_path = get_or_download_model_dir(model_or_path, model_revision, is_training=kwargs.get("is_training"))
config = os.path.join(model_or_path, "config.yaml")
assert os.path.exists(config), "{} is not exist!".format(config)
@@ -23,25 +23,29 @@
init_param = os.path.join(model_or_path, "model.pb")
kwargs["init_param"] = init_param
kwargs["token_list"] = os.path.join(model_or_path, "tokens.txt")
+ kwargs["model"] = cfg["model"]
+ kwargs["frontend_conf"]["cmvn_file"] = os.path.join(model_or_path, "am.mvn")
return kwargs
def get_or_download_model_dir(
model,
model_revision=None,
- third_party=None):
+ is_training=False,
+ ):
""" Get local model directory or download model if necessary.
Args:
model (str): model id or path to local model directory.
model_revision (str, optional): model version number.
- third_party (str, optional): in which third party library
- this function is called.
+ :param is_training:
"""
from modelscope.hub.check_model import check_local_model_is_latest
from modelscope.hub.snapshot_download import snapshot_download
from modelscope.utils.constant import Invoke, ThirdParty
+
+ key = Invoke.LOCAL_TRAINER if is_training else Invoke.PIPELINE
if os.path.exists(model):
model_cache_dir = model if os.path.isdir(
@@ -49,15 +53,15 @@
check_local_model_is_latest(
model_cache_dir,
user_agent={
- Invoke.KEY: Invoke.LOCAL_TRAINER,
- ThirdParty.KEY: third_party
+ Invoke.KEY: key,
+ ThirdParty.KEY: "funasr"
})
else:
model_cache_dir = snapshot_download(
model,
revision=model_revision,
user_agent={
- Invoke.KEY: Invoke.TRAINER,
- ThirdParty.KEY: third_party
+ Invoke.KEY: key,
+ ThirdParty.KEY: "funasr"
})
return model_cache_dir
\ No newline at end of file
--
Gitblit v1.9.1