Feat/Add HunyuanImage-3.0-Instruct ar part support: (#2713)
Signed-off-by: TaffyOfficial <2324465096@qq.com> Co-authored-by: TaffyOfficial <2324465096@qq.com> Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
10 files changed
+816
-82
No files matched your search
@@ -1,6 +1,8 @@
|
||||
import sys
|
||||
from functools import cached_property
|
||||
|
||||
from aenum import extend_enum
|
||||
from vllm.config import ModelConfig as _OriginalModelConfig
|
||||
from vllm.inputs import TokensPrompt as _OriginalTokensPrompt
|
||||
from vllm.model_executor.layers.rotary_embedding import (
|
||||
MRotaryEmbedding as _OriginalMRotaryEmbedding,
|
||||
@@ -17,6 +19,56 @@ from vllm_omni.inputs.data import OmniTokensPrompt
|
||||
from vllm_omni.model_executor.layers.rotary_embedding import OmniMRotaryEmbedding
|
||||
from vllm_omni.request import OmniRequest
|
||||
|
||||
# =============================================================================
|
||||
# Patch ModelConfig.is_mm_prefix_lm to support omni-specific models
|
||||
# =============================================================================
|
||||
# WHY: HunyuanImage-3.0 requires bidirectional attention for image tokens
|
||||
# (cond_token_attn_type: "joint_full" in config.json). vLLM gates this on
|
||||
# is_mm_prefix_lm, which checks an internal MM_PREFIX_LM_MODELS list that
|
||||
# does not include "hunyuan_image_3_moe" (the upstream HF model_type).
|
||||
#
|
||||
# WHY NOT model-level: is_mm_prefix_lm is checked in vLLM core (scheduler,
|
||||
# attention backend selection) before model code runs — no model-level hook.
|
||||
#
|
||||
# SCOPE: Only affects model_type in _OMNI_MM_PREFIX_LM_MODELS (currently
|
||||
# just "hunyuan_image_3_moe"). All other models fall through to the
|
||||
# original vLLM implementation unchanged.
|
||||
#
|
||||
# FRAGILITY: Relies on is_mm_prefix_lm being a cached_property on
|
||||
# ModelConfig. The __dict__ access + __set_name__ dance works around a
|
||||
# pydantic dataclass issue in vllm 0.19.0+. If vLLM changes
|
||||
# is_mm_prefix_lm to a regular method or removes it, this will break.
|
||||
#
|
||||
# TODO: Upstream a configurable MM_PREFIX_LM_MODELS or a model_config flag
|
||||
# so this patch can be removed.
|
||||
_OMNI_MM_PREFIX_LM_MODELS = ("hunyuan_image_3_moe",)
|
||||
# Access via __dict__ to avoid triggering cached_property.__get__ which fails
|
||||
# with "Cannot use cached_property instance without calling __set_name__" in
|
||||
# pydantic dataclasses (vllm 0.19.0+).
|
||||
_cp = _OriginalModelConfig.__dict__["is_mm_prefix_lm"]
|
||||
_original_is_mm_prefix_lm = _cp.func if hasattr(_cp, "func") else _cp.fget
|
||||
|
||||
|
||||
def _patched_is_mm_prefix_lm(self):
|
||||
if _original_is_mm_prefix_lm(self):
|
||||
return True
|
||||
model_type = getattr(self.hf_config, "model_type", "")
|
||||
return model_type in _OMNI_MM_PREFIX_LM_MODELS
|
||||
|
||||
|
||||
_patched_cp = cached_property(_patched_is_mm_prefix_lm)
|
||||
_patched_cp.__set_name__(_OriginalModelConfig, "is_mm_prefix_lm")
|
||||
_OriginalModelConfig.is_mm_prefix_lm = _patched_cp
|
||||
|
||||
# Sanity check: verify the patch is active. If vLLM changes the descriptor
|
||||
# type or __set_name__ semantics, this will fail loudly at import time
|
||||
# rather than silently falling back to unpatched behavior.
|
||||
_installed = _OriginalModelConfig.__dict__.get("is_mm_prefix_lm")
|
||||
assert _installed is _patched_cp, (
|
||||
"is_mm_prefix_lm patch failed to install — bidirectional attention "
|
||||
"for HunyuanImage3 will not work. Check vLLM ModelConfig changes."
|
||||
)
|
||||
|
||||
# =============================================================================
|
||||
# Patch GlmImageTextConfig to expose mrope_section in rope_parameters
|
||||
# =============================================================================
|
||||
|
||||
Reference in new issue
Block a user