reset snapshot_download to modelscope

hjh0119 · Jun 29, 2024 · da5e1df · da5e1df
1 parent 6d1cea8
commit da5e1df
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 9 deletions.
diff --git a/swift/tuners/base.py b/swift/tuners/base.py
@@ -11,13 +11,13 @@
 
 import json
 import torch
+from modelscope import snapshot_download
 from peft.utils import CONFIG_NAME
 from peft.utils.other import SAFETENSORS_WEIGHTS_NAME, WEIGHTS_NAME
 from torch import nn
 from transformers import Trainer
 
 from swift import SwiftTuners
-from swift.hub.snapshot_download import snapshot_download
 from swift.utils.constants import DEFAULT_ADAPTER, SWIFT_TYPE_KEY
 from swift.utils.logger import get_logger
 from .. import PeftConfig, PeftModel, get_peft_model

diff --git a/swift/tuners/peft.py b/swift/tuners/peft.py
@@ -9,6 +9,7 @@
 import peft
 import torch
 import torch.nn
+from modelscope import snapshot_download
 from peft import (AdaLoraConfig, BOFTConfig, IA3Config, LoftQConfig, LoHaConfig, LoKrConfig, LoraModel, OFTConfig,
                   PeftConfig, PeftModel, PeftModelForCausalLM, PeftModelForSeq2SeqLM,
                   PeftModelForSequenceClassification, PeftModelForTokenClassification, PrefixTuningConfig,
@@ -19,7 +20,6 @@
 from transformers import Trainer
 
 from swift import get_logger
-from swift.hub.snapshot_download import snapshot_download
 
 logger = get_logger()
 dispatchers = []

diff --git a/swift/tuners/utils.py b/swift/tuners/utils.py
@@ -13,12 +13,12 @@
 import json
 import numpy as np
 import torch
+from modelscope import snapshot_download
 from packaging import version
 from peft.utils import CONFIG_NAME
 from peft.utils import ModulesToSaveWrapper as _ModulesToSaveWrapper
 from peft.utils import _get_submodules
 
-from swift.hub.snapshot_download import snapshot_download
 from swift.hub.utils.utils import get_cache_dir
 from swift.tuners.module_mapping import ModelKeys
 from swift.utils.constants import BIN_EXTENSIONS

diff --git a/swift/ui/llm_eval/llm_eval.py b/swift/ui/llm_eval/llm_eval.py
@@ -10,8 +10,8 @@
 import json
 import torch
 from gradio import Accordion, Tab
+from modelscope import snapshot_download
 
-from swift import snapshot_download
 from swift.llm import EvalArguments
 from swift.ui.base import BaseUI
 from swift.ui.llm_eval.eval import Eval

diff --git a/swift/ui/llm_export/llm_export.py b/swift/ui/llm_export/llm_export.py
@@ -10,8 +10,8 @@
 import json
 import torch
 from gradio import Accordion, Tab
+from modelscope import snapshot_download
 
-from swift import snapshot_download
 from swift.llm import ExportArguments
 from swift.ui.base import BaseUI
 from swift.ui.llm_export.export import Export

diff --git a/swift/ui/llm_infer/llm_infer.py b/swift/ui/llm_infer/llm_infer.py
@@ -11,9 +11,8 @@
 import json
 import torch
 from gradio import Accordion, Tab
-from modelscope import GenerationConfig
+from modelscope import GenerationConfig, snapshot_download
 
-from swift import snapshot_download
 from swift.llm import (DeployArguments, InferArguments, XRequestConfig, inference_client, inference_stream,
                        limit_history_length, prepare_model_template)
 from swift.ui.base import BaseUI

diff --git a/tests/tuners/test_scetuning.py b/tests/tuners/test_scetuning.py
@@ -5,8 +5,9 @@
 import unittest
 
 import torch
+from modelscope import snapshot_download
 
-from swift import SCETuningConfig, Swift, snapshot_download
+from swift import SCETuningConfig, Swift
 
 
 class TestSCETuning(unittest.TestCase):

diff --git a/tests/tuners/test_swift_restuning.py b/tests/tuners/test_swift_restuning.py
@@ -5,8 +5,9 @@
 import unittest
 
 import torch
+from modelscope import snapshot_download
 
-from swift import ResTuningConfig, Swift, SwiftModel, snapshot_download
+from swift import ResTuningConfig, Swift, SwiftModel
 
 
 class TestSwiftResTuning(unittest.TestCase):