+12








7c6729b769
Signed-off-by: zjy0516 <riverclouds.zhu@qq.com> Signed-off-by: Isotr0py <Isotr0py@outlook.com> Signed-off-by: Bugen Zhao <i@bugenzhao.com> Signed-off-by: Yongye Zhu <zyy1102000@gmail.com> Co-authored-by: Isotr0py <Isotr0py@outlook.com> Co-authored-by: Thien Tran <gau.nernst@yahoo.com.sg> Co-authored-by: Bugen Zhao <i@bugenzhao.com> Co-authored-by: Yongye Zhu <zyy1102000@gmail.com> Co-authored-by: Ziming Huang <zelda.huanghuang@gmail.com> Co-authored-by: Roger Wang <hey@rogerw.io> Co-authored-by: Isotr0py <mozf@inferact.ai> Co-authored-by: aoshen02 <aoshen02@users.noreply.github.com> Co-authored-by: Woosuk Kwon <woosuk@inferact.ai> Co-authored-by: Jee Jee Li <jeejeelee@inferact.ai> Co-authored-by: aoshen02 <aoshen@inferact.ai> Co-authored-by: Summer Yang <girasoleyang@gmail.com> Co-authored-by: Kevin H. Luu <khluu000@gmail.com> Co-authored-by: Bowen Wang <abmfy@icloud.com> Co-authored-by: gnovack <novackgm@gmail.com> Co-authored-by: Nick Hill <nickhill123@gmail.com> Co-authored-by: Yifan Qiao <yifanqiao@inferact.ai> Co-authored-by: xiaozhoupy <peiyuanzhou1994@gmail.com> Co-authored-by: Roy Wang <yasong.wang@inferact.ai> Co-authored-by: Jeff (Junze) Ma <93145857+majunze2001@users.noreply.github.com> Co-authored-by: Codex <codex@openai.com>
214 lines
8.1 KiB
Python
214 lines
8.1 KiB
Python
# SPDX-License-Identifier: Apache-2.0
|
||
# SPDX-FileCopyrightText: Copyright contributors to the vLLM project
|
||
"""MoE activation function enum and utilities."""
|
||
|
||
from enum import Enum
|
||
|
||
import torch
|
||
import torch.nn.functional as F
|
||
|
||
|
||
class MoEActivation(Enum):
|
||
"""Activation functions for MoE layers."""
|
||
|
||
# Gated activations (gate * activation(up)) expect input of shape [..., 2*d]
|
||
# and produce output of shape [..., d]
|
||
SILU = "silu"
|
||
GELU = "gelu"
|
||
GELU_TANH = "gelu_tanh"
|
||
RELU2 = "relu2"
|
||
# SWIGLUOAI expects gate/up *interleaved* in w13 ([gate0, up0, gate1, ...]),
|
||
# as in gpt-oss checkpoints. SWIGLUOAI_UNINTERLEAVE has identical math but
|
||
# expects the *packed* layout ([all gates; all ups]), as produced by a
|
||
# MergedColumnParallelLinear gate_up_proj (e.g. MiniMax-M3).
|
||
SWIGLUOAI = "swigluoai"
|
||
SITU = "situ"
|
||
SWIGLUOAI_UNINTERLEAVE = "swigluoai_uninterleave"
|
||
SWIGLUSTEP = "swiglustep"
|
||
|
||
# Non-gated activations (no mul with gate) expect input of shape [..., d]
|
||
# and produce output of shape [..., d].
|
||
# NOTE: Non-gated activations require the "_no_mul" suffix to be present.
|
||
SILU_NO_MUL = "silu_no_mul"
|
||
GELU_NO_MUL = "gelu_no_mul"
|
||
GELU_TANH_NO_MUL = "gelu_tanh_no_mul"
|
||
RELU2_NO_MUL = "relu2_no_mul"
|
||
|
||
@property
|
||
def is_gated(self) -> bool:
|
||
"""Returns True if activation expects gate*activation(up) pattern.
|
||
|
||
Gated activations expect input tensor with 2x the output size,
|
||
where the first half is the gate and second half is the up projection.
|
||
"""
|
||
return not self.value.endswith("_no_mul")
|
||
|
||
@property
|
||
def custom_op_name(self) -> str:
|
||
"""Maps to the CustomOp name of activations
|
||
in vllm/model_executor/layers/activation.py."""
|
||
return _CUSTOM_OP_NAMES[self]
|
||
|
||
def without_mul(self) -> "MoEActivation":
|
||
"""Get the non-gated variant of this activation.
|
||
|
||
For activations that have a _no_mul variant, returns that variant.
|
||
For activations without a _no_mul variant (or already _no_mul),
|
||
returns self.
|
||
"""
|
||
return _WITHOUT_MUL.get(self, self)
|
||
|
||
@classmethod
|
||
def from_str(cls, s: str) -> "MoEActivation":
|
||
"""Parse from string for backward compatibility."""
|
||
s = _STR_ALIASES.get(s, s)
|
||
for member in cls:
|
||
if member.value == s:
|
||
return member
|
||
valid = [m.value for m in cls]
|
||
raise ValueError(f"Unknown MoE activation: {s!r}. Valid activations: {valid}")
|
||
|
||
|
||
# Module-level lookup tables used by MoEActivation functions.
|
||
_STR_ALIASES: dict[str, str] = {
|
||
"gelu_pytorch_tanh": "gelu_tanh",
|
||
}
|
||
|
||
_CUSTOM_OP_NAMES: dict[MoEActivation, str] = {
|
||
MoEActivation.SILU: "silu_and_mul",
|
||
MoEActivation.GELU: "gelu_and_mul",
|
||
MoEActivation.GELU_TANH: "gelu_tanh_and_mul",
|
||
MoEActivation.SITU: "situ_and_mul",
|
||
MoEActivation.SWIGLUOAI: "swigluoai_and_mul",
|
||
MoEActivation.SWIGLUOAI_UNINTERLEAVE: "silu_and_mul_with_clamp",
|
||
MoEActivation.SWIGLUSTEP: "swiglustep_and_mul",
|
||
MoEActivation.RELU2: "relu2",
|
||
MoEActivation.SILU_NO_MUL: "silu_and_mul",
|
||
MoEActivation.GELU_NO_MUL: "gelu_and_mul",
|
||
MoEActivation.GELU_TANH_NO_MUL: "gelu_tanh_and_mul",
|
||
MoEActivation.RELU2_NO_MUL: "relu2",
|
||
}
|
||
|
||
_WITHOUT_MUL: dict[MoEActivation, MoEActivation] = {
|
||
MoEActivation.SILU: MoEActivation.SILU_NO_MUL,
|
||
MoEActivation.GELU: MoEActivation.GELU_NO_MUL,
|
||
MoEActivation.GELU_TANH: MoEActivation.GELU_TANH_NO_MUL,
|
||
MoEActivation.RELU2: MoEActivation.RELU2_NO_MUL,
|
||
}
|
||
|
||
|
||
def activation_without_mul(activation: str) -> str:
|
||
"""Get the non-gated variant of an activation function.
|
||
|
||
Args:
|
||
activation: The activation function name (e.g., "silu", "gelu")
|
||
|
||
Returns:
|
||
The non-gated activation name (e.g., "silu_no_mul", "gelu_no_mul")
|
||
"""
|
||
return MoEActivation.from_str(activation).without_mul().value
|
||
|
||
|
||
def silu_and_mul_with_clamp(
|
||
output: torch.Tensor,
|
||
input: torch.Tensor,
|
||
clamp_limit: float,
|
||
topk_ids: torch.Tensor | None = None,
|
||
expert_map: torch.Tensor | None = None,
|
||
) -> None:
|
||
if topk_ids is not None and expert_map is not None:
|
||
from vllm.model_executor.layers.fused_moe.utils import swiglu_limit_func
|
||
|
||
swiglu_limit_func(output, input, clamp_limit, topk_ids, expert_map)
|
||
else:
|
||
# Fused silu(clamp(gate)) * clamp(up); equivalent to swiglu_limit_func.
|
||
torch.ops._C.silu_and_mul_with_clamp(output, input, clamp_limit, 1.0, 0.0)
|
||
|
||
|
||
def apply_moe_activation(
|
||
activation: MoEActivation,
|
||
output: torch.Tensor,
|
||
input: torch.Tensor,
|
||
*,
|
||
clamp_limit: float | None = None,
|
||
alpha: float = 1.0,
|
||
beta: float = 0.0,
|
||
topk_ids: torch.Tensor | None = None,
|
||
expert_map: torch.Tensor | None = None,
|
||
activation_situ_beta: float | None = None,
|
||
activation_situ_linear_beta: float | None = None,
|
||
) -> torch.Tensor:
|
||
"""Apply MoE activation function.
|
||
|
||
``clamp_limit``/``alpha``/``beta`` (from the quant config) drive the clamped
|
||
SwiGLU kernels: ``SILU`` + ``clamp_limit`` and ``SWIGLUOAI_UNINTERLEAVE`` both
|
||
map to ``silu_and_mul_with_clamp``. Other activations ignore them.
|
||
"""
|
||
assert input.dim() == 2, "Input must be 2D"
|
||
assert output.dim() == 2, "Output must be 2D"
|
||
if activation.is_gated:
|
||
assert output.size(-1) * 2 == input.size(-1), (
|
||
f"{activation.value} expects 2x ratio: "
|
||
f"{output.size(-1) * 2} vs {input.size(-1)}"
|
||
)
|
||
else:
|
||
assert output.size(-1) == input.size(-1), (
|
||
f"{activation.value} expects equal sizes: "
|
||
f"{output.size(-1)} vs {input.size(-1)}"
|
||
)
|
||
|
||
# Activations with gated multiplication (gate × activation(up))
|
||
if activation == MoEActivation.SILU:
|
||
if clamp_limit is not None:
|
||
silu_and_mul_with_clamp(output, input, clamp_limit, topk_ids, expert_map)
|
||
else:
|
||
torch.ops._C.silu_and_mul(output, input)
|
||
elif activation == MoEActivation.GELU:
|
||
torch.ops._C.gelu_and_mul(output, input)
|
||
elif activation == MoEActivation.GELU_TANH:
|
||
torch.ops._C.gelu_tanh_and_mul(output, input)
|
||
elif activation == MoEActivation.SITU:
|
||
# Fused CUDA kernel: writes straight to `output`, no fp32 temporaries.
|
||
# (The pure-torch fallback below upcast both halves to fp32 and
|
||
# allocated ~8 temporaries per call, blowing up MoE memory.)
|
||
# Both betas come from FusedMoEConfig; a missing beta means the caller
|
||
# bypassed the config plumbing, so fail rather than silently use 1.0.
|
||
# linear_beta is genuinely optional: <= 0 signals "unset" to the kernel
|
||
# (up passed through), matching SituAndMul(linear_beta=None).
|
||
assert activation_situ_beta is not None, (
|
||
"SITU requires activation_situ_beta from FusedMoEConfig"
|
||
)
|
||
torch.ops._C.situ_and_mul(
|
||
output,
|
||
input,
|
||
activation_situ_beta,
|
||
-1.0
|
||
if activation_situ_linear_beta is None
|
||
else activation_situ_linear_beta,
|
||
)
|
||
elif activation == MoEActivation.SWIGLUOAI:
|
||
torch.ops._C.swigluoai_and_mul(output, input)
|
||
elif activation == MoEActivation.SWIGLUOAI_UNINTERLEAVE:
|
||
# SwiGLU-OAI on packed w13 (gate = first half, up = second half).
|
||
assert clamp_limit is not None, "SWIGLUOAI_UNINTERLEAVE requires clamp_limit"
|
||
torch.ops._C.silu_and_mul_with_clamp(output, input, clamp_limit, alpha, beta)
|
||
elif activation == MoEActivation.SWIGLUSTEP:
|
||
from vllm.model_executor.layers.activation import swiglustep_and_mul_triton
|
||
|
||
swiglustep_and_mul_triton(output, input)
|
||
|
||
# Activations without gated multiplication
|
||
elif activation == MoEActivation.SILU_NO_MUL:
|
||
output.copy_(F.silu(input))
|
||
elif activation == MoEActivation.GELU_NO_MUL:
|
||
output.copy_(F.gelu(input))
|
||
elif activation == MoEActivation.GELU_TANH_NO_MUL:
|
||
output.copy_(F.gelu(input, approximate="tanh"))
|
||
elif activation == MoEActivation.RELU2_NO_MUL:
|
||
F.relu(input, inplace=True)
|
||
torch.square(input, out=output)
|
||
else:
|
||
raise ValueError(f"Unsupported FusedMoe activation: {activation}")
|
||
|
||
return output
|