From c3442d9566f5a2011c95b0d2998958a1b5348564 Mon Sep 17 00:00:00 2001
From: shixian.shi <shixian.shi@alibaba-inc.com>
Date: 星期五, 12 一月 2024 18:04:42 +0800
Subject: [PATCH] update device
---
funasr/download/download_from_hub.py | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/funasr/download/download_from_hub.py b/funasr/download/download_from_hub.py
index 8a4044d..946572f 100644
--- a/funasr/download/download_from_hub.py
+++ b/funasr/download/download_from_hub.py
@@ -7,17 +7,18 @@
def download_model(**kwargs):
model_hub = kwargs.get("model_hub", "ms")
if model_hub == "ms":
- kwargs = download_fr_ms(**kwargs)
+ kwargs = download_from_ms(**kwargs)
return kwargs
-def download_fr_ms(**kwargs):
+def download_from_ms(**kwargs):
model_or_path = kwargs.get("model")
if model_or_path in name_maps_ms:
model_or_path = name_maps_ms[model_or_path]
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, is_training=kwargs.get("is_training"))
+ model_or_path = get_or_download_model_dir(model_or_path, model_revision, is_training=kwargs.get("is_training"), check_latest=kwargs.get("kwargs", True))
+ kwargs["model_path"] = model_or_path
config = os.path.join(model_or_path, "config.yaml")
if os.path.exists(config) and os.path.exists(os.path.join(model_or_path, "model.pb")):
@@ -49,9 +50,10 @@
return OmegaConf.to_container(kwargs, resolve=True)
def get_or_download_model_dir(
- model,
- model_revision=None,
- is_training=False,
+ model,
+ model_revision=None,
+ is_training=False,
+ check_latest=True,
):
""" Get local model directory or download model if necessary.
@@ -67,7 +69,7 @@
key = Invoke.LOCAL_TRAINER if is_training else Invoke.PIPELINE
- if os.path.exists(model):
+ if os.path.exists(model) and check_latest:
model_cache_dir = model if os.path.isdir(
model) else os.path.dirname(model)
try:
--
Gitblit v1.9.1