xinyun/vllm
1
0
Fork 0
mirror of https://git.datalinker.icu/vllm-project/vllm.git synced 2025-12-21 02:25:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

[Bugfix] Fix processor initialization for model from modelscope instead of HF (#27461)

Browse Source 
Signed-off-by: rongfu.leng <rongfu.leng@daocloud.io>
Co-authored-by: Isotr0py <mozf@mail2.sysu.edu.cn>
This commit is contained in:
rongfu.leng 2025-10-26 15:44:31 +08:00 committed by GitHub
parent 65d2cf9511
commit 87c41c26ad
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
vllm/transformers_utils/processor.py
View File

@ -16,6 +16,7 @@ from transformers.processing_utils import ProcessorMixin
from transformers.video_processing_utils import BaseVideoProcessor from transformers.video_processing_utils import BaseVideoProcessor
from typing_extensions import TypeVar from typing_extensions import TypeVar
from vllm.transformers_utils.utils import convert_model_repo_to_path
from vllm.utils.func_utils import get_allowed_kwarg_only_overrides from vllm.utils.func_utils import get_allowed_kwarg_only_overrides
if TYPE_CHECKING: if TYPE_CHECKING:
@ -94,8 +95,8 @@ def get_processor(
"""Load a processor for the given model name via HuggingFace.""" """Load a processor for the given model name via HuggingFace."""
if revision is None: if revision is None:
revision = "main" revision = "main"
try: try:
processor_name = convert_model_repo_to_path(processor_name)
if isinstance(processor_cls, tuple) or processor_cls == ProcessorMixin: if isinstance(processor_cls, tuple) or processor_cls == ProcessorMixin:
processor = AutoProcessor.from_pretrained( processor = AutoProcessor.from_pretrained(
processor_name, processor_name,
@ -168,6 +169,7 @@ def get_feature_extractor(
"""Load an audio feature extractor for the given model name """Load an audio feature extractor for the given model name
via HuggingFace.""" via HuggingFace."""
try: try:
processor_name = convert_model_repo_to_path(processor_name)
feature_extractor = AutoFeatureExtractor.from_pretrained( feature_extractor = AutoFeatureExtractor.from_pretrained(
processor_name, processor_name,
*args, *args,
@ -217,6 +219,7 @@ def get_image_processor(
): ):
"""Load an image processor for the given model name via HuggingFace.""" """Load an image processor for the given model name via HuggingFace."""
try: try:
processor_name = convert_model_repo_to_path(processor_name)
processor = AutoImageProcessor.from_pretrained( processor = AutoImageProcessor.from_pretrained(
processor_name, processor_name,
*args, *args,
@ -268,6 +271,7 @@ def get_video_processor(
): ):
"""Load a video processor for the given model name via HuggingFace.""" """Load a video processor for the given model name via HuggingFace."""
try: try:
processor_name = convert_model_repo_to_path(processor_name)
processor_cls = processor_cls_overrides or AutoVideoProcessor processor_cls = processor_cls_overrides or AutoVideoProcessor
processor = processor_cls.from_pretrained( processor = processor_cls.from_pretrained(
processor_name, processor_name,

11
vllm/transformers_utils/utils.py
View File

@ -2,6 +2,7 @@
# SPDX-FileCopyrightText: Copyright contributors to the vLLM project # SPDX-FileCopyrightText: Copyright contributors to the vLLM project
import json import json
import os
import struct import struct
from functools import cache from functools import cache
from os import PathLike from os import PathLike
@ -109,3 +110,13 @@ def parse_safetensors_file_metadata(path: str | PathLike) -> dict[str, Any]:
length_of_metadata = struct.unpack("<Q", f.read(8))[0] length_of_metadata = struct.unpack("<Q", f.read(8))[0]
metadata = json.loads(f.read(length_of_metadata).decode("utf-8")) metadata = json.loads(f.read(length_of_metadata).decode("utf-8"))
return metadata return metadata
def convert_model_repo_to_path(model_repo: str) -> str:
"""When VLLM_USE_MODELSCOPE is True convert a model
repository string to a Path str."""
if not envs.VLLM_USE_MODELSCOPE or Path(model_repo).exists():
return model_repo
from modelscope.utils.file_utils import get_model_cache_root
return os.path.join(get_model_cache_root(), model_repo)