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 | 71 ++++++++++++++++++++++++-----------
1 files changed, 48 insertions(+), 23 deletions(-)
diff --git a/funasr/download/download_from_hub.py b/funasr/download/download_from_hub.py
index 24ab797..946572f 100644
--- a/funasr/download/download_from_hub.py
+++ b/funasr/download/download_from_hub.py
@@ -1,3 +1,4 @@
+import json
import os
from omegaconf import OmegaConf
import torch
@@ -6,32 +7,53 @@
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")
- assert os.path.exists(config), "{} is not exist!".format(config)
- cfg = OmegaConf.load(config)
- kwargs = OmegaConf.merge(cfg, kwargs)
- 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
+ if os.path.exists(config) and os.path.exists(os.path.join(model_or_path, "model.pb")):
+ cfg = OmegaConf.load(config)
+ kwargs = OmegaConf.merge(cfg, kwargs)
+ init_param = os.path.join(model_or_path, "model.pb")
+ 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")
+ if os.path.exists(os.path.join(model_or_path, "tokens.json")):
+ kwargs["tokenizer_conf"]["token_list"] = os.path.join(model_or_path, "tokens.json")
+ if os.path.exists(os.path.join(model_or_path, "seg_dict")):
+ kwargs["tokenizer_conf"]["seg_dict"] = os.path.join(model_or_path, "seg_dict")
+ if os.path.exists(os.path.join(model_or_path, "bpe.model")):
+ kwargs["tokenizer_conf"]["bpemodel"] = os.path.join(model_or_path, "bpe.model")
+ kwargs["model"] = cfg["model"]
+ if os.path.exists(os.path.join(model_or_path, "am.mvn")):
+ kwargs["frontend_conf"]["cmvn_file"] = os.path.join(model_or_path, "am.mvn")
+ else:# configuration.json
+ assert os.path.exists(os.path.join(model_or_path, "configuration.json"))
+ with open(os.path.join(model_or_path, "configuration.json"), 'r', encoding='utf-8') as f:
+ conf_json = json.load(f)
+ config = os.path.join(model_or_path, conf_json["model_config"])
+ cfg = OmegaConf.load(config)
+ kwargs = OmegaConf.merge(cfg, kwargs)
+ init_param = os.path.join(model_or_path, conf_json["model_file"])
+ kwargs["init_param"] = init_param
+ kwargs["model"] = cfg["model"]
+ 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.
@@ -47,15 +69,18 @@
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)
- check_local_model_is_latest(
- model_cache_dir,
- user_agent={
- Invoke.KEY: key,
- ThirdParty.KEY: "funasr"
- })
+ try:
+ check_local_model_is_latest(
+ model_cache_dir,
+ user_agent={
+ Invoke.KEY: key,
+ ThirdParty.KEY: "funasr"
+ })
+ except:
+ print("could not check the latest version")
else:
model_cache_dir = snapshot_download(
model,
--
Gitblit v1.9.1