fix(moe): repair dead import in fused_moe_native after MoE refactor (#24069)

This commit is contained in:
Xinyuan Tong
2026-04-29 11:14:52 -07:00
committed by GitHub
parent 530b497a48
commit 1376761841
2 changed files with 6 additions and 4 deletions
@@ -7,8 +7,10 @@ import torch
from torch.nn import functional as F
from sglang.srt.layers.activation import GeluAndMul, SiluAndMul
from sglang.srt.layers.moe.fused_moe_triton.fused_moe import swiglu_with_alpha_and_limit
from sglang.srt.layers.moe.moe_runner import MoeRunnerConfig
from sglang.srt.layers.moe.moe_runner.triton_utils.fused_moe import (
swiglu_gpt_oss_sigmoid_alpha,
)
from sglang.srt.layers.moe.token_dispatcher import (
StandardCombineInput,
StandardDispatchOutput,
@@ -112,7 +114,7 @@ def moe_forward_native(
and moe_runner_config.gemm1_alpha is not None
):
assert moe_runner_config.gemm1_clamp_limit is not None
gate_up = swiglu_with_alpha_and_limit(
gate_up = swiglu_gpt_oss_sigmoid_alpha(
gate_up,
moe_runner_config.gemm1_alpha,
moe_runner_config.gemm1_clamp_limit,
@@ -312,7 +312,7 @@ def _swiglu_silu_clamp_mul(x, gemm1_limit):
@torch.compile
def _swiglu_gpt_oss_sigmoid_alpha(x, gemm1_alpha, gemm1_limit):
def swiglu_gpt_oss_sigmoid_alpha(x, gemm1_alpha, gemm1_limit):
# NOTE: This variant uses gemm1_alpha, unlike _swiglu_silu_clamp_mul.
# At present, only GPT-OSS uses this variant.
gate, up = x[..., ::2], x[..., 1::2]
@@ -521,7 +521,7 @@ def _fused_moe_kernel_sequence(
# - gemm1_alpha == None and gemm1_limit != None: silu+clamp+mul(limit-only)
if gemm1_alpha is not None:
assert gemm1_limit is not None
intermediate_cache2 = _swiglu_gpt_oss_sigmoid_alpha(
intermediate_cache2 = swiglu_gpt_oss_sigmoid_alpha(
intermediate_cache1.view(-1, N), gemm1_alpha, gemm1_limit
)
elif gemm1_limit is not None: