[Chore] Use upstream Transformers DeepseekV4Config (#61392)
Signed-off-by: Harry Mellor <19981378+hmellor@users.noreply.github.com> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> Co-authored-by: Kevin H. Luu <khluu000@gmail.com>
This commit is contained in:
co-authored by
Claude Opus 5.5
mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Kevin H. Luu
parent
1c4c319792
commit
b965ee564d
@@ -519,7 +519,8 @@ def test_deepseek_v4_convertor_splits_vision_architecture():
|
||||
text-only DeepSeek-V4; the convertor routes it to the VL wrapper class
|
||||
by rewriting hf_config.architectures (model-class resolution reads the
|
||||
raw attribute)."""
|
||||
from vllm.transformers_utils.configs.deepseek_v4 import DeepseekV4Config
|
||||
from transformers import DeepseekV4Config
|
||||
|
||||
from vllm.transformers_utils.model_arch_config_convertor import (
|
||||
DeepseekV4ModelArchConfigConvertor,
|
||||
)
|
||||
|
||||
@@ -7,12 +7,12 @@ from types import SimpleNamespace
|
||||
import lm_eval
|
||||
import pytest
|
||||
import torch
|
||||
from transformers import DeepseekV4Config
|
||||
|
||||
from tests.utils import large_gpu_mark
|
||||
from vllm.distributed.eplb.eplb_state import EplbState
|
||||
from vllm.models.deepseek_v4.common.eplb_util import dspark_draft_supports_eplb
|
||||
from vllm.platforms import current_platform
|
||||
from vllm.transformers_utils.configs.deepseek_v4 import DeepseekV4Config
|
||||
from vllm.v1.worker.gpu.eplb_utils import (
|
||||
EPLBController,
|
||||
draft_model_supports_eplb,
|
||||
@@ -105,7 +105,7 @@ def _make_dsv4_dspark_hf_config() -> DeepseekV4Config:
|
||||
vocab_size=256,
|
||||
n_mtp_layers=2,
|
||||
enable_confidence_head=False,
|
||||
compress_ratios=[1, 1],
|
||||
layer_types=["sliding_attention"] * 2,
|
||||
)
|
||||
|
||||
|
||||
|
||||
@@ -182,7 +182,8 @@ def get_fse_test_model_config(
|
||||
head_dim=128,
|
||||
max_position_embeddings=128,
|
||||
sliding_window=None,
|
||||
compress_ratios=[1],
|
||||
layer_types=["sliding_attention"],
|
||||
compress_rates={},
|
||||
rope_theta=10000.0,
|
||||
compress_rope_theta=10000.0,
|
||||
rope_parameters={"rope_type": "default"},
|
||||
|
||||
@@ -3,13 +3,27 @@
|
||||
"""DeepSeek-V4 VL processing helpers."""
|
||||
|
||||
from PIL import Image
|
||||
from transformers import DeepseekV4Config
|
||||
|
||||
from vllm.models.deepseek_v4.common.mm_preprocess import (
|
||||
DeepseekV4VLProcessingInfo,
|
||||
DeepseekV4VLProcessor,
|
||||
build_image_block_pad_free,
|
||||
)
|
||||
from vllm.transformers_utils.configs.deepseek_v4 import DeepseekV4Config
|
||||
|
||||
# Vision fields of deepseek-ai/DeepSeek-V4-Flash-Vision-Exp
|
||||
VISION_CONFIG = dict(
|
||||
vision_n_layers=24,
|
||||
vision_dim=1024,
|
||||
vision_n_heads=16,
|
||||
vision_inter_dim=2816,
|
||||
vision_patch_size=14,
|
||||
vision_rope_theta=10000.0,
|
||||
vision_downsample_ratio=3,
|
||||
vision_max_n_token=384,
|
||||
vision_min_pixels=147456,
|
||||
vision_max_wh_ratio=8,
|
||||
)
|
||||
|
||||
|
||||
class _ConfigCtx:
|
||||
@@ -34,7 +48,7 @@ def test_get_image_size_with_most_features_beats_wide_real_image():
|
||||
|
||||
A square under-counts because each aligner row pays an IMAGE_NEW_LINE.
|
||||
"""
|
||||
config = DeepseekV4Config(vision_n_layers=24)
|
||||
config = DeepseekV4Config(**VISION_CONFIG)
|
||||
info = DeepseekV4VLProcessingInfo(_ConfigCtx(config))
|
||||
processor = DeepseekV4VLProcessor(config)
|
||||
|
||||
@@ -47,7 +61,7 @@ def test_get_image_size_with_most_features_beats_wide_real_image():
|
||||
|
||||
|
||||
def test_get_image_size_with_most_features_respects_max_wh_ratio():
|
||||
config = DeepseekV4Config(vision_n_layers=24)
|
||||
config = DeepseekV4Config(**VISION_CONFIG)
|
||||
info = DeepseekV4VLProcessingInfo(_ConfigCtx(config))
|
||||
dummy = info.get_image_size_with_most_features()
|
||||
assert dummy.width / dummy.height <= config.vision_max_wh_ratio
|
||||
|
||||
@@ -5,6 +5,7 @@ from types import SimpleNamespace
|
||||
|
||||
import pytest
|
||||
import torch
|
||||
from transformers import DeepseekV4Config
|
||||
|
||||
from vllm.model_executor.layers.fused_moe.deep_gemm_mega_moe import (
|
||||
DeepGemmSm100MegaMoEBackend,
|
||||
@@ -28,7 +29,6 @@ from vllm.models.deepseek_v4.nvidia.ops.prepare_megamoe import prepare_megamoe_i
|
||||
from vllm.models.deepseek_v41.common.mm_preprocess import IMAGE_SENTINEL_BASE_ID
|
||||
from vllm.models.deepseek_v41.nvidia.model import DeepseekV4MoE as DeepseekV41MoE
|
||||
from vllm.platforms import current_platform
|
||||
from vllm.transformers_utils.configs.deepseek_v4 import DeepseekV4Config
|
||||
from vllm.transformers_utils.configs.deepseek_v41 import DeepseekV41Config
|
||||
from vllm.utils.deep_gemm import is_deep_gemm_supported
|
||||
from vllm.utils.torch_utils import set_default_torch_dtype
|
||||
@@ -979,7 +979,7 @@ def v4_dspark_config(dist_init):
|
||||
vocab_size=256,
|
||||
n_mtp_layers=2,
|
||||
enable_confidence_head=False,
|
||||
compress_ratios=[1, 1],
|
||||
layer_types=["sliding_attention"] * 2,
|
||||
q_lora_rank=32,
|
||||
o_lora_rank=32,
|
||||
qk_rope_head_dim=16,
|
||||
|
||||
@@ -2005,9 +2005,7 @@ def test_draft_inherits_ep_only_for_moe(
|
||||
draft_is_moe: bool,
|
||||
):
|
||||
"""Validate final draft configs without loading weights or mocking validation."""
|
||||
from transformers import LlamaConfig, MixtralConfig
|
||||
|
||||
from vllm.transformers_utils.configs.deepseek_v4 import DeepseekV4Config
|
||||
from transformers import DeepseekV4Config, LlamaConfig, MixtralConfig
|
||||
|
||||
common = dict(
|
||||
hidden_size=128,
|
||||
@@ -2024,7 +2022,7 @@ def test_draft_inherits_ep_only_for_moe(
|
||||
n_routed_experts=4,
|
||||
num_experts_per_tok=2,
|
||||
num_nextn_predict_layers=1,
|
||||
compress_ratios=[1, 1],
|
||||
layer_types=["sliding_attention"] * 2,
|
||||
head_dim=32,
|
||||
**common,
|
||||
)
|
||||
|
||||
@@ -0,0 +1,19 @@
|
||||
# SPDX-License-Identifier: Apache-2.0
|
||||
# SPDX-FileCopyrightText: Copyright contributors to the vLLM project
|
||||
from transformers import DeepseekV4Config
|
||||
|
||||
from vllm.transformers_utils.deepseek_v4_utils import get_compress_ratios
|
||||
|
||||
# Legacy field as shipped by deepseek-ai/DeepSeek-V4-Flash-Vision-Exp
|
||||
COMPRESS_RATIOS = [0, 0] + [4, 128] * 20 + [4, 0, 0, 0]
|
||||
|
||||
|
||||
def test_compress_ratios_survive_upstream_config():
|
||||
"""Upstream pops `compress_ratios`; the helper must recover it."""
|
||||
config = DeepseekV4Config(
|
||||
num_hidden_layers=43,
|
||||
num_nextn_predict_layers=3,
|
||||
compress_ratios=COMPRESS_RATIOS,
|
||||
)
|
||||
assert not hasattr(config, "compress_ratios")
|
||||
assert get_compress_ratios(config) == COMPRESS_RATIOS
|
||||
@@ -15,6 +15,7 @@ import inspect
|
||||
|
||||
import pytest
|
||||
import torch
|
||||
from transformers import DeepseekV4Config
|
||||
from typing_extensions import TypedDict
|
||||
|
||||
from tests.v1.attention.utils import create_vllm_config
|
||||
@@ -532,26 +533,26 @@ def make_builder(
|
||||
builder_cls: type[
|
||||
DeepseekSparseSWAMetadataBuilder
|
||||
] = DeepseekSparseSWAMetadataBuilder,
|
||||
mm_prefix_clamp_sliding_window: bool = True,
|
||||
deepseek_v4_config: bool = True,
|
||||
bounded_replay: bool = False,
|
||||
) -> DeepseekSparseSWAMetadataBuilder:
|
||||
overrides: dict = {"sliding_window": window}
|
||||
if vision:
|
||||
# Emulate the V4 vision config, whose mm_prefix_clamp_sliding_window
|
||||
# gates the in-kernel SWA widening. V4.1 (causal image tokens) leaves
|
||||
# it off.
|
||||
overrides.update(
|
||||
vision_n_layers=2,
|
||||
vision_max_n_token=max_image_tokens,
|
||||
mm_prefix_clamp_sliding_window=mm_prefix_clamp_sliding_window,
|
||||
)
|
||||
vision_fields = dict(vision_n_layers=2, vision_max_n_token=max_image_tokens)
|
||||
vllm_config = create_vllm_config(
|
||||
model_name=model_name,
|
||||
max_model_len=4096,
|
||||
max_num_batched_tokens=max_num_batched_tokens,
|
||||
max_num_seqs=8,
|
||||
hf_config_override=overrides,
|
||||
hf_config_override={"sliding_window": window}
|
||||
| (vision_fields if vision and not deepseek_v4_config else {}),
|
||||
)
|
||||
if vision and deepseek_v4_config:
|
||||
# Only V4 configs widen the SWA window in-kernel over image spans
|
||||
vllm_config.model_config.hf_config = DeepseekV4Config(
|
||||
num_hidden_layers=1,
|
||||
layer_types=["sliding_attention"],
|
||||
sliding_window=window,
|
||||
**vision_fields,
|
||||
)
|
||||
spec = SlidingWindowMLASpec(
|
||||
block_size=BLOCK_SIZE,
|
||||
num_kv_heads=1,
|
||||
@@ -686,7 +687,7 @@ def test_v41_image_prefill_uses_causal_swa(compress_ratio, query_len):
|
||||
max_image_tokens,
|
||||
query_len,
|
||||
builder_cls=DeepseekV41SparseSWAMetadataBuilder,
|
||||
mm_prefix_clamp_sliding_window=False,
|
||||
deepseek_v4_config=False,
|
||||
)
|
||||
assert builder.max_image_tokens == 0
|
||||
md = build_metadata(builder, [seq_len], [query_len], {0: spans})
|
||||
|
||||
Reference in New Issue
Block a user