[Perf][Flux2][HunyuanVideo1.5] Skip attention-mask to avoid varlen path (#4645)

Signed-off-by: kTorp <Kristoffer.Torp@amd.com>
Signed-off-by: Didan Deng <33117903+wtomin@users.noreply.github.com>
Co-authored-by: Didan Deng <33117903+wtomin@users.noreply.github.com>
Co-authored-by: Hongsheng Liu <liuhongsheng4@huawei.com>
This commit is contained in:
authored and GitHub committed 2026-08-11 15:31:02 +08:00
1 parent 06e733d3cd
commit 4ab1b4ff9c
3 files changed
+51 -4

No files matched your search

@@ -15,6 +15,7 @@ from diffusers.models.modeling_outputs import Transformer2DModelOutput
from diffusers.models.normalization import AdaLayerNormContinuous
from diffusers.utils import is_torch_npu_available
from torch import nn
from vllm.logger import init_logger
from vllm.model_executor.layers.layernorm import RMSNorm
from vllm.model_executor.layers.linear import (
ColumnParallelLinear,
@@ -38,6 +39,8 @@ from vllm_omni.diffusion.layers.rope import RotaryEmbedding, apply_rope_to_qk
if TYPE_CHECKING:
from vllm.model_executor.layers.quantization.base_config import QuantizationConfig
logger = init_logger(__name__)
def _join_prefix(prefix: str, name: str) -> str:
return f"{prefix}.{name}" if prefix else name
@@ -946,7 +949,13 @@ class Flux2Transformer2DModel(nn.Module):
ctx = get_forward_context()
else:
ctx = None
if ctx is not None and ctx.sp_original_seq_len is not None and ctx.sp_padding_size > 0:
if (
ctx is not None
and self.parallel_config.sequence_parallel_size > 1
and self.parallel_config.mask_sp_padding
and ctx.sp_original_seq_len is not None
and ctx.sp_padding_size > 0
):
batch_size = hidden_states.shape[0]
img_padded_seq_len = ctx.sp_original_seq_len + ctx.sp_padding_size
hidden_states_mask = torch.ones(
@@ -958,6 +967,22 @@ class Flux2Transformer2DModel(nn.Module):
hidden_states_mask[:, ctx.sp_original_seq_len :] = False
if hidden_states_mask.all():
hidden_states_mask = None
elif (
ctx is not None
and self.parallel_config.sequence_parallel_size > 1
and not self.parallel_config.mask_sp_padding
and ctx.sp_original_seq_len is not None
and ctx.sp_padding_size > 0
):
logger.warning_once(
"SP auto-padding applied %d token(s) (seq_len=%d, ulysses_degree=%d). "
"Padding tokens are not masked from attention (mask_sp_padding=False), "
"which avoids the varlen attention path but may produce minor numerical differences. "
"Set parallel_config.mask_sp_padding=True to restore strict masking.",
ctx.sp_padding_size,
ctx.sp_original_seq_len,
self.parallel_config.sequence_parallel_size,
)
if hidden_states_mask is not None:
joint_attention_kwargs["hidden_states_mask"] = hidden_states_mask
@@ -814,7 +814,13 @@ class HunyuanVideo15Transformer3DModel(nn.Module):
ctx = get_forward_context()
hidden_states_mask = None
if ctx.sp_original_seq_len is not None and ctx.sp_padding_size > 0:
if (
self.parallel_config is not None
and self.parallel_config.sequence_parallel_size > 1
and self.parallel_config.mask_sp_padding
and ctx.sp_original_seq_len is not None
and ctx.sp_padding_size > 0
):
padded_seq_len = ctx.sp_original_seq_len + ctx.sp_padding_size
hidden_states_mask = torch.ones(
batch_size,
@@ -823,10 +829,24 @@ class HunyuanVideo15Transformer3DModel(nn.Module):
device=hidden_states.device,
)
hidden_states_mask[:, ctx.sp_original_seq_len :] = False
# if mask is all true, set it to None
if hidden_states_mask.all():
hidden_states_mask = None
elif (
self.parallel_config is not None
and self.parallel_config.sequence_parallel_size > 1
and not self.parallel_config.mask_sp_padding
and ctx.sp_original_seq_len is not None
and ctx.sp_padding_size > 0
):
logger.warning_once(
"SP auto-padding applied %d token(s) (seq_len=%d, ulysses_degree=%d). "
"Padding tokens are not masked from attention (mask_sp_padding=False), "
"which avoids the varlen attention path but may produce minor numerical differences. "
"Set parallel_config.mask_sp_padding=True to restore strict masking.",
ctx.sp_padding_size,
ctx.sp_original_seq_len,
self.parallel_config.sequence_parallel_size,
)
for block in self.transformer_blocks:
hidden_states, encoder_hidden_states = block(