Mirrors/modelscope
1
0
Fork 0
mirror of https://github.com/modelscope/modelscope.git synced 2026-02-24 20:19:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix merge issue

Browse Source
This commit is contained in:
mulin.lyh
2024-05-23 20:53:51 +08:00
parent ab03664dd7
commit 90385bdaf3
2 changed files with 0 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modelscope/utils/audio/audio_utils.py
View File

@@ -333,11 +333,7 @@ def update_local_model(model_config, model_path, extra_args):
model_revision = extra_args['update_model']
if model_config.__contains__('model'):
model_name = model_config['model']
<<<<<<< HEAD
dst_dir_root = get_model_cache_root()
=======
dst_dir_root = get_model_cache_dir()
>>>>>>> 93218573 (fix #845)
if isinstance(model_path, str) and os.path.exists(
model_path) and not model_path.startswith(dst_dir_root):
try:

8
modelscope/utils/config_ds.py
View File

@@ -5,17 +5,9 @@ from pathlib import Path
# Cache location
from modelscope.hub.constants import DEFAULT_MODELSCOPE_DATA_ENDPOINT
<<<<<<< HEAD
from modelscope.utils.file_utils import get_modelscope_cache_dir
MS_CACHE_HOME = get_modelscope_cache_dir()
=======
from modelscope.utils.file_utils import get_default_modelscope_cache_dir
DEFAULT_MS_CACHE_HOME = get_default_modelscope_cache_dir()
MS_CACHE_HOME = os.path.expanduser(
os.getenv('MODELSCOPE_CACHE', DEFAULT_MS_CACHE_HOME))
>>>>>>> 93218573 (fix #845)
DEFAULT_MS_DATASETS_CACHE = os.path.join(MS_CACHE_HOME, 'hub', 'datasets')
MS_DATASETS_CACHE = Path(