From 30d8995cd9a567040dfc48e59e2697c25f523669 Mon Sep 17 00:00:00 2001 From: suluyan Date: Mon, 10 Mar 2025 15:56:52 +0800 Subject: [PATCH 1/2] rm import --- modelscope/utils/hf_util/pipeline_builder.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/modelscope/utils/hf_util/pipeline_builder.py b/modelscope/utils/hf_util/pipeline_builder.py index 5386bead..4a37cd04 100644 --- a/modelscope/utils/hf_util/pipeline_builder.py +++ b/modelscope/utils/hf_util/pipeline_builder.py @@ -1,13 +1,12 @@ import os from typing import Optional, Union -import torch from transformers import Pipeline as PipelineHF from transformers import PreTrainedModel, TFPreTrainedModel, pipeline from transformers.pipelines import check_task, get_task from modelscope.hub import snapshot_download -from modelscope.utils.hf_util.patcher import _patch_pretrained_class, patch_hub +from modelscope.utils.hf_util.patcher import _patch_pretrained_class def _get_hf_device(device): From c45bc6d19f9ea988b482005ec7156b850665fa9b Mon Sep 17 00:00:00 2001 From: suluyan Date: Mon, 10 Mar 2025 16:29:02 +0800 Subject: [PATCH 2/2] rm import --- modelscope/utils/hf_util/pipeline_builder.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/modelscope/utils/hf_util/pipeline_builder.py b/modelscope/utils/hf_util/pipeline_builder.py index 4a37cd04..20ae0535 100644 --- a/modelscope/utils/hf_util/pipeline_builder.py +++ b/modelscope/utils/hf_util/pipeline_builder.py @@ -1,10 +1,6 @@ import os from typing import Optional, Union -from transformers import Pipeline as PipelineHF -from transformers import PreTrainedModel, TFPreTrainedModel, pipeline -from transformers.pipelines import check_task, get_task - from modelscope.hub import snapshot_download from modelscope.utils.hf_util.patcher import _patch_pretrained_class @@ -20,6 +16,7 @@ def _get_hf_device(device): def _get_hf_pipeline_class(task, model): + from transformers.pipelines import check_task, get_task if not task: task = get_task(model) normalized_task, targeted_task, task_options = check_task(task) @@ -34,7 +31,9 @@ def hf_pipeline( framework: Optional[str] = None, device: Optional[Union[int, str, 'torch.device']] = None, **kwargs, -) -> PipelineHF: +) -> 'transformers.Pipeline': + from transformers import pipeline + if isinstance(model, str): if not os.path.exists(model): model = snapshot_download(model)