[Diffusion] Fuse LongCat Image normalization and modulation (#38530)

This commit is contained in:
Xiaoyu Zhang
2026-09-09 11:12:17 +08:00
committed by GitHub
parent 76eea36e38
commit 2952c8d5ea
2 changed files with 209 additions and 10 deletions
@@ -32,6 +32,7 @@ from diffusers.models.normalization import (
AdaLayerNormZeroSingle,
)
from sglang.kernels.ops import diffusion as diffusion_ops
from sglang.kernels.ops.diffusion import (
BitExactFusionGate,
can_use_fused_inplace_qknorm_rope,
@@ -62,6 +63,76 @@ from sglang.multimodal_gen.runtime.utils.logging_utils import init_logger
logger = init_logger(__name__)
_LONGCAT_QKNORM_ROPE = BitExactFusionGate("LongCat fused QKNorm+RoPE")
_LONGCAT_LN_MOD = BitExactFusionGate("LongCat fused LN+modulate", per_signature=True)
def _longcat_norm_modulate(
norm: nn.Module,
x: torch.Tensor,
scale: torch.Tensor,
shift: torch.Tensor,
) -> torch.Tensor:
if torch.is_grad_enabled() or torch.compiler.is_compiling():
return norm(x) * (1 + scale[:, None]) + shift[:, None]
# LayerNorm's reduction depends on the live aten dispatch. Verify each
# shape/stride before using the bit-exact fused kernel, outside capture.
if (
not _LONGCAT_LN_MOD.disabled
and x.is_cuda
and diffusion_ops.is_plain_layer_norm(norm, x.shape[-1])
and diffusion_ops.can_use_fused_layernorm_modulate(x, scale, shift)
):
sig = (
x.shape,
x.stride(),
scale.shape,
scale.stride(),
shift.shape,
shift.stride(),
norm.eps,
x.dtype,
x.device,
)
verified = _LONGCAT_LN_MOD.is_verified(sig)
if verified or not torch.cuda.is_current_stream_capturing():
try:
out = diffusion_ops.fused_layernorm_modulate(x, scale, shift, norm.eps)
except Exception as exc:
_LONGCAT_LN_MOD.on_exception(exc, logger=logger)
else:
if verified:
return out
reference = norm(x) * (1 + scale[:, None]) + shift[:, None]
return _LONGCAT_LN_MOD.accept_or_fallback(
out, reference, sig=sig, logger=logger
)
return norm(x) * (1 + scale[:, None]) + shift[:, None]
class _LongCatAdaLayerNormZero(AdaLayerNormZero):
def forward(
self,
x: torch.Tensor,
timestep: Optional[torch.Tensor] = None,
class_labels: Optional[torch.LongTensor] = None,
hidden_dtype: Optional[torch.dtype] = None,
emb: Optional[torch.Tensor] = None,
):
if self.emb is not None:
emb = self.emb(timestep, class_labels, hidden_dtype=hidden_dtype)
emb = self.linear(self.silu(emb))
shift_msa, scale_msa, gate_msa, shift_mlp, scale_mlp, gate_mlp = emb.chunk(
6, dim=1
)
x = _longcat_norm_modulate(self.norm, x, scale_msa, shift_msa)
return x, gate_msa, shift_mlp, scale_mlp, gate_mlp
class _LongCatAdaLayerNormZeroSingle(AdaLayerNormZeroSingle):
def forward(self, x: torch.Tensor, emb: Optional[torch.Tensor] = None):
emb = self.linear(self.silu(emb))
shift_msa, scale_msa, gate_msa = emb.chunk(3, dim=1)
return _longcat_norm_modulate(self.norm, x, scale_msa, shift_msa), gate_msa
def _longcat_qknorm_rope_reference(
@@ -500,7 +571,7 @@ class _SingleTransformerBlock(nn.Module):
):
super().__init__()
self.mlp_hidden_dim = int(dim * mlp_ratio)
self.norm = AdaLayerNormZeroSingle(dim)
self.norm = _LongCatAdaLayerNormZeroSingle(dim)
# proj_mlp: ColumnParallelLinear with gather_output=False keeps output
# head-sharded, consistent with attn_output from _LongCatSingleAttention.
self.proj_mlp = ColumnParallelLinear(
@@ -619,8 +690,8 @@ class _TransformerBlock(nn.Module):
prefix: str = "",
):
super().__init__()
self.norm1 = AdaLayerNormZero(dim)
self.norm1_context = AdaLayerNormZero(dim)
self.norm1 = _LongCatAdaLayerNormZero(dim)
self.norm1_context = _LongCatAdaLayerNormZero(dim)
self.attn = _LongCatJointAttention(
dim=dim,
num_attention_heads=num_attention_heads,
@@ -666,9 +737,8 @@ class _TransformerBlock(nn.Module):
hidden_states, attn_output, gate_msa.unsqueeze(1)
)
norm_hidden_states = self.norm2(hidden_states)
norm_hidden_states = (
norm_hidden_states * (1 + scale_mlp[:, None]) + shift_mlp[:, None]
norm_hidden_states = _longcat_norm_modulate(
self.norm2, hidden_states, scale_mlp, shift_mlp
)
ff_output = self.ff(norm_hidden_states)
hidden_states = residual_gate_add(
@@ -679,10 +749,8 @@ class _TransformerBlock(nn.Module):
encoder_hidden_states, context_attn_output, c_gate_msa.unsqueeze(1)
)
norm_encoder_hidden_states = self.norm2_context(encoder_hidden_states)
norm_encoder_hidden_states = (
norm_encoder_hidden_states * (1 + c_scale_mlp[:, None])
+ c_shift_mlp[:, None]
norm_encoder_hidden_states = _longcat_norm_modulate(
self.norm2_context, encoder_hidden_states, c_scale_mlp, c_shift_mlp
)
context_ff_output = self.ff_context(norm_encoder_hidden_states)
encoder_hidden_states = residual_gate_add(