Make bare hugging_face imports forbidden (#49726)
Signed-off-by: Harry Mellor <19981378+hmellor@users.noreply.github.com> Co-authored-by: Andreas Karatzas <akaratza@amd.com>
This commit is contained in:
co-authored by
Andreas Karatzas
parent
0b1a8bb1f6
commit
ca0defa343
+4
-4
@@ -31,7 +31,7 @@ import pytest
|
|||||||
import torch
|
import torch
|
||||||
import torch.nn as nn
|
import torch.nn as nn
|
||||||
import torch.nn.functional as F
|
import torch.nn.functional as F
|
||||||
from huggingface_hub import snapshot_download
|
from vllm.transformers_utils.repo_utils import hf_api
|
||||||
from PIL import Image
|
from PIL import Image
|
||||||
from transformers import (
|
from transformers import (
|
||||||
AutoConfig,
|
AutoConfig,
|
||||||
@@ -1496,7 +1496,7 @@ _dummy_gemma2_embedding_path = os.path.join(temp_dir, "dummy_gemma2_embedding")
|
|||||||
def dummy_opt_path():
|
def dummy_opt_path():
|
||||||
json_path = os.path.join(_dummy_opt_path, "config.json")
|
json_path = os.path.join(_dummy_opt_path, "config.json")
|
||||||
if not os.path.exists(_dummy_opt_path):
|
if not os.path.exists(_dummy_opt_path):
|
||||||
snapshot_download(
|
hf_api().snapshot_download(
|
||||||
repo_id="facebook/opt-125m",
|
repo_id="facebook/opt-125m",
|
||||||
local_dir=_dummy_opt_path,
|
local_dir=_dummy_opt_path,
|
||||||
ignore_patterns=["*.bin", "*.bin.index.json", "*.pt", "*.h5", "*.msgpack"],
|
ignore_patterns=["*.bin", "*.bin.index.json", "*.pt", "*.h5", "*.msgpack"],
|
||||||
@@ -1514,7 +1514,7 @@ def dummy_opt_path():
|
|||||||
def dummy_llava_path():
|
def dummy_llava_path():
|
||||||
json_path = os.path.join(_dummy_llava_path, "config.json")
|
json_path = os.path.join(_dummy_llava_path, "config.json")
|
||||||
if not os.path.exists(_dummy_llava_path):
|
if not os.path.exists(_dummy_llava_path):
|
||||||
snapshot_download(
|
hf_api().snapshot_download(
|
||||||
repo_id="llava-hf/llava-1.5-7b-hf",
|
repo_id="llava-hf/llava-1.5-7b-hf",
|
||||||
local_dir=_dummy_llava_path,
|
local_dir=_dummy_llava_path,
|
||||||
ignore_patterns=[
|
ignore_patterns=[
|
||||||
@@ -1539,7 +1539,7 @@ def dummy_llava_path():
|
|||||||
def dummy_gemma2_embedding_path():
|
def dummy_gemma2_embedding_path():
|
||||||
json_path = os.path.join(_dummy_gemma2_embedding_path, "config.json")
|
json_path = os.path.join(_dummy_gemma2_embedding_path, "config.json")
|
||||||
if not os.path.exists(_dummy_gemma2_embedding_path):
|
if not os.path.exists(_dummy_gemma2_embedding_path):
|
||||||
snapshot_download(
|
hf_api().snapshot_download(
|
||||||
repo_id="BAAI/bge-multilingual-gemma2",
|
repo_id="BAAI/bge-multilingual-gemma2",
|
||||||
local_dir=_dummy_gemma2_embedding_path,
|
local_dir=_dummy_gemma2_embedding_path,
|
||||||
ignore_patterns=[
|
ignore_patterns=[
|
||||||
|
|||||||
@@ -15,12 +15,12 @@ from unittest.mock import patch
|
|||||||
import pytest
|
import pytest
|
||||||
import torch
|
import torch
|
||||||
import torch.distributed as dist
|
import torch.distributed as dist
|
||||||
from huggingface_hub import snapshot_download
|
|
||||||
|
|
||||||
import vllm.envs as envs
|
import vllm.envs as envs
|
||||||
from vllm import LLM, SamplingParams
|
from vllm import LLM, SamplingParams
|
||||||
from vllm.distributed import cleanup_dist_env_and_memory
|
from vllm.distributed import cleanup_dist_env_and_memory
|
||||||
from vllm.platforms import current_platform
|
from vllm.platforms import current_platform
|
||||||
|
from vllm.transformers_utils.repo_utils import hf_api
|
||||||
from vllm.utils.network_utils import get_open_port
|
from vllm.utils.network_utils import get_open_port
|
||||||
|
|
||||||
pytestmark = pytest.mark.skipif(
|
pytestmark = pytest.mark.skipif(
|
||||||
@@ -210,11 +210,11 @@ def _log_prompt_summaries() -> None:
|
|||||||
@lru_cache(maxsize=1)
|
@lru_cache(maxsize=1)
|
||||||
def _get_model_path() -> str:
|
def _get_model_path() -> str:
|
||||||
try:
|
try:
|
||||||
path = snapshot_download(repo_id=MODEL_NAME, local_files_only=True)
|
path = hf_api().snapshot_download(repo_id=MODEL_NAME, local_files_only=True)
|
||||||
_log(f"using cached model snapshot: {path}")
|
_log(f"using cached model snapshot: {path}")
|
||||||
return path
|
return path
|
||||||
except Exception:
|
except Exception:
|
||||||
path = snapshot_download(repo_id=MODEL_NAME)
|
path = hf_api().snapshot_download(repo_id=MODEL_NAME)
|
||||||
_log(f"downloaded model snapshot: {path}")
|
_log(f"downloaded model snapshot: {path}")
|
||||||
return path
|
return path
|
||||||
|
|
||||||
|
|||||||
@@ -190,30 +190,32 @@ number: "1" | "2"
|
|||||||
@pytest.fixture(scope="session")
|
@pytest.fixture(scope="session")
|
||||||
def qwen3_lora_files():
|
def qwen3_lora_files():
|
||||||
"""Download Qwen3 LoRA files once per test session."""
|
"""Download Qwen3 LoRA files once per test session."""
|
||||||
from huggingface_hub import snapshot_download
|
from vllm.transformers_utils.repo_utils import hf_api
|
||||||
|
|
||||||
return snapshot_download(repo_id="charent/self_cognition_Alice")
|
return hf_api().snapshot_download(repo_id="charent/self_cognition_Alice")
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture(scope="session")
|
@pytest.fixture(scope="session")
|
||||||
def qwen3_meowing_lora_files():
|
def qwen3_meowing_lora_files():
|
||||||
"""Download Qwen3 LoRA files once per test session."""
|
"""Download Qwen3 LoRA files once per test session."""
|
||||||
from huggingface_hub import snapshot_download
|
from vllm.transformers_utils.repo_utils import hf_api
|
||||||
|
|
||||||
return snapshot_download(repo_id="Jackmin108/Qwen3-0.6B-Meow-LoRA")
|
return hf_api().snapshot_download(repo_id="Jackmin108/Qwen3-0.6B-Meow-LoRA")
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture(scope="session")
|
@pytest.fixture(scope="session")
|
||||||
def qwen3_woofing_lora_files():
|
def qwen3_woofing_lora_files():
|
||||||
"""Download Qwen3 LoRA files once per test session."""
|
"""Download Qwen3 LoRA files once per test session."""
|
||||||
from huggingface_hub import snapshot_download
|
from vllm.transformers_utils.repo_utils import hf_api
|
||||||
|
|
||||||
return snapshot_download(repo_id="Jackmin108/Qwen3-0.6B-Woof-LoRA")
|
return hf_api().snapshot_download(repo_id="Jackmin108/Qwen3-0.6B-Woof-LoRA")
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture(scope="session")
|
@pytest.fixture(scope="session")
|
||||||
def opt125_lora_files() -> str:
|
def opt125_lora_files() -> str:
|
||||||
"""Download opt-125m LoRA files once per test session."""
|
"""Download opt-125m LoRA files once per test session."""
|
||||||
from huggingface_hub import snapshot_download
|
from vllm.transformers_utils.repo_utils import hf_api
|
||||||
|
|
||||||
return snapshot_download(repo_id="peft-internal-testing/opt-125m-dummy-lora")
|
return hf_api().snapshot_download(
|
||||||
|
repo_id="peft-internal-testing/opt-125m-dummy-lora"
|
||||||
|
)
|
||||||
|
|||||||
+5
-3
@@ -12,10 +12,10 @@ import pytest_asyncio
|
|||||||
import safetensors
|
import safetensors
|
||||||
import torch
|
import torch
|
||||||
import torch.nn as nn
|
import torch.nn as nn
|
||||||
from huggingface_hub import hf_hub_download
|
|
||||||
from transformers import AutoConfig, AutoTokenizer
|
from transformers import AutoConfig, AutoTokenizer
|
||||||
|
|
||||||
from tests.utils import RemoteOpenAIServer
|
from tests.utils import RemoteOpenAIServer
|
||||||
|
from vllm.transformers_utils.repo_utils import hf_api
|
||||||
from vllm.utils.serial_utils import tensor2base64
|
from vllm.utils.serial_utils import tensor2base64
|
||||||
from vllm.utils.torch_utils import is_torch_equal_or_newer
|
from vllm.utils.torch_utils import is_torch_equal_or_newer
|
||||||
|
|
||||||
@@ -126,11 +126,13 @@ def qwen2audio_aligned_content_and_embeds_b64() -> tuple[str, str]:
|
|||||||
content = "Describe this audio."
|
content = "Describe this audio."
|
||||||
tokenizer = AutoTokenizer.from_pretrained(QWEN2AUDIO_MODEL, trust_remote_code=True)
|
tokenizer = AutoTokenizer.from_pretrained(QWEN2AUDIO_MODEL, trust_remote_code=True)
|
||||||
|
|
||||||
index_path = hf_hub_download(QWEN2AUDIO_MODEL, "model.safetensors.index.json")
|
index_path = hf_api().hf_hub_download(
|
||||||
|
QWEN2AUDIO_MODEL, "model.safetensors.index.json"
|
||||||
|
)
|
||||||
with open(index_path) as f:
|
with open(index_path) as f:
|
||||||
weight_map = json.load(f)["weight_map"]
|
weight_map = json.load(f)["weight_map"]
|
||||||
embed_key = next(k for k in weight_map if k.endswith("embed_tokens.weight"))
|
embed_key = next(k for k in weight_map if k.endswith("embed_tokens.weight"))
|
||||||
shard_path = hf_hub_download(QWEN2AUDIO_MODEL, weight_map[embed_key])
|
shard_path = hf_api().hf_hub_download(QWEN2AUDIO_MODEL, weight_map[embed_key])
|
||||||
with safetensors.safe_open(shard_path, framework="pt", device="cpu") as f:
|
with safetensors.safe_open(shard_path, framework="pt", device="cpu") as f:
|
||||||
embed_weight = f.get_tensor(embed_key)
|
embed_weight = f.get_tensor(embed_key)
|
||||||
embed_layer = nn.Embedding.from_pretrained(embed_weight.to(QWEN2AUDIO_DTYPE))
|
embed_layer = nn.Embedding.from_pretrained(embed_weight.to(QWEN2AUDIO_DTYPE))
|
||||||
|
|||||||
+3
-3
@@ -13,12 +13,12 @@ import pytest_asyncio
|
|||||||
import safetensors
|
import safetensors
|
||||||
import torch
|
import torch
|
||||||
import torch.nn as nn
|
import torch.nn as nn
|
||||||
from huggingface_hub import hf_hub_download
|
|
||||||
from transformers import AutoTokenizer
|
from transformers import AutoTokenizer
|
||||||
|
|
||||||
from tests.utils import RemoteOpenAIServer
|
from tests.utils import RemoteOpenAIServer
|
||||||
from vllm.assets.image import ImageAsset
|
from vllm.assets.image import ImageAsset
|
||||||
from vllm.multimodal.utils import encode_image_url
|
from vllm.multimodal.utils import encode_image_url
|
||||||
|
from vllm.transformers_utils.repo_utils import hf_api
|
||||||
from vllm.utils.serial_utils import tensor2base64
|
from vllm.utils.serial_utils import tensor2base64
|
||||||
|
|
||||||
MODEL_NAME = "Qwen/Qwen2-VL-2B-Instruct"
|
MODEL_NAME = "Qwen/Qwen2-VL-2B-Instruct"
|
||||||
@@ -84,11 +84,11 @@ def aligned_content_and_embeds_b64() -> tuple[str, str]:
|
|||||||
content = "Describe this image."
|
content = "Describe this image."
|
||||||
tokenizer = AutoTokenizer.from_pretrained(MODEL_NAME, trust_remote_code=True)
|
tokenizer = AutoTokenizer.from_pretrained(MODEL_NAME, trust_remote_code=True)
|
||||||
|
|
||||||
index_path = hf_hub_download(MODEL_NAME, "model.safetensors.index.json")
|
index_path = hf_api().hf_hub_download(MODEL_NAME, "model.safetensors.index.json")
|
||||||
with open(index_path) as f:
|
with open(index_path) as f:
|
||||||
weight_map = json.load(f)["weight_map"]
|
weight_map = json.load(f)["weight_map"]
|
||||||
embed_key = next(k for k in weight_map if k.endswith("embed_tokens.weight"))
|
embed_key = next(k for k in weight_map if k.endswith("embed_tokens.weight"))
|
||||||
shard_path = hf_hub_download(MODEL_NAME, weight_map[embed_key])
|
shard_path = hf_api().hf_hub_download(MODEL_NAME, weight_map[embed_key])
|
||||||
with safetensors.safe_open(shard_path, framework="pt", device="cpu") as f:
|
with safetensors.safe_open(shard_path, framework="pt", device="cpu") as f:
|
||||||
embed_weight = f.get_tensor(embed_key)
|
embed_weight = f.get_tensor(embed_key)
|
||||||
embed_layer = nn.Embedding.from_pretrained(embed_weight.to(MODEL_DTYPE))
|
embed_layer = nn.Embedding.from_pretrained(embed_weight.to(MODEL_DTYPE))
|
||||||
|
|||||||
@@ -6,17 +6,19 @@ import os
|
|||||||
import openai # use the official client for correctness check
|
import openai # use the official client for correctness check
|
||||||
import pytest
|
import pytest
|
||||||
import pytest_asyncio
|
import pytest_asyncio
|
||||||
from huggingface_hub import snapshot_download
|
|
||||||
|
|
||||||
from tests.conftest import AudioTestAssets
|
from tests.conftest import AudioTestAssets
|
||||||
from tests.utils import RemoteOpenAIServer
|
from tests.utils import RemoteOpenAIServer
|
||||||
|
from vllm.transformers_utils.repo_utils import hf_api
|
||||||
|
|
||||||
# NOTE - the tests in this module are currently analogous to test_chat, but are
|
# NOTE - the tests in this module are currently analogous to test_chat, but are
|
||||||
# separated to avoid OOM killing due to module-scoped servers, since we
|
# separated to avoid OOM killing due to module-scoped servers, since we
|
||||||
# need a multimodal model for these tests.
|
# need a multimodal model for these tests.
|
||||||
|
|
||||||
# Contains a modality specific lora alongside the base model
|
# Contains a modality specific lora alongside the base model
|
||||||
MULTIMODAL_MODEL_NAME = snapshot_download("microsoft/Phi-4-multimodal-instruct")
|
MULTIMODAL_MODEL_NAME = hf_api().snapshot_download(
|
||||||
|
"microsoft/Phi-4-multimodal-instruct"
|
||||||
|
)
|
||||||
AUDIO_LORA_PATH = os.path.join(MULTIMODAL_MODEL_NAME, "speech-lora")
|
AUDIO_LORA_PATH = os.path.join(MULTIMODAL_MODEL_NAME, "speech-lora")
|
||||||
|
|
||||||
ACTIVE_MM_LORA_RESPONSE = "Spoken text: The first words I spoke in the original chronograph, a little piece of practical poetry. Mary had a little lamb, it slept with quite a snow, and everywhere that Mary went, the lamb was sure to go." # noqa: E501
|
ACTIVE_MM_LORA_RESPONSE = "Spoken text: The first words I spoke in the original chronograph, a little piece of practical poetry. Mary had a little lamb, it slept with quite a snow, and everywhere that Mary went, the lamb was sure to go." # noqa: E501
|
||||||
|
|||||||
@@ -27,9 +27,9 @@ MODEL_NAME = "HuggingFaceH4/zephyr-7b-beta"
|
|||||||
@pytest.fixture(scope="module")
|
@pytest.fixture(scope="module")
|
||||||
def zephyr_lora_files():
|
def zephyr_lora_files():
|
||||||
"""Download zephyr LoRA files once per test session."""
|
"""Download zephyr LoRA files once per test session."""
|
||||||
from huggingface_hub import snapshot_download
|
from vllm.transformers_utils.repo_utils import hf_api
|
||||||
|
|
||||||
return snapshot_download(repo_id="typeof/zephyr-7b-beta-lora")
|
return hf_api().snapshot_download(repo_id="typeof/zephyr-7b-beta-lora")
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture(scope="module")
|
@pytest.fixture(scope="module")
|
||||||
|
|||||||
@@ -6,7 +6,6 @@ from io import BytesIO
|
|||||||
import pybase64 as base64
|
import pybase64 as base64
|
||||||
import torch
|
import torch
|
||||||
import torch.nn.functional as F
|
import torch.nn.functional as F
|
||||||
from huggingface_hub import hf_hub_download
|
|
||||||
from PIL import Image
|
from PIL import Image
|
||||||
from safetensors.torch import load_file
|
from safetensors.torch import load_file
|
||||||
from transformers import AutoModel, AutoTokenizer
|
from transformers import AutoModel, AutoTokenizer
|
||||||
@@ -18,6 +17,7 @@ from vllm.entrypoints.chat_utils import (
|
|||||||
)
|
)
|
||||||
from vllm.entrypoints.pooling.scoring.typing import ScoreMultiModalParam
|
from vllm.entrypoints.pooling.scoring.typing import ScoreMultiModalParam
|
||||||
from vllm.entrypoints.pooling.scoring.utils import compute_maxsim_score
|
from vllm.entrypoints.pooling.scoring.utils import compute_maxsim_score
|
||||||
|
from vllm.transformers_utils.repo_utils import hf_api
|
||||||
|
|
||||||
|
|
||||||
class ColBERTScoringHfRunner(torch.nn.Module):
|
class ColBERTScoringHfRunner(torch.nn.Module):
|
||||||
@@ -38,7 +38,7 @@ class ColBERTScoringHfRunner(torch.nn.Module):
|
|||||||
).to(self.device)
|
).to(self.device)
|
||||||
self.model.eval()
|
self.model.eval()
|
||||||
|
|
||||||
path = hf_hub_download(model_name, filename="model.safetensors")
|
path = hf_api().hf_hub_download(model_name, filename="model.safetensors")
|
||||||
weights = load_file(path)
|
weights = load_file(path)
|
||||||
|
|
||||||
self.linear_weight = weights[linear_weights_key].to(self.device).float()
|
self.linear_weight = weights[linear_weights_key].to(self.device).float()
|
||||||
|
|||||||
@@ -21,9 +21,9 @@ HEADER_SAGEMAKER_NEW_SESSION_ID = "X-Amzn-SageMaker-New-Session-Id"
|
|||||||
@pytest.fixture(scope="session")
|
@pytest.fixture(scope="session")
|
||||||
def smollm2_lora_files():
|
def smollm2_lora_files():
|
||||||
"""Download LoRA files once per test session."""
|
"""Download LoRA files once per test session."""
|
||||||
from huggingface_hub import snapshot_download
|
from vllm.transformers_utils.repo_utils import hf_api
|
||||||
|
|
||||||
return snapshot_download(repo_id=LORA_ADAPTER_NAME_SMOLLM)
|
return hf_api().snapshot_download(repo_id=LORA_ADAPTER_NAME_SMOLLM)
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture(scope="module")
|
@pytest.fixture(scope="module")
|
||||||
|
|||||||
@@ -6,13 +6,13 @@ import json
|
|||||||
import openai
|
import openai
|
||||||
import pytest
|
import pytest
|
||||||
import pytest_asyncio
|
import pytest_asyncio
|
||||||
from huggingface_hub import snapshot_download
|
|
||||||
from typing_extensions import TypedDict
|
from typing_extensions import TypedDict
|
||||||
|
|
||||||
from tests.utils import RemoteOpenAIServer
|
from tests.utils import RemoteOpenAIServer
|
||||||
from vllm.tool_parsers.abstract_tool_parser import ToolParser
|
from vllm.tool_parsers.abstract_tool_parser import ToolParser
|
||||||
from vllm.tool_parsers.granite4_tool_parser import Granite4ToolParser
|
from vllm.tool_parsers.granite4_tool_parser import Granite4ToolParser
|
||||||
from vllm.tool_parsers.hermes_tool_parser import Hermes2ProToolParser
|
from vllm.tool_parsers.hermes_tool_parser import Hermes2ProToolParser
|
||||||
|
from vllm.transformers_utils.repo_utils import hf_api
|
||||||
|
|
||||||
LORA_MODEL = "minpeter/LoRA-Llama-3.2-1B-tool-vllm-ci"
|
LORA_MODEL = "minpeter/LoRA-Llama-3.2-1B-tool-vllm-ci"
|
||||||
|
|
||||||
@@ -91,7 +91,7 @@ def server_config(request):
|
|||||||
config = CONFIGS[request.param]
|
config = CONFIGS[request.param]
|
||||||
|
|
||||||
# download model and tokenizer using transformers
|
# download model and tokenizer using transformers
|
||||||
snapshot_download(config["model"])
|
hf_api().snapshot_download(config["model"])
|
||||||
yield CONFIGS[request.param]
|
yield CONFIGS[request.param]
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -2,7 +2,6 @@
|
|||||||
# SPDX-FileCopyrightText: Copyright contributors to the vLLM project
|
# SPDX-FileCopyrightText: Copyright contributors to the vLLM project
|
||||||
from typing import cast
|
from typing import cast
|
||||||
|
|
||||||
import huggingface_hub
|
|
||||||
import pytest
|
import pytest
|
||||||
import torch
|
import torch
|
||||||
from safetensors import safe_open
|
from safetensors import safe_open
|
||||||
@@ -33,6 +32,7 @@ from vllm.model_executor.layers.quantization.utils.quant_utils import (
|
|||||||
kNvfp4Static,
|
kNvfp4Static,
|
||||||
)
|
)
|
||||||
from vllm.platforms import current_platform
|
from vllm.platforms import current_platform
|
||||||
|
from vllm.transformers_utils.repo_utils import hf_api
|
||||||
from vllm.triton_utils import triton
|
from vllm.triton_utils import triton
|
||||||
|
|
||||||
if current_platform.is_rocm():
|
if current_platform.is_rocm():
|
||||||
@@ -56,7 +56,7 @@ MOE_MODEL_CONFIGS = {
|
|||||||
@pytest.fixture(scope="module")
|
@pytest.fixture(scope="module")
|
||||||
def loaded_model_files():
|
def loaded_model_files():
|
||||||
return {
|
return {
|
||||||
model_id: huggingface_hub.snapshot_download(
|
model_id: hf_api().snapshot_download(
|
||||||
repo_id=model_id, allow_patterns=config["shards"]
|
repo_id=model_id, allow_patterns=config["shards"]
|
||||||
)
|
)
|
||||||
for model_id, config in MOE_MODEL_CONFIGS.items()
|
for model_id, config in MOE_MODEL_CONFIGS.items()
|
||||||
|
|||||||
+47
-29
@@ -9,7 +9,6 @@ from unittest.mock import MagicMock
|
|||||||
import pytest
|
import pytest
|
||||||
import torch
|
import torch
|
||||||
import torch.nn as nn
|
import torch.nn as nn
|
||||||
from huggingface_hub import snapshot_download
|
|
||||||
|
|
||||||
from vllm.distributed import (
|
from vllm.distributed import (
|
||||||
cleanup_dist_env_and_memory,
|
cleanup_dist_env_and_memory,
|
||||||
@@ -25,6 +24,7 @@ from vllm.model_executor.layers.logits_processor import LogitsProcessor
|
|||||||
from vllm.model_executor.layers.vocab_parallel_embedding import ParallelLMHead
|
from vllm.model_executor.layers.vocab_parallel_embedding import ParallelLMHead
|
||||||
from vllm.model_executor.models.interfaces import SupportsLoRA
|
from vllm.model_executor.models.interfaces import SupportsLoRA
|
||||||
from vllm.platforms import current_platform
|
from vllm.platforms import current_platform
|
||||||
|
from vllm.transformers_utils.repo_utils import hf_api
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture()
|
@pytest.fixture()
|
||||||
@@ -170,43 +170,43 @@ def dummy_model_gate_up(default_vllm_config) -> nn.Module:
|
|||||||
def mixtral_lora_files():
|
def mixtral_lora_files():
|
||||||
# Note: this module has incorrect adapter_config.json to test
|
# Note: this module has incorrect adapter_config.json to test
|
||||||
# https://github.com/vllm-project/vllm/pull/5909/files.
|
# https://github.com/vllm-project/vllm/pull/5909/files.
|
||||||
return snapshot_download(repo_id="SangBinCho/mixtral-lora")
|
return hf_api().snapshot_download(repo_id="SangBinCho/mixtral-lora")
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture(scope="session")
|
@pytest.fixture(scope="session")
|
||||||
def chatglm3_lora_files():
|
def chatglm3_lora_files():
|
||||||
return snapshot_download(repo_id="jeeejeee/chatglm3-text2sql-spider")
|
return hf_api().snapshot_download(repo_id="jeeejeee/chatglm3-text2sql-spider")
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture(scope="session")
|
@pytest.fixture(scope="session")
|
||||||
def baichuan_lora_files():
|
def baichuan_lora_files():
|
||||||
return snapshot_download(repo_id="jeeejeee/baichuan7b-text2sql-spider")
|
return hf_api().snapshot_download(repo_id="jeeejeee/baichuan7b-text2sql-spider")
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture(scope="session")
|
@pytest.fixture(scope="session")
|
||||||
def baichuan_zero_lora_files():
|
def baichuan_zero_lora_files():
|
||||||
# all the lora_B weights are initialized to zero.
|
# all the lora_B weights are initialized to zero.
|
||||||
return snapshot_download(repo_id="jeeejeee/baichuan7b-zero-init")
|
return hf_api().snapshot_download(repo_id="jeeejeee/baichuan7b-zero-init")
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture(scope="session")
|
@pytest.fixture(scope="session")
|
||||||
def baichuan_regex_lora_files():
|
def baichuan_regex_lora_files():
|
||||||
return snapshot_download(repo_id="jeeejeee/baichuan-7b-lora-zero-regex")
|
return hf_api().snapshot_download(repo_id="jeeejeee/baichuan-7b-lora-zero-regex")
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture(scope="session")
|
@pytest.fixture(scope="session")
|
||||||
def ilama_lora_files():
|
def ilama_lora_files():
|
||||||
return snapshot_download(repo_id="jeeejeee/ilama-text2sql-spider")
|
return hf_api().snapshot_download(repo_id="jeeejeee/ilama-text2sql-spider")
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture(scope="session")
|
@pytest.fixture(scope="session")
|
||||||
def minicpmv_lora_files():
|
def minicpmv_lora_files():
|
||||||
return snapshot_download(repo_id="jeeejeee/minicpmv25-lora-pokemon")
|
return hf_api().snapshot_download(repo_id="jeeejeee/minicpmv25-lora-pokemon")
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture(scope="session")
|
@pytest.fixture(scope="session")
|
||||||
def qwen2vl_lora_files():
|
def qwen2vl_lora_files():
|
||||||
return snapshot_download(repo_id="jeeejeee/qwen2-vl-lora-pokemon")
|
return hf_api().snapshot_download(repo_id="jeeejeee/qwen2-vl-lora-pokemon")
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture(scope="session")
|
@pytest.fixture(scope="session")
|
||||||
@@ -217,74 +217,84 @@ def qwen25vl_base_huggingface_id():
|
|||||||
|
|
||||||
@pytest.fixture(scope="session")
|
@pytest.fixture(scope="session")
|
||||||
def qwen25vl_lora_files():
|
def qwen25vl_lora_files():
|
||||||
return snapshot_download(repo_id="jeeejeee/qwen25-vl-lora-pokemon")
|
return hf_api().snapshot_download(repo_id="jeeejeee/qwen25-vl-lora-pokemon")
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture(scope="session")
|
@pytest.fixture(scope="session")
|
||||||
def qwen2vl_language_lora_files():
|
def qwen2vl_language_lora_files():
|
||||||
return snapshot_download(repo_id="prashanth058/qwen2vl-flickr-lora-language")
|
return hf_api().snapshot_download(
|
||||||
|
repo_id="prashanth058/qwen2vl-flickr-lora-language"
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture(scope="session")
|
@pytest.fixture(scope="session")
|
||||||
def qwen2vl_vision_tower_connector_lora_files():
|
def qwen2vl_vision_tower_connector_lora_files():
|
||||||
return snapshot_download(repo_id="prashanth058/qwen2vl-flickr-lora-tower-connector")
|
return hf_api().snapshot_download(
|
||||||
|
repo_id="prashanth058/qwen2vl-flickr-lora-tower-connector"
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture(scope="session")
|
@pytest.fixture(scope="session")
|
||||||
def qwen2vl_vision_tower_lora_files():
|
def qwen2vl_vision_tower_lora_files():
|
||||||
return snapshot_download(repo_id="prashanth058/qwen2vl-flickr-lora-tower")
|
return hf_api().snapshot_download(repo_id="prashanth058/qwen2vl-flickr-lora-tower")
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture(scope="session")
|
@pytest.fixture(scope="session")
|
||||||
def qwen25vl_vision_lora_files():
|
def qwen25vl_vision_lora_files():
|
||||||
return snapshot_download(repo_id="EpochEcho/qwen2.5-3b-vl-lora-vision-connector")
|
return hf_api().snapshot_download(
|
||||||
|
repo_id="EpochEcho/qwen2.5-3b-vl-lora-vision-connector"
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture(scope="session")
|
@pytest.fixture(scope="session")
|
||||||
def qwen3vl_vision_lora_files():
|
def qwen3vl_vision_lora_files():
|
||||||
return snapshot_download(repo_id="EpochEcho/qwen3-4b-vl-lora-vision-connector")
|
return hf_api().snapshot_download(
|
||||||
|
repo_id="EpochEcho/qwen3-4b-vl-lora-vision-connector"
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture(scope="session")
|
@pytest.fixture(scope="session")
|
||||||
def qwen3_meowing_lora_files():
|
def qwen3_meowing_lora_files():
|
||||||
"""Download Qwen3 Meow LoRA files once per test session."""
|
"""Download Qwen3 Meow LoRA files once per test session."""
|
||||||
return snapshot_download(repo_id="Jackmin108/Qwen3-0.6B-Meow-LoRA")
|
return hf_api().snapshot_download(repo_id="Jackmin108/Qwen3-0.6B-Meow-LoRA")
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture(scope="session")
|
@pytest.fixture(scope="session")
|
||||||
def qwen3_woofing_lora_files():
|
def qwen3_woofing_lora_files():
|
||||||
"""Download Qwen3 Woof LoRA files once per test session."""
|
"""Download Qwen3 Woof LoRA files once per test session."""
|
||||||
return snapshot_download(repo_id="Jackmin108/Qwen3-0.6B-Woof-LoRA")
|
return hf_api().snapshot_download(repo_id="Jackmin108/Qwen3-0.6B-Woof-LoRA")
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture(scope="session")
|
@pytest.fixture(scope="session")
|
||||||
def tinyllama_lora_files():
|
def tinyllama_lora_files():
|
||||||
return snapshot_download(repo_id="jashing/tinyllama-colorist-lora")
|
return hf_api().snapshot_download(repo_id="jashing/tinyllama-colorist-lora")
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture(scope="session")
|
@pytest.fixture(scope="session")
|
||||||
def deepseekv2_lora_files():
|
def deepseekv2_lora_files():
|
||||||
return snapshot_download(repo_id="wuchen01/DeepSeek-V2-Lite-Chat-All-LoRA")
|
return hf_api().snapshot_download(repo_id="wuchen01/DeepSeek-V2-Lite-Chat-All-LoRA")
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture(scope="session")
|
@pytest.fixture(scope="session")
|
||||||
def gptoss20b_lora_files():
|
def gptoss20b_lora_files():
|
||||||
return snapshot_download(repo_id="jeeejeee/gpt-oss-20b-lora-adapter-text2sql")
|
return hf_api().snapshot_download(
|
||||||
|
repo_id="jeeejeee/gpt-oss-20b-lora-adapter-text2sql"
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture(scope="session")
|
@pytest.fixture(scope="session")
|
||||||
def qwen3moe_lora_files():
|
def qwen3moe_lora_files():
|
||||||
return snapshot_download(repo_id="jeeejeee/qwen3-moe-text2sql-spider")
|
return hf_api().snapshot_download(repo_id="jeeejeee/qwen3-moe-text2sql-spider")
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture(scope="session")
|
@pytest.fixture(scope="session")
|
||||||
def olmoe_lora_files():
|
def olmoe_lora_files():
|
||||||
return snapshot_download(repo_id="jeeejeee/olmoe-instruct-text2sql-spider")
|
return hf_api().snapshot_download(repo_id="jeeejeee/olmoe-instruct-text2sql-spider")
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture(scope="session")
|
@pytest.fixture(scope="session")
|
||||||
def qwen3_lora_files():
|
def qwen3_lora_files():
|
||||||
return snapshot_download(repo_id="charent/self_cognition_Alice")
|
return hf_api().snapshot_download(repo_id="charent/self_cognition_Alice")
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture(scope="session")
|
@pytest.fixture(scope="session")
|
||||||
@@ -295,32 +305,40 @@ def llama32_lora_huggingface_id():
|
|||||||
|
|
||||||
@pytest.fixture(scope="session")
|
@pytest.fixture(scope="session")
|
||||||
def llama32_lora_files(llama32_lora_huggingface_id):
|
def llama32_lora_files(llama32_lora_huggingface_id):
|
||||||
return snapshot_download(repo_id=llama32_lora_huggingface_id)
|
return hf_api().snapshot_download(repo_id=llama32_lora_huggingface_id)
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture(scope="session")
|
@pytest.fixture(scope="session")
|
||||||
def whisper_lora_files():
|
def whisper_lora_files():
|
||||||
return snapshot_download(repo_id="chengyili2005/whisper-small-mandarin-lora")
|
return hf_api().snapshot_download(
|
||||||
|
repo_id="chengyili2005/whisper-small-mandarin-lora"
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture(scope="session")
|
@pytest.fixture(scope="session")
|
||||||
def qwen35_text_lora_files():
|
def qwen35_text_lora_files():
|
||||||
return snapshot_download(repo_id="jeeejeee/qwen35-4b-text-only-sql-lora")
|
return hf_api().snapshot_download(repo_id="jeeejeee/qwen35-4b-text-only-sql-lora")
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture(scope="session")
|
@pytest.fixture(scope="session")
|
||||||
def qwen35_vl_lora_files():
|
def qwen35_vl_lora_files():
|
||||||
return snapshot_download(repo_id="jeeejeee/qwen35-4b-all-linear-pokemon-lora")
|
return hf_api().snapshot_download(
|
||||||
|
repo_id="jeeejeee/qwen35-4b-all-linear-pokemon-lora"
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture(scope="session")
|
@pytest.fixture(scope="session")
|
||||||
def qwen36_moe_2d_lora_files():
|
def qwen36_moe_2d_lora_files():
|
||||||
return snapshot_download(repo_id="jeeejeee/qwen36-35ba3b-2d-weights-poken-lora")
|
return hf_api().snapshot_download(
|
||||||
|
repo_id="jeeejeee/qwen36-35ba3b-2d-weights-poken-lora"
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture(scope="session")
|
@pytest.fixture(scope="session")
|
||||||
def qwen36_moe_3d_lora_files():
|
def qwen36_moe_3d_lora_files():
|
||||||
return snapshot_download(repo_id="jeeejeee/qwen36-35ba3b-moe-all-linear-poken-lora")
|
return hf_api().snapshot_download(
|
||||||
|
repo_id="jeeejeee/qwen36-35ba3b-moe-all-linear-poken-lora"
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture
|
@pytest.fixture
|
||||||
|
|||||||
@@ -8,15 +8,15 @@ import os
|
|||||||
import unittest.mock as mock
|
import unittest.mock as mock
|
||||||
|
|
||||||
import pytest
|
import pytest
|
||||||
from huggingface_hub import snapshot_download
|
|
||||||
|
|
||||||
from vllm.lora.request import LoRARequest
|
from vllm.lora.request import LoRARequest
|
||||||
from vllm.platforms import current_platform
|
from vllm.platforms import current_platform
|
||||||
|
from vllm.transformers_utils.repo_utils import hf_api
|
||||||
|
|
||||||
from ..conftest import AudioTestAssets, VllmRunner
|
from ..conftest import AudioTestAssets, VllmRunner
|
||||||
from ..utils import create_new_process_for_each_test
|
from ..utils import create_new_process_for_each_test
|
||||||
|
|
||||||
MODEL_PATH = snapshot_download("microsoft/Phi-4-multimodal-instruct")
|
MODEL_PATH = hf_api().snapshot_download("microsoft/Phi-4-multimodal-instruct")
|
||||||
AUDIO_LORA_PATH = os.path.join(MODEL_PATH, "speech-lora")
|
AUDIO_LORA_PATH = os.path.join(MODEL_PATH, "speech-lora")
|
||||||
IMAGE_LORA_PATH = os.path.join(MODEL_PATH, "vision-lora")
|
IMAGE_LORA_PATH = os.path.join(MODEL_PATH, "vision-lora")
|
||||||
|
|
||||||
|
|||||||
+2
-2
@@ -3,10 +3,10 @@
|
|||||||
|
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
|
|
||||||
from huggingface_hub import snapshot_download
|
|
||||||
from runai_model_streamer.safetensors_streamer.streamer_mock import StreamerPatcher
|
from runai_model_streamer.safetensors_streamer.streamer_mock import StreamerPatcher
|
||||||
|
|
||||||
from vllm.engine.arg_utils import EngineArgs
|
from vllm.engine.arg_utils import EngineArgs
|
||||||
|
from vllm.transformers_utils.repo_utils import hf_api
|
||||||
|
|
||||||
from .conftest import RunaiDummyExecutor
|
from .conftest import RunaiDummyExecutor
|
||||||
|
|
||||||
@@ -25,7 +25,7 @@ def test_runai_model_loader_download_files_s3_mocked_with_patch(
|
|||||||
|
|
||||||
# Download model from HF
|
# Download model from HF
|
||||||
mock_model_dir = f"{tmp_path}/gpt2"
|
mock_model_dir = f"{tmp_path}/gpt2"
|
||||||
snapshot_download(repo_id=test_model, local_dir=mock_model_dir)
|
hf_api().snapshot_download(repo_id=test_model, local_dir=mock_model_dir)
|
||||||
|
|
||||||
monkeypatch.setattr(
|
monkeypatch.setattr(
|
||||||
"vllm.transformers_utils.runai_utils.runai_list_safetensors",
|
"vllm.transformers_utils.runai_utils.runai_list_safetensors",
|
||||||
|
|||||||
@@ -9,11 +9,11 @@ from tempfile import TemporaryDirectory
|
|||||||
|
|
||||||
import pytest
|
import pytest
|
||||||
import torch
|
import torch
|
||||||
from huggingface_hub import snapshot_download
|
|
||||||
|
|
||||||
from vllm import LLM, SamplingParams
|
from vllm import LLM, SamplingParams
|
||||||
from vllm.model_executor.model_loader import ShardedStateLoader
|
from vllm.model_executor.model_loader import ShardedStateLoader
|
||||||
from vllm.platforms import current_platform
|
from vllm.platforms import current_platform
|
||||||
|
from vllm.transformers_utils.repo_utils import hf_api
|
||||||
|
|
||||||
prompts = [
|
prompts = [
|
||||||
"Hello, my name is",
|
"Hello, my name is",
|
||||||
@@ -52,7 +52,7 @@ def test_filter_subtensors():
|
|||||||
|
|
||||||
@pytest.fixture(scope="module")
|
@pytest.fixture(scope="module")
|
||||||
def llama_3p2_1b_files():
|
def llama_3p2_1b_files():
|
||||||
input_dir = snapshot_download(
|
input_dir = hf_api().snapshot_download(
|
||||||
"meta-llama/Llama-3.2-1B-Instruct", ignore_patterns=["*.bin*", "original/*"]
|
"meta-llama/Llama-3.2-1B-Instruct", ignore_patterns=["*.bin*", "original/*"]
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@@ -126,10 +126,11 @@ def _load_hf_model(model_name: str, hf_spec: dict, device: torch.device):
|
|||||||
|
|
||||||
def _load_projection_weight(model_name: str, hf_spec: dict, device: torch.device):
|
def _load_projection_weight(model_name: str, hf_spec: dict, device: torch.device):
|
||||||
"""Download and return the ColBERT linear projection weight."""
|
"""Download and return the ColBERT linear projection weight."""
|
||||||
from huggingface_hub import hf_hub_download
|
|
||||||
from safetensors.torch import load_file
|
from safetensors.torch import load_file
|
||||||
|
|
||||||
path = hf_hub_download(model_name, filename=hf_spec["weights_file"])
|
from vllm.transformers_utils.repo_utils import hf_api
|
||||||
|
|
||||||
|
path = hf_api().hf_hub_download(model_name, filename=hf_spec["weights_file"])
|
||||||
weights = load_file(path)
|
weights = load_file(path)
|
||||||
return weights[hf_spec["weights_key"]].to(device)
|
return weights[hf_spec["weights_key"]].to(device)
|
||||||
|
|
||||||
|
|||||||
@@ -6,7 +6,6 @@ from collections.abc import Sequence
|
|||||||
|
|
||||||
import pytest
|
import pytest
|
||||||
import regex as re
|
import regex as re
|
||||||
from huggingface_hub import snapshot_download
|
|
||||||
from transformers import AutoTokenizer
|
from transformers import AutoTokenizer
|
||||||
|
|
||||||
from vllm.assets.image import ImageAsset
|
from vllm.assets.image import ImageAsset
|
||||||
@@ -14,6 +13,7 @@ from vllm.logprobs import SampleLogprobs
|
|||||||
from vllm.lora.request import LoRARequest
|
from vllm.lora.request import LoRARequest
|
||||||
from vllm.multimodal.image import convert_image_mode, rescale_image_size
|
from vllm.multimodal.image import convert_image_mode, rescale_image_size
|
||||||
from vllm.multimodal.media.audio import load_audio
|
from vllm.multimodal.media.audio import load_audio
|
||||||
|
from vllm.transformers_utils.repo_utils import hf_api
|
||||||
|
|
||||||
from ....conftest import (
|
from ....conftest import (
|
||||||
IMAGE_ASSETS,
|
IMAGE_ASSETS,
|
||||||
@@ -35,7 +35,7 @@ HF_MULTIIMAGE_IMAGE_PROMPT = (
|
|||||||
"<|user|>\n<|image_1|>\n<|image_2|>\nDescribe these images.<|end|>\n<|assistant|>\n" # noqa: E501
|
"<|user|>\n<|image_1|>\n<|image_2|>\nDescribe these images.<|end|>\n<|assistant|>\n" # noqa: E501
|
||||||
)
|
)
|
||||||
|
|
||||||
model_path = snapshot_download("microsoft/Phi-4-multimodal-instruct")
|
model_path = hf_api().snapshot_download("microsoft/Phi-4-multimodal-instruct")
|
||||||
# Since the vision-lora and speech-lora co-exist with the base model,
|
# Since the vision-lora and speech-lora co-exist with the base model,
|
||||||
# we have to manually specify the path of the lora weights.
|
# we have to manually specify the path of the lora weights.
|
||||||
vision_lora_path = os.path.join(model_path, "vision-lora")
|
vision_lora_path = os.path.join(model_path, "vision-lora")
|
||||||
|
|||||||
@@ -3,11 +3,11 @@
|
|||||||
import pytest
|
import pytest
|
||||||
import torch
|
import torch
|
||||||
import torch.nn as nn
|
import torch.nn as nn
|
||||||
from huggingface_hub import snapshot_download
|
|
||||||
from transformers import AutoConfig, AutoModel, CLIPImageProcessor
|
from transformers import AutoConfig, AutoModel, CLIPImageProcessor
|
||||||
|
|
||||||
from vllm.distributed import cleanup_dist_env_and_memory
|
from vllm.distributed import cleanup_dist_env_and_memory
|
||||||
from vllm.platforms import current_platform
|
from vllm.platforms import current_platform
|
||||||
|
from vllm.transformers_utils.repo_utils import hf_api
|
||||||
from vllm.utils.torch_utils import STR_DTYPE_TO_TORCH_DTYPE
|
from vllm.utils.torch_utils import STR_DTYPE_TO_TORCH_DTYPE
|
||||||
|
|
||||||
from ....conftest import ImageTestAssets
|
from ....conftest import ImageTestAssets
|
||||||
@@ -31,7 +31,7 @@ def run_intern_vit_test(
|
|||||||
*,
|
*,
|
||||||
dtype: str,
|
dtype: str,
|
||||||
):
|
):
|
||||||
model = snapshot_download(model_id, allow_patterns=DOWNLOAD_PATTERN)
|
model = hf_api().snapshot_download(model_id, allow_patterns=DOWNLOAD_PATTERN)
|
||||||
torch_dtype = STR_DTYPE_TO_TORCH_DTYPE[dtype]
|
torch_dtype = STR_DTYPE_TO_TORCH_DTYPE[dtype]
|
||||||
|
|
||||||
img_processor = CLIPImageProcessor.from_pretrained(model)
|
img_processor = CLIPImageProcessor.from_pretrained(model)
|
||||||
|
|||||||
@@ -3,13 +3,13 @@
|
|||||||
import pytest
|
import pytest
|
||||||
import torch
|
import torch
|
||||||
import torch.nn as nn
|
import torch.nn as nn
|
||||||
from huggingface_hub import snapshot_download
|
|
||||||
from transformers import AutoConfig, AutoModel, CLIPImageProcessor
|
from transformers import AutoConfig, AutoModel, CLIPImageProcessor
|
||||||
|
|
||||||
from vllm.distributed import cleanup_dist_env_and_memory
|
from vllm.distributed import cleanup_dist_env_and_memory
|
||||||
from vllm.model_executor.models.radio import RadioModel
|
from vllm.model_executor.models.radio import RadioModel
|
||||||
from vllm.platforms import current_platform
|
from vllm.platforms import current_platform
|
||||||
from vllm.transformers_utils.configs.radio import RadioConfig
|
from vllm.transformers_utils.configs.radio import RadioConfig
|
||||||
|
from vllm.transformers_utils.repo_utils import hf_api
|
||||||
from vllm.utils.torch_utils import STR_DTYPE_TO_TORCH_DTYPE
|
from vllm.utils.torch_utils import STR_DTYPE_TO_TORCH_DTYPE
|
||||||
|
|
||||||
from ....conftest import ImageTestAssets
|
from ....conftest import ImageTestAssets
|
||||||
@@ -28,7 +28,7 @@ def run_radio_test(
|
|||||||
*,
|
*,
|
||||||
dtype: str,
|
dtype: str,
|
||||||
):
|
):
|
||||||
model = snapshot_download(model_id, allow_patterns=DOWNLOAD_PATTERN)
|
model = hf_api().snapshot_download(model_id, allow_patterns=DOWNLOAD_PATTERN)
|
||||||
torch_dtype = STR_DTYPE_TO_TORCH_DTYPE[dtype]
|
torch_dtype = STR_DTYPE_TO_TORCH_DTYPE[dtype]
|
||||||
|
|
||||||
img_processor = CLIPImageProcessor.from_pretrained(model)
|
img_processor = CLIPImageProcessor.from_pretrained(model)
|
||||||
|
|||||||
@@ -22,6 +22,7 @@ import pytest
|
|||||||
from packaging import version
|
from packaging import version
|
||||||
|
|
||||||
from vllm.platforms import current_platform
|
from vllm.platforms import current_platform
|
||||||
|
from vllm.transformers_utils.repo_utils import hf_api
|
||||||
|
|
||||||
if current_platform.is_rocm():
|
if current_platform.is_rocm():
|
||||||
from vllm.platforms.rocm import on_gfx950
|
from vllm.platforms.rocm import on_gfx950
|
||||||
@@ -47,7 +48,7 @@ QUARK_MXFP4_AVAILABLE = importlib.util.find_spec("quark") is not None and versio
|
|||||||
|
|
||||||
def has_huggingface_access(repo):
|
def has_huggingface_access(repo):
|
||||||
try:
|
try:
|
||||||
huggingface_hub.list_repo_refs(repo)
|
hf_api().list_repo_refs(repo)
|
||||||
return True
|
return True
|
||||||
except huggingface_hub.errors.RepositoryNotFoundError:
|
except huggingface_hub.errors.RepositoryNotFoundError:
|
||||||
return False
|
return False
|
||||||
|
|||||||
@@ -8,12 +8,12 @@ os.environ["TOKENIZERS_PARALLELISM"] = "true"
|
|||||||
from typing import Any, NamedTuple
|
from typing import Any, NamedTuple
|
||||||
|
|
||||||
import pytest
|
import pytest
|
||||||
from huggingface_hub import hf_hub_download
|
|
||||||
from pytest import MarkDecorator
|
from pytest import MarkDecorator
|
||||||
from transformers import AutoModelForImageTextToText
|
from transformers import AutoModelForImageTextToText
|
||||||
|
|
||||||
from vllm.assets.image import ImageAsset
|
from vllm.assets.image import ImageAsset
|
||||||
from vllm.multimodal.image import rescale_image_size
|
from vllm.multimodal.image import rescale_image_size
|
||||||
|
from vllm.transformers_utils.repo_utils import hf_api
|
||||||
from vllm.utils.torch_utils import set_default_torch_num_threads
|
from vllm.utils.torch_utils import set_default_torch_num_threads
|
||||||
|
|
||||||
from ...conftest import IMAGE_ASSETS, HfRunner, VllmRunner
|
from ...conftest import IMAGE_ASSETS, HfRunner, VllmRunner
|
||||||
@@ -33,8 +33,8 @@ class GGUFMMTestConfig(NamedTuple):
|
|||||||
|
|
||||||
@property
|
@property
|
||||||
def gguf_model(self):
|
def gguf_model(self):
|
||||||
hf_hub_download(self.gguf_repo, filename=self.gguf_mmproj)
|
hf_api().hf_hub_download(self.gguf_repo, filename=self.gguf_mmproj)
|
||||||
return hf_hub_download(self.gguf_repo, filename=self.gguf_backbone)
|
return hf_api().hf_hub_download(self.gguf_repo, filename=self.gguf_backbone)
|
||||||
|
|
||||||
|
|
||||||
# Common prompts aligned with test_common.py "gemma3" entry format
|
# Common prompts aligned with test_common.py "gemma3" entry format
|
||||||
|
|||||||
@@ -4,9 +4,9 @@ import os
|
|||||||
import shutil
|
import shutil
|
||||||
|
|
||||||
import pytest
|
import pytest
|
||||||
from huggingface_hub import snapshot_download
|
|
||||||
|
|
||||||
from vllm.plugins.lora_resolvers.filesystem_resolver import FilesystemResolver
|
from vllm.plugins.lora_resolvers.filesystem_resolver import FilesystemResolver
|
||||||
|
from vllm.transformers_utils.repo_utils import hf_api
|
||||||
|
|
||||||
MODEL_NAME = "Qwen/Qwen3-0.6B"
|
MODEL_NAME = "Qwen/Qwen3-0.6B"
|
||||||
LORA_NAME = "charent/self_cognition_Alice"
|
LORA_NAME = "charent/self_cognition_Alice"
|
||||||
@@ -22,12 +22,12 @@ def adapter_cache(request, tmpdir_factory):
|
|||||||
|
|
||||||
@pytest.fixture(scope="module")
|
@pytest.fixture(scope="module")
|
||||||
def qwen3_lora_files():
|
def qwen3_lora_files():
|
||||||
return snapshot_download(repo_id=LORA_NAME)
|
return hf_api().snapshot_download(repo_id=LORA_NAME)
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture(scope="module")
|
@pytest.fixture(scope="module")
|
||||||
def pa_files():
|
def pa_files():
|
||||||
return snapshot_download(repo_id=PA_NAME)
|
return hf_api().snapshot_download(repo_id=PA_NAME)
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.asyncio
|
@pytest.mark.asyncio
|
||||||
|
|||||||
@@ -42,12 +42,12 @@ def _skip(msg: str) -> NoReturn:
|
|||||||
|
|
||||||
def _snapshot_download_or_skip(model_id: str) -> str:
|
def _snapshot_download_or_skip(model_id: str) -> str:
|
||||||
try:
|
try:
|
||||||
from huggingface_hub import snapshot_download
|
from vllm.transformers_utils.repo_utils import hf_api
|
||||||
except Exception as e: # pragma: no cover
|
except Exception as e: # pragma: no cover
|
||||||
_skip(f"huggingface_hub is required to download {model_id}: {e}")
|
_skip(f"huggingface_hub is required to download {model_id}: {e}")
|
||||||
|
|
||||||
try:
|
try:
|
||||||
return snapshot_download(
|
return hf_api().snapshot_download(
|
||||||
repo_id=model_id,
|
repo_id=model_id,
|
||||||
repo_type="model",
|
repo_type="model",
|
||||||
# These checkpoints are already small; download full repo for simplicity.
|
# These checkpoints are already small; download full repo for simplicity.
|
||||||
|
|||||||
@@ -30,6 +30,7 @@ from vllm.model_executor.layers.quantization.utils.quant_utils import (
|
|||||||
is_layer_skipped,
|
is_layer_skipped,
|
||||||
)
|
)
|
||||||
from vllm.platforms import current_platform
|
from vllm.platforms import current_platform
|
||||||
|
from vllm.transformers_utils.repo_utils import hf_api
|
||||||
|
|
||||||
if current_platform.is_rocm():
|
if current_platform.is_rocm():
|
||||||
from vllm.platforms.rocm import on_gfx942, on_gfx950
|
from vllm.platforms.rocm import on_gfx942, on_gfx950
|
||||||
@@ -59,7 +60,7 @@ if QUARK_MXFP4_AVAILABLE:
|
|||||||
from quark.torch.quantization.config.config import FP4PerGroupSpec
|
from quark.torch.quantization.config.config import FP4PerGroupSpec
|
||||||
|
|
||||||
try:
|
try:
|
||||||
huggingface_hub.list_repo_refs(
|
hf_api().list_repo_refs(
|
||||||
"amd/Llama-3.3-70B-Instruct-WMXFP4-AMXFP4-KVFP8-Scale-UINT8-SQ"
|
"amd/Llama-3.3-70B-Instruct-WMXFP4-AMXFP4-KVFP8-Scale-UINT8-SQ"
|
||||||
)
|
)
|
||||||
HF_HUB_AMD_ORG_ACCESS = True
|
HF_HUB_AMD_ORG_ACCESS = True
|
||||||
|
|||||||
@@ -3,10 +3,10 @@
|
|||||||
|
|
||||||
import pytest
|
import pytest
|
||||||
import pytest_asyncio
|
import pytest_asyncio
|
||||||
from huggingface_hub import snapshot_download
|
|
||||||
|
|
||||||
from tests.utils import RemoteOpenAIServer
|
from tests.utils import RemoteOpenAIServer
|
||||||
from vllm.platforms import current_platform
|
from vllm.platforms import current_platform
|
||||||
|
from vllm.transformers_utils.repo_utils import hf_api
|
||||||
|
|
||||||
from .utils import ARGS, CONFIGS, ServerConfig
|
from .utils import ARGS, CONFIGS, ServerConfig
|
||||||
|
|
||||||
@@ -47,7 +47,7 @@ def server_config(request):
|
|||||||
)
|
)
|
||||||
|
|
||||||
# download model and tokenizer using transformers
|
# download model and tokenizer using transformers
|
||||||
snapshot_download(config["model"])
|
hf_api().snapshot_download(config["model"])
|
||||||
yield CONFIGS[request.param]
|
yield CONFIGS[request.param]
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -3,10 +3,10 @@
|
|||||||
|
|
||||||
import pytest
|
import pytest
|
||||||
import pytest_asyncio
|
import pytest_asyncio
|
||||||
from huggingface_hub import snapshot_download
|
|
||||||
|
|
||||||
from tests.utils import RemoteOpenAIServer
|
from tests.utils import RemoteOpenAIServer
|
||||||
from vllm.platforms import current_platform
|
from vllm.platforms import current_platform
|
||||||
|
from vllm.transformers_utils.repo_utils import hf_api
|
||||||
|
|
||||||
from .utils import ARGS, CONFIGS, ServerConfig
|
from .utils import ARGS, CONFIGS, ServerConfig
|
||||||
|
|
||||||
@@ -22,7 +22,7 @@ def server_config(request):
|
|||||||
)
|
)
|
||||||
|
|
||||||
# download model and tokenizer using transformers
|
# download model and tokenizer using transformers
|
||||||
snapshot_download(config["model"])
|
hf_api().snapshot_download(config["model"])
|
||||||
yield CONFIGS[request.param]
|
yield CONFIGS[request.param]
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
+2
-2
@@ -33,7 +33,6 @@ import pytest
|
|||||||
import requests
|
import requests
|
||||||
import torch
|
import torch
|
||||||
import torch.nn.functional as F
|
import torch.nn.functional as F
|
||||||
from huggingface_hub import hf_hub_download
|
|
||||||
from huggingface_hub.constants import HF_HUB_OFFLINE
|
from huggingface_hub.constants import HF_HUB_OFFLINE
|
||||||
from openai.types.completion import Completion
|
from openai.types.completion import Completion
|
||||||
from typing_extensions import ParamSpec
|
from typing_extensions import ParamSpec
|
||||||
@@ -57,6 +56,7 @@ from vllm.model_executor.layers.quantization.utils.quant_utils import (
|
|||||||
from vllm.model_executor.model_loader import get_model_loader
|
from vllm.model_executor.model_loader import get_model_loader
|
||||||
from vllm.platforms import current_platform
|
from vllm.platforms import current_platform
|
||||||
from vllm.tokenizers import get_tokenizer
|
from vllm.tokenizers import get_tokenizer
|
||||||
|
from vllm.transformers_utils.repo_utils import hf_api
|
||||||
from vllm.utils.argparse_utils import FlexibleArgumentParser
|
from vllm.utils.argparse_utils import FlexibleArgumentParser
|
||||||
from vllm.utils.mem_constants import GB_bytes
|
from vllm.utils.mem_constants import GB_bytes
|
||||||
from vllm.utils.network_utils import get_open_port
|
from vllm.utils.network_utils import get_open_port
|
||||||
@@ -77,7 +77,7 @@ def prewarm_hf_cache(assets: list[tuple[str, str]]) -> None:
|
|||||||
return
|
return
|
||||||
for repo_id, filename in assets:
|
for repo_id, filename in assets:
|
||||||
try:
|
try:
|
||||||
hf_hub_download(repo_id=repo_id, filename=filename)
|
hf_api().hf_hub_download(repo_id=repo_id, filename=filename)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
logger.warning(
|
logger.warning(
|
||||||
"Failed to prefetch %s/%s: %r. Tests depending on this asset may fail.",
|
"Failed to prefetch %s/%s: %r. Tests depending on this asset may fail.",
|
||||||
|
|||||||
@@ -6,6 +6,13 @@ from dataclasses import dataclass, field
|
|||||||
|
|
||||||
import regex as re
|
import regex as re
|
||||||
|
|
||||||
|
# Hub entry points that must go through the vLLM-tagged repo_utils helpers.
|
||||||
|
_HF_NAMES = (
|
||||||
|
r"HfApi|HfFileSystem|hf_hub_download|snapshot_download"
|
||||||
|
r"|list_repo_files|file_exists|try_to_load_from_cache"
|
||||||
|
r"|list_repo_refs|repo_exists"
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
@dataclass
|
@dataclass
|
||||||
class ForbiddenImport:
|
class ForbiddenImport:
|
||||||
@@ -13,6 +20,7 @@ class ForbiddenImport:
|
|||||||
tip: str
|
tip: str
|
||||||
allowed_pattern: re.Pattern = re.compile(r"^$") # matches nothing by default
|
allowed_pattern: re.Pattern = re.compile(r"^$") # matches nothing by default
|
||||||
allowed_files: set[str] = field(default_factory=set)
|
allowed_files: set[str] = field(default_factory=set)
|
||||||
|
allowed_dirs: set[str] = field(default_factory=set)
|
||||||
|
|
||||||
|
|
||||||
CHECK_IMPORTS = {
|
CHECK_IMPORTS = {
|
||||||
@@ -83,6 +91,23 @@ CHECK_IMPORTS = {
|
|||||||
),
|
),
|
||||||
allowed_files={"vllm/triton_utils/importing.py"},
|
allowed_files={"vllm/triton_utils/importing.py"},
|
||||||
),
|
),
|
||||||
|
"huggingface_hub repo API": ForbiddenImport(
|
||||||
|
# Catch `from huggingface_hub import <fn>`, including parenthesized,
|
||||||
|
# multi-line imports.
|
||||||
|
pattern=(
|
||||||
|
r"^\s*from\s+huggingface_hub\s+import\s*\([^)]*\b(?:" + _HF_NAMES + r")\b"
|
||||||
|
r"|"
|
||||||
|
r"^\s*from\s+huggingface_hub\s+import\b[^\n]*\b(?:" + _HF_NAMES + r")\b"
|
||||||
|
),
|
||||||
|
tip=(
|
||||||
|
"Use the shared, vLLM-tagged helpers from "
|
||||||
|
"vllm.transformers_utils.repo_utils (e.g. hf_api(), hf_fs(), "
|
||||||
|
"list_repo_files, file_exists) instead of calling "
|
||||||
|
"huggingface_hub directly."
|
||||||
|
),
|
||||||
|
allowed_files={"vllm/transformers_utils/repo_utils.py"},
|
||||||
|
allowed_dirs={"examples/"},
|
||||||
|
),
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -95,11 +120,18 @@ def check_file(path: str) -> int:
|
|||||||
# Skip files that are allowed for this import
|
# Skip files that are allowed for this import
|
||||||
if path in forbidden_import.allowed_files:
|
if path in forbidden_import.allowed_files:
|
||||||
continue
|
continue
|
||||||
|
# Skip directories that are allowed for this import
|
||||||
|
if any(path.startswith(prefix) for prefix in forbidden_import.allowed_dirs):
|
||||||
|
continue
|
||||||
# Search for forbidden imports
|
# Search for forbidden imports
|
||||||
for match in re.finditer(forbidden_import.pattern, content, re.MULTILINE):
|
for match in re.finditer(forbidden_import.pattern, content, re.MULTILINE):
|
||||||
# Check if it's allowed
|
# Check if it's allowed
|
||||||
if forbidden_import.allowed_pattern.match(match.group()):
|
if forbidden_import.allowed_pattern.match(match.group()):
|
||||||
continue
|
continue
|
||||||
|
# Skip matches inside a comment
|
||||||
|
line_start = content.rfind("\n", 0, match.start()) + 1
|
||||||
|
if "#" in content[line_start : match.start()]:
|
||||||
|
continue
|
||||||
# Calculate line number from match position
|
# Calculate line number from match position
|
||||||
line_num = content[: match.start() + 1].count("\n") + 1
|
line_num = content[: match.start() + 1].count("\n") + 1
|
||||||
print(
|
print(
|
||||||
@@ -119,7 +151,10 @@ def main():
|
|||||||
|
|
||||||
|
|
||||||
def test_regex():
|
def test_regex():
|
||||||
test_cases = [
|
def matches(rule: str, content: str) -> bool:
|
||||||
|
return bool(re.search(CHECK_IMPORTS[rule].pattern, content, re.MULTILINE))
|
||||||
|
|
||||||
|
pickle_cases = [
|
||||||
# Should match
|
# Should match
|
||||||
("import pickle", True),
|
("import pickle", True),
|
||||||
("import cloudpickle", True),
|
("import cloudpickle", True),
|
||||||
@@ -139,11 +174,47 @@ def test_regex():
|
|||||||
("print('import pickle')", False),
|
("print('import pickle')", False),
|
||||||
("import pickleas as asdf", False),
|
("import pickleas as asdf", False),
|
||||||
]
|
]
|
||||||
for i, (line, should_match) in enumerate(test_cases):
|
for i, (content, should_match) in enumerate(pickle_cases):
|
||||||
result = bool(CHECK_IMPORTS["pickle/cloudpickle"].pattern.match(line))
|
result = matches("pickle/cloudpickle", content)
|
||||||
assert result == should_match, (
|
assert result == should_match, (
|
||||||
f"Test case {i} failed: '{line}' (expected {should_match}, got {result})"
|
f"pickle case {i} failed: {content!r} "
|
||||||
|
f"(expected {should_match}, got {result})"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
hf_cases = [
|
||||||
|
# Should match
|
||||||
|
("from huggingface_hub import snapshot_download", True),
|
||||||
|
("from huggingface_hub import hf_hub_download", True),
|
||||||
|
("from huggingface_hub import HfApi", True),
|
||||||
|
("from huggingface_hub import HfFileSystem", True),
|
||||||
|
("from huggingface_hub import list_repo_files", True),
|
||||||
|
("from huggingface_hub import try_to_load_from_cache", True),
|
||||||
|
(" from huggingface_hub import snapshot_download", True),
|
||||||
|
("from huggingface_hub import PyTorchModelHubMixin, hf_hub_download", True),
|
||||||
|
("from huggingface_hub import (snapshot_download)", True),
|
||||||
|
# Parenthesized multi-line import must not bypass the hook
|
||||||
|
("from huggingface_hub import (\n snapshot_download,\n)", True),
|
||||||
|
(
|
||||||
|
"from huggingface_hub import (\n PyTorchModelHubMixin,\n HfApi,\n)",
|
||||||
|
True,
|
||||||
|
),
|
||||||
|
# Should not match
|
||||||
|
("import huggingface_hub", False),
|
||||||
|
("import huggingface_hub as hf", False),
|
||||||
|
("from huggingface_hub import PyTorchModelHubMixin", False),
|
||||||
|
("from huggingface_hub.constants import HF_HUB_CACHE", False),
|
||||||
|
("from huggingface_hub.utils import EntryNotFoundError", False),
|
||||||
|
("from vllm.transformers_utils.repo_utils import hf_api", False),
|
||||||
|
("from huggingface_hub import (\n PyTorchModelHubMixin,\n)", False),
|
||||||
|
("# from huggingface_hub import snapshot_download", False),
|
||||||
|
]
|
||||||
|
for i, (content, should_match) in enumerate(hf_cases):
|
||||||
|
result = matches("huggingface_hub repo API", content)
|
||||||
|
assert result == should_match, (
|
||||||
|
f"huggingface_hub case {i} failed: {content!r} "
|
||||||
|
f"(expected {should_match}, got {result})"
|
||||||
|
)
|
||||||
|
|
||||||
print("All regex tests passed.")
|
print("All regex tests passed.")
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -24,8 +24,6 @@ from __future__ import annotations
|
|||||||
|
|
||||||
import hashlib
|
import hashlib
|
||||||
import importlib
|
import importlib
|
||||||
import json
|
|
||||||
import os
|
|
||||||
from collections.abc import Callable, Iterable, Mapping, Sequence
|
from collections.abc import Callable, Iterable, Mapping, Sequence
|
||||||
from functools import lru_cache
|
from functools import lru_cache
|
||||||
from typing import (
|
from typing import (
|
||||||
@@ -39,7 +37,6 @@ import regex as re
|
|||||||
import torch
|
import torch
|
||||||
import torch.nn as nn
|
import torch.nn as nn
|
||||||
import torch.nn.functional as F
|
import torch.nn.functional as F
|
||||||
from huggingface_hub import hf_hub_download
|
|
||||||
from PIL import Image
|
from PIL import Image
|
||||||
from transformers import AutoProcessor, AutoTokenizer, BatchFeature
|
from transformers import AutoProcessor, AutoTokenizer, BatchFeature
|
||||||
from transformers.dynamic_module_utils import get_class_from_dynamic_module
|
from transformers.dynamic_module_utils import get_class_from_dynamic_module
|
||||||
@@ -108,6 +105,7 @@ from vllm.multimodal.video import (
|
|||||||
)
|
)
|
||||||
from vllm.sequence import IntermediateTensors
|
from vllm.sequence import IntermediateTensors
|
||||||
from vllm.transformers_utils.processor import _merge_mm_kwargs
|
from vllm.transformers_utils.processor import _merge_mm_kwargs
|
||||||
|
from vllm.transformers_utils.repo_utils import get_hf_file_to_dict
|
||||||
from vllm.transformers_utils.utils import convert_model_repo_to_path
|
from vllm.transformers_utils.utils import convert_model_repo_to_path
|
||||||
from vllm.utils.tensor_schema import TensorSchema, TensorShape
|
from vllm.utils.tensor_schema import TensorSchema, TensorShape
|
||||||
|
|
||||||
@@ -165,13 +163,10 @@ def _load_ov2_processor(
|
|||||||
# codec video backend keeps its configured defaults.
|
# codec video backend keeps its configured defaults.
|
||||||
codec_config: dict = {}
|
codec_config: dict = {}
|
||||||
try:
|
try:
|
||||||
config_file = os.path.join(path, "preprocessor_config.json")
|
preprocessor_config = get_hf_file_to_dict(
|
||||||
if not os.path.isfile(config_file):
|
"preprocessor_config.json", path, revision
|
||||||
config_file = hf_hub_download(
|
)
|
||||||
path, "preprocessor_config.json", revision=revision
|
codec_config = (preprocessor_config or {}).get("codec", {}) or {}
|
||||||
)
|
|
||||||
with open(config_file, encoding="utf-8") as f:
|
|
||||||
codec_config = json.load(f).get("codec", {}) or {}
|
|
||||||
except Exception:
|
except Exception:
|
||||||
logger.debug("OV2: no codec defaults found in preprocessor_config.json")
|
logger.debug("OV2: no codec defaults found in preprocessor_config.json")
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user