[Perf] Fuse MiniMax H3 SwiGLU activation (#6283)

Signed-off-by: Canlin Guo <canlinguosdu@gmail.com>
This commit is contained in:
Canlin Guo authored and GitHub committed 2026-08-18 20:12:10 -07:00
1 parent 07ceb3324a
commit 9683b7f4b4
2 files changed
+40 -2

No files matched your search

+37
View File
@@ -0,0 +1,37 @@
# SPDX-License-Identifier: Apache-2.0
"""Custom activation functions for diffusion models."""
import torch
import torch.nn.functional as F
from vllm_omni.diffusion.layers.custom_op import CustomOp
from vllm_omni.platforms import current_omni_platform
class SiluAndMul(CustomOp):
"""SwiGLU activation dispatched by the current vLLM-Omni platform."""
def __init__(self) -> None:
super().__init__()
if current_omni_platform.is_cuda() or current_omni_platform.is_rocm() or current_omni_platform.is_musa():
self.op = torch.ops._C.silu_and_mul
@staticmethod
def forward_native(x: torch.Tensor) -> torch.Tensor:
d = x.shape[-1] // 2
return F.silu(x[..., :d]) * x[..., d:]
def forward_cuda(self, x: torch.Tensor) -> torch.Tensor:
if x.device.type != "cuda":
return self.forward_native(x)
d = x.shape[-1] // 2
output_shape = x.shape[:-1] + (d,)
out = torch.empty(output_shape, dtype=x.dtype, device=x.device)
self.op(out, x)
return out
def forward_npu(self, x: torch.Tensor) -> torch.Tensor:
return self.forward_native(x)
def forward_xpu(self, x: torch.Tensor) -> torch.Tensor:
return self.forward_native(x)
@@ -33,6 +33,7 @@ from vllm_omni.diffusion.distributed.sp_plan import (
SequenceParallelInput,
SequenceParallelOutput,
)
from vllm_omni.diffusion.layers.activation import SiluAndMul
from vllm_omni.diffusion.layers.fused_qk_norm_rope import fused_qk_norm_rope
from vllm_omni.diffusion.layers.norm import RMSNorm
from vllm_omni.diffusion.layers.rope import RotaryEmbedding
@@ -586,6 +587,7 @@ class MiniMaxH3MLP(nn.Module):
quant_config=quant_config,
prefix=f"{prefix}.fc1",
)
self.act_fn = SiluAndMul()
# Chunk the fused fc1 output as [gate, up], then compute
# silu(gate) * up.
self.fc2 = RowParallelLinear(
@@ -600,8 +602,7 @@ class MiniMaxH3MLP(nn.Module):
def forward(self, x: torch.Tensor) -> torch.Tensor:
hidden, _ = self.fc1(x)
gate, up = hidden.chunk(2, dim=-1)
hidden = nn.functional.silu(gate) * up
hidden = self.act_fn(hidden)
out, _ = self.fc2(hidden)
return out