Add dedicated FlashInferCuteDslMoE layer for standard-path FP4 MoE (#21339)
This commit is contained in:
@@ -0,0 +1,353 @@
|
||||
from __future__ import annotations
|
||||
|
||||
import logging
|
||||
from dataclasses import dataclass
|
||||
from typing import TYPE_CHECKING, Any
|
||||
|
||||
import torch
|
||||
|
||||
from sglang.srt.layers.moe.moe_runner.base import (
|
||||
MoeQuantInfo,
|
||||
MoeRunnerConfig,
|
||||
register_fused_func,
|
||||
)
|
||||
from sglang.srt.utils.common import log_info_on_rank0, print_warning_once
|
||||
|
||||
if TYPE_CHECKING:
|
||||
from sglang.srt.layers.moe.token_dispatcher import (
|
||||
StandardCombineInput,
|
||||
StandardDispatchOutput,
|
||||
)
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
_FP4_SF_VEC_SIZE = 16
|
||||
_cutedsl_logged_scalarize: set = set()
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Weight / scale preparation utilities (called from modelopt_quant.py during
|
||||
# process_weights_after_loading and lazy wrapper init)
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
|
||||
def interleave_w13_halves(
|
||||
tensor: torch.Tensor, group_size: int = 64, dim: int = 1
|
||||
) -> torch.Tensor:
|
||||
"""Interleave the two logical W13 halves for CuteDSL's SwiGLU GEMM1 layout.
|
||||
|
||||
The caller is responsible for loading W13 in the expected two-half order.
|
||||
This helper only rewrites the first and second halves into alternating
|
||||
`group_size` chunks along `dim`.
|
||||
"""
|
||||
if tensor.shape[dim] % 2 != 0:
|
||||
raise ValueError(
|
||||
"Expected even size on interleave dimension for W13 half split."
|
||||
)
|
||||
split = tensor.shape[dim] // 2
|
||||
if split % group_size != 0:
|
||||
raise ValueError(
|
||||
f"Expected split dim divisible by group_size={group_size}, got {split}."
|
||||
)
|
||||
first_half = tensor.narrow(dim, 0, split)
|
||||
second_half = tensor.narrow(dim, split, split)
|
||||
first_half_groups = first_half.split(group_size, dim=dim)
|
||||
second_half_groups = second_half.split(group_size, dim=dim)
|
||||
interleaved = [
|
||||
item for pair in zip(first_half_groups, second_half_groups) for item in pair
|
||||
]
|
||||
return torch.cat(interleaved, dim=dim)
|
||||
|
||||
|
||||
def cutedsl_quant_scale_to_scalar(
|
||||
quant_scale: torch.Tensor,
|
||||
*,
|
||||
name: str,
|
||||
) -> torch.Tensor:
|
||||
"""Reduce per-expert quant-domain scale vector to a single scalar.
|
||||
|
||||
The quant domain is the reciprocal of the raw checkpoint scale:
|
||||
quant_scale = 1 / raw_scale
|
||||
|
||||
Returns min(quant_scale) = 1/max(raw_scale), which is the TRTLLM CuteDSL
|
||||
convention for global scalar activation scales (see TRTLLM quantization.py
|
||||
lines 2137-2141: fc2_input_scale = tmp_fc2_input_scale.max().reciprocal()).
|
||||
|
||||
If quant_scale is already scalar (numel==1), returns it unchanged.
|
||||
"""
|
||||
quant_scale = quant_scale.to(torch.float32)
|
||||
if quant_scale.numel() == 0:
|
||||
print_warning_once(
|
||||
f"CuteDSL got empty {name}; using 1.0 fallback.",
|
||||
)
|
||||
return torch.ones(1, device=quant_scale.device, dtype=torch.float32)
|
||||
if quant_scale.numel() == 1:
|
||||
return quant_scale.reshape(1)
|
||||
if name not in _cutedsl_logged_scalarize:
|
||||
log_info_on_rank0(
|
||||
logger,
|
||||
f"CuteDSL: reducing per-expert {name} to scalar via "
|
||||
"min(quant_scale) = 1/max(raw_scale), matching TRTLLM convention.",
|
||||
)
|
||||
_cutedsl_logged_scalarize.add(name)
|
||||
return quant_scale.min().reshape(1)
|
||||
|
||||
|
||||
def resolve_cutedsl_standard_scales(
|
||||
layer: torch.nn.Module,
|
||||
) -> tuple[torch.Tensor, torch.Tensor, torch.Tensor, torch.Tensor]:
|
||||
"""Resolve standard-path CuteDSL scales (baseline: scalar fc2/w13 input scales).
|
||||
|
||||
Returns (w1_alpha, fc2_input_scale, w2_alpha, used_input_scale).
|
||||
used_input_scale is the scalarized w13 input scale for FP4 quantize and GEMM1.
|
||||
"""
|
||||
|
||||
def _to_fp32_tensor(x: torch.Tensor | float, ref: torch.Tensor) -> torch.Tensor:
|
||||
if not isinstance(x, torch.Tensor):
|
||||
x = torch.tensor(x, device=ref.device)
|
||||
return x.to(device=ref.device, dtype=torch.float32)
|
||||
|
||||
def _align_scale_to_alpha(
|
||||
scale: torch.Tensor, alpha: torch.Tensor, scale_name: str
|
||||
) -> torch.Tensor:
|
||||
scale = scale.to(device=alpha.device, dtype=torch.float32)
|
||||
alpha = alpha.to(torch.float32)
|
||||
if scale.ndim == 0:
|
||||
return scale
|
||||
# Gated weight scales may be (num_experts, 2) with separate gate/up
|
||||
# columns. Collapse to 1D by taking the first column (gate == up for
|
||||
# well-formed checkpoints; mismatch is warned in process_weights_after_loading).
|
||||
if scale.ndim == 2 and scale.shape[1] <= 2:
|
||||
scale = scale[:, 0]
|
||||
if scale.numel() == alpha.numel():
|
||||
return scale
|
||||
if scale.numel() == 1:
|
||||
return scale.reshape(())
|
||||
|
||||
# Some EP setups may carry global-per-expert scale vectors while alphas are
|
||||
# local-per-expert vectors. Slice to this rank's local expert range.
|
||||
num_local_experts = getattr(layer, "num_local_experts", None)
|
||||
num_experts = getattr(layer, "num_experts", None)
|
||||
moe_ep_rank = getattr(layer, "moe_ep_rank", 0)
|
||||
if (
|
||||
num_local_experts is not None
|
||||
and num_experts is not None
|
||||
and scale.numel() == num_experts
|
||||
and alpha.numel() == num_local_experts
|
||||
):
|
||||
start = moe_ep_rank * num_local_experts
|
||||
end = start + num_local_experts
|
||||
return scale[start:end]
|
||||
|
||||
raise ValueError(
|
||||
f"Unable to align {scale_name} shape={tuple(scale.shape)} "
|
||||
f"to alpha shape={tuple(alpha.shape)} for CuteDSL standard scale resolution."
|
||||
)
|
||||
|
||||
def _resolve_w1_alpha_from_scalar_input_scale(
|
||||
used_input_scale: torch.Tensor,
|
||||
) -> torch.Tensor:
|
||||
"""Resolve GEMM1 alpha consistent with scalarized activation quant scale.
|
||||
|
||||
CuteDSL pre-quantizes x with a single scalar (used_input_scale), but
|
||||
g1_alphas was derived with per-expert activation scales:
|
||||
g1_alphas[e] = (1/w13_isq[e]) * w13_ws2[e]
|
||||
Correct alpha for scalar quantization:
|
||||
w1_alpha[e] = w13_ws2[e] / used_input_scale
|
||||
= g1_alphas[e] * w13_isq[e] / used_input_scale
|
||||
When w13_isq is already scalar, this is a no-op (ratio = 1).
|
||||
"""
|
||||
eps = 1e-12
|
||||
scalar = torch.clamp(used_input_scale.to(torch.float32).reshape(()), min=eps)
|
||||
|
||||
if hasattr(layer, "w13_weight_scale_2"):
|
||||
w13_weight_scale_2 = _align_scale_to_alpha(
|
||||
layer.w13_weight_scale_2, layer.g1_alphas, "w13_weight_scale_2"
|
||||
)
|
||||
return w13_weight_scale_2.to(torch.float32) / scalar
|
||||
|
||||
w13_isq = _align_scale_to_alpha(
|
||||
layer.w13_input_scale_quant, layer.g1_alphas, "w13_input_scale_quant"
|
||||
)
|
||||
w13_isq = torch.clamp(_to_fp32_tensor(w13_isq, layer.g1_alphas), min=eps)
|
||||
return (layer.g1_alphas.to(torch.float32) * w13_isq / scalar).to(torch.float32)
|
||||
|
||||
def _resolve_w2_alpha_from_scalar_fc2_input_scale(
|
||||
fc2_input_scale: torch.Tensor,
|
||||
) -> torch.Tensor:
|
||||
"""Resolve GEMM2 alpha consistent with scalarized FC2 input scale.
|
||||
|
||||
CuteDSL standard path uses a scalar global scale for GEMM1 FP4 output
|
||||
quantization (`fc2_input_scale`). GEMM2 alpha must use the same scalar
|
||||
convention: alpha2 = w2_weight_scale_2 / fc2_input_scale.
|
||||
"""
|
||||
eps = 1e-12
|
||||
fc2_input_scale = fc2_input_scale.to(torch.float32)
|
||||
fc2_scalar = torch.clamp(fc2_input_scale.reshape(-1)[:1], min=eps).reshape(())
|
||||
|
||||
if hasattr(layer, "w2_weight_scale_2"):
|
||||
w2_weight_scale_2 = _align_scale_to_alpha(
|
||||
layer.w2_weight_scale_2, layer.g2_alphas, "w2_weight_scale_2"
|
||||
)
|
||||
w2_weight_scale_2 = w2_weight_scale_2.to(torch.float32)
|
||||
return w2_weight_scale_2 / fc2_scalar
|
||||
|
||||
w2_q_for_w2 = _align_scale_to_alpha(
|
||||
layer.w2_input_scale_quant, layer.g2_alphas, "w2_input_scale_quant"
|
||||
)
|
||||
w2_q_for_w2 = torch.clamp(
|
||||
_to_fp32_tensor(w2_q_for_w2, layer.g2_alphas), min=eps
|
||||
)
|
||||
w2_weight_scale_2 = layer.g2_alphas.to(torch.float32) * w2_q_for_w2
|
||||
return w2_weight_scale_2 / fc2_scalar
|
||||
|
||||
fc2_input_scale = cutedsl_quant_scale_to_scalar(
|
||||
layer.w2_input_scale_quant,
|
||||
name="w2_input_scale_quant",
|
||||
)
|
||||
w2_alpha = _resolve_w2_alpha_from_scalar_fc2_input_scale(fc2_input_scale)
|
||||
used_input_scale = cutedsl_quant_scale_to_scalar(
|
||||
layer.w13_input_scale_quant,
|
||||
name="w13_input_scale_quant",
|
||||
)
|
||||
w1_alpha = _resolve_w1_alpha_from_scalar_input_scale(used_input_scale)
|
||||
return w1_alpha, fc2_input_scale, w2_alpha, used_input_scale
|
||||
|
||||
|
||||
def ensure_cutedsl_wrapper(layer: torch.nn.Module) -> None:
|
||||
"""Lazily create CuteDslMoEWrapper and resolve scales on first forward.
|
||||
|
||||
The wrapper is created lazily (not in __init__ / create_weights) because
|
||||
it depends on final weight shapes and EP configuration. The wrapper's
|
||||
CUDA-graph buffers are allocated inside CuteDslMoEWrapper.__init__, which
|
||||
typically runs during the autotune dummy forward under inference_mode().
|
||||
We wrap the creation in inference_mode(False) so that those pre-allocated
|
||||
buffers are normal tensors -- inference tensors cannot be inplace-updated
|
||||
during later CUDA graph capture, which runs outside inference_mode.
|
||||
"""
|
||||
if getattr(layer, "_cutedsl_wrapper", None) is not None:
|
||||
return
|
||||
|
||||
try:
|
||||
from flashinfer import CuteDslMoEWrapper
|
||||
except ImportError as e:
|
||||
raise ImportError(
|
||||
"flashinfer_cutedsl backend requires FlashInfer with CuteDSL support. "
|
||||
"Install with: pip install flashinfer"
|
||||
) from e
|
||||
|
||||
from sglang.srt.server_args import get_global_server_args
|
||||
|
||||
assert layer.intermediate_size_per_partition > 0, (
|
||||
f"CuteDSL MoE: intermediate_size_per_partition must be > 0, "
|
||||
f"got {layer.intermediate_size_per_partition}. Check EP/TP configuration."
|
||||
)
|
||||
|
||||
server_args = get_global_server_args()
|
||||
use_cuda_graph = server_args is not None and not server_args.disable_cuda_graph
|
||||
max_num_tokens = max(
|
||||
getattr(server_args, "cuda_graph_max_bs", None) or 512,
|
||||
getattr(server_args, "chunked_prefill_size", None) or 8192,
|
||||
)
|
||||
top_k = layer.top_k if layer.top_k is not None else layer.moe_runner_config.top_k
|
||||
# inference_mode(False) ensures the wrapper's pre-allocated CUDA-graph
|
||||
# buffers are normal tensors. This call typically happens inside
|
||||
# _dummy_run which runs under inference_mode(); inference tensors cannot
|
||||
# be inplace-updated during later CUDA graph capture (which runs outside
|
||||
# inference_mode), so we must opt out here.
|
||||
with torch.inference_mode(False):
|
||||
layer._cutedsl_wrapper = CuteDslMoEWrapper(
|
||||
num_experts=layer.num_experts,
|
||||
top_k=top_k,
|
||||
hidden_size=layer.hidden_size,
|
||||
intermediate_size=layer.intermediate_size_per_partition,
|
||||
use_cuda_graph=use_cuda_graph,
|
||||
max_num_tokens=max_num_tokens,
|
||||
num_local_experts=layer.num_local_experts,
|
||||
local_expert_offset=layer.moe_ep_rank * layer.num_local_experts,
|
||||
output_dtype=layer.moe_runner_config.params_dtype,
|
||||
device=str(layer.w13_weight.device),
|
||||
)
|
||||
|
||||
w1_alpha, fc2_input_scale, w2_alpha, used_input_scale = (
|
||||
resolve_cutedsl_standard_scales(layer)
|
||||
)
|
||||
layer._cutedsl_scales = (w1_alpha, fc2_input_scale, w2_alpha)
|
||||
layer._cutedsl_input_scale = used_input_scale
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Dataclass + fused function for moe_runner dispatch
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
|
||||
@dataclass
|
||||
class CuteDslFp4MoeQuantInfo(MoeQuantInfo):
|
||||
"""Quantization payload consumed by FlashInfer CuteDSL FP4 MoE kernels."""
|
||||
|
||||
# Lazily-created CuteDslMoEWrapper (stashed on layer)
|
||||
wrapper: Any
|
||||
|
||||
# Weights (uint8 FP4 packed)
|
||||
w13_weight: torch.Tensor
|
||||
w2_weight: torch.Tensor
|
||||
|
||||
# Block-scale factors
|
||||
w13_weight_sf: torch.Tensor
|
||||
w2_weight_sf: torch.Tensor
|
||||
|
||||
# Per-expert GEMM scales
|
||||
w1_alpha: torch.Tensor
|
||||
w2_alpha: torch.Tensor
|
||||
|
||||
# Intermediate quantization scale (fc2 input)
|
||||
fc2_input_scale: torch.Tensor
|
||||
|
||||
# Activation quantization scale (scalarized)
|
||||
input_scale: torch.Tensor
|
||||
|
||||
|
||||
@register_fused_func("none", "flashinfer_cutedsl")
|
||||
def fused_experts_none_to_flashinfer_cutedsl_fp4(
|
||||
dispatch_output: StandardDispatchOutput,
|
||||
quant_info: CuteDslFp4MoeQuantInfo,
|
||||
runner_config: MoeRunnerConfig,
|
||||
) -> StandardCombineInput:
|
||||
from flashinfer import fp4_quantize
|
||||
|
||||
from sglang.srt.layers.moe.token_dispatcher.standard import StandardCombineInput
|
||||
from sglang.srt.layers.moe.topk import TopKOutputChecker
|
||||
|
||||
assert runner_config.activation == "silu", "Only silu is supported for CuteDSL MoE."
|
||||
|
||||
hidden_states = dispatch_output.hidden_states
|
||||
topk_output = dispatch_output.topk_output
|
||||
assert TopKOutputChecker.format_is_standard(topk_output)
|
||||
|
||||
topk_ids = topk_output.topk_ids
|
||||
topk_weights = topk_output.topk_weights
|
||||
if topk_ids.dtype != torch.int32:
|
||||
topk_ids = topk_ids.to(torch.int32)
|
||||
|
||||
x_fp4, x_sf = fp4_quantize(
|
||||
hidden_states,
|
||||
quant_info.input_scale,
|
||||
sf_vec_size=_FP4_SF_VEC_SIZE,
|
||||
is_sf_swizzled_layout=False,
|
||||
)
|
||||
|
||||
output = quant_info.wrapper.run(
|
||||
x=x_fp4,
|
||||
x_sf=x_sf,
|
||||
token_selected_experts=topk_ids,
|
||||
token_final_scales=topk_weights,
|
||||
w1_weight=quant_info.w13_weight,
|
||||
w1_weight_sf=quant_info.w13_weight_sf,
|
||||
w1_alpha=quant_info.w1_alpha,
|
||||
fc2_input_scale=quant_info.fc2_input_scale,
|
||||
w2_weight=quant_info.w2_weight,
|
||||
w2_weight_sf=quant_info.w2_weight_sf,
|
||||
w2_alpha=quant_info.w2_alpha,
|
||||
)
|
||||
|
||||
return StandardCombineInput(hidden_states=output)
|
||||
@@ -54,6 +54,8 @@ class MoeRunner:
|
||||
or runner_backend.is_flashinfer_trtllm_routed()
|
||||
):
|
||||
self.runner_core = None # FlashInfer TRT-LLM only supports fused path
|
||||
elif runner_backend.is_flashinfer_cutedsl():
|
||||
self.runner_core = None # FlashInfer CuteDSL only supports fused path
|
||||
else:
|
||||
raise NotImplementedError(f"Unsupported runner backend: {runner_backend}")
|
||||
|
||||
|
||||
@@ -88,8 +88,14 @@ class StandardDispatcher(BaseDispatcher):
|
||||
def __init__(self, moe_runner_config: MoeRunnerConfig):
|
||||
super().__init__()
|
||||
self.moe_ep_size = get_moe_expert_parallel_world_size()
|
||||
self.enable_flashinfer_cutlass_moe = (
|
||||
get_moe_runner_backend().is_flashinfer_cutlass()
|
||||
backend = get_moe_runner_backend()
|
||||
self.enable_flashinfer_cutlass_moe = backend.is_flashinfer_cutlass()
|
||||
# FlashInfer CUTLASS and CuteDSL handle EP internally with global expert IDs.
|
||||
# Skip local expert mapping so topk_ids stay in global space.
|
||||
self.skip_local_expert_mapping = (
|
||||
backend.is_flashinfer_cutlass()
|
||||
or backend.is_flashinfer_cutedsl()
|
||||
or backend.is_flashinfer_trtllm_routed()
|
||||
)
|
||||
self.enable_flashinfer_trtllm_routed_moe = (
|
||||
get_moe_runner_backend().is_flashinfer_trtllm_routed()
|
||||
@@ -149,8 +155,7 @@ class StandardDispatcher(BaseDispatcher):
|
||||
|
||||
if (
|
||||
self.moe_ep_size > 1
|
||||
and not self.enable_flashinfer_cutlass_moe
|
||||
and not self.enable_flashinfer_trtllm_routed_moe
|
||||
and not self.skip_local_expert_mapping
|
||||
and TopKOutputChecker.format_is_standard(topk_output)
|
||||
):
|
||||
if self.local_expert_mapping is None:
|
||||
|
||||
@@ -51,7 +51,6 @@ from sglang.srt.layers.quantization.utils import (
|
||||
from sglang.srt.layers.radix_attention import RadixAttention
|
||||
from sglang.srt.layers.utils import copy_or_rebind_param
|
||||
from sglang.srt.utils.common import (
|
||||
get_bool_env_var,
|
||||
is_cuda,
|
||||
is_sm120_supported,
|
||||
next_power_of_2,
|
||||
@@ -167,10 +166,6 @@ if is_cuda() and (not is_sm120_supported()) and (fp4_quantize is not None):
|
||||
return
|
||||
|
||||
|
||||
CUTEDSL_MOE_SCALAR_INPUT_SCALE = get_bool_env_var(
|
||||
"SGLANG_CUTEDSL_MOE_SCALAR_INPUT_SCALE", "true"
|
||||
)
|
||||
|
||||
# FP4 GEMM alignment constant - CUTLASS/FlashInfer kernels require dimensions divisible by 32
|
||||
FP4_GEMM_ALIGNMENT = 32
|
||||
|
||||
@@ -993,9 +988,10 @@ class ModelOptFp8MoEMethod(FusedMoEMethodBase):
|
||||
) -> CombineInput:
|
||||
x = dispatch_output.hidden_states
|
||||
topk_output = dispatch_output.topk_output
|
||||
from sglang.srt.layers.moe.token_dispatcher import StandardCombineInput
|
||||
from sglang.srt.layers.moe.topk import TopKOutputChecker
|
||||
|
||||
# Fast path: TRT-LLM FP8 per-tensor MoE using BYPASSED TopK routing
|
||||
from sglang.srt.layers.moe.topk import TopKOutputChecker
|
||||
|
||||
if (
|
||||
get_moe_runner_backend().is_flashinfer_trtllm()
|
||||
@@ -1089,8 +1085,6 @@ class ModelOptFp8MoEMethod(FusedMoEMethodBase):
|
||||
activation_type=activation,
|
||||
)[0]
|
||||
|
||||
from sglang.srt.layers.moe.token_dispatcher import StandardCombineInput
|
||||
|
||||
return StandardCombineInput(hidden_states=output)
|
||||
|
||||
quant_info = TritonMoeQuantInfo(
|
||||
@@ -1547,9 +1541,9 @@ class ModelOptNvFp4FusedMoEMethod(FusedMoEMethodBase):
|
||||
|
||||
@property
|
||||
def enable_flashinfer_cutedsl_moe(self) -> bool:
|
||||
"""Access the global enable_flashinfer_cutedsl_moe setting."""
|
||||
from sglang.srt.layers.moe import get_moe_runner_backend
|
||||
|
||||
"""Access the global enable_flashinfer_cutedsl_moe setting."""
|
||||
return get_moe_runner_backend().is_flashinfer_cutedsl()
|
||||
|
||||
def create_weights(
|
||||
@@ -1714,19 +1708,12 @@ class ModelOptNvFp4FusedMoEMethod(FusedMoEMethodBase):
|
||||
w13_input_scale = layer.w13_input_scale.max().to(torch.float32)
|
||||
w2_input_scale = layer.w2_input_scale.max().to(torch.float32)
|
||||
elif self.enable_flashinfer_cutedsl_moe:
|
||||
# All-expert-one-input-scale is mathematically different from default per-expert-input-scale
|
||||
# Thus we allow users to switch the flag to do thorough testing
|
||||
if CUTEDSL_MOE_SCALAR_INPUT_SCALE:
|
||||
w13_input_scale = (
|
||||
layer.w13_input_scale.max()
|
||||
.to(torch.float32)
|
||||
.repeat(layer.w13_input_scale.shape[0])
|
||||
)
|
||||
else:
|
||||
w13_input_scale = layer.w13_input_scale.max(dim=1).values.to(
|
||||
torch.float32
|
||||
)
|
||||
|
||||
# CuteDSL standard path uses a single scalar input scale (all experts).
|
||||
w13_input_scale = (
|
||||
layer.w13_input_scale.max()
|
||||
.to(torch.float32)
|
||||
.repeat(layer.w13_input_scale.shape[0])
|
||||
)
|
||||
w2_input_scale = layer.w2_input_scale
|
||||
|
||||
def _slice_scale(w):
|
||||
@@ -1825,6 +1812,26 @@ class ModelOptNvFp4FusedMoEMethod(FusedMoEMethodBase):
|
||||
else:
|
||||
# CUTLASS processing - handle w13 and w2 separately
|
||||
|
||||
if self.enable_flashinfer_cutedsl_moe and layer.moe_runner_config.is_gated:
|
||||
# For the CuteDSL FP4 path, interleave the two logical W13 halves
|
||||
# in 64-row chunks before swizzling the block-scales.
|
||||
from sglang.srt.layers.moe.moe_runner.flashinfer_cutedsl import (
|
||||
interleave_w13_halves,
|
||||
)
|
||||
|
||||
layer.w13_weight = Parameter(
|
||||
interleave_w13_halves(
|
||||
layer.w13_weight.view(torch.uint8), group_size=64, dim=1
|
||||
).contiguous(),
|
||||
requires_grad=False,
|
||||
)
|
||||
layer.w13_weight_scale = Parameter(
|
||||
interleave_w13_halves(
|
||||
layer.w13_weight_scale, group_size=64, dim=1
|
||||
).contiguous(),
|
||||
requires_grad=False,
|
||||
)
|
||||
|
||||
# Process w13 weights
|
||||
w13_blockscale_swizzled = swizzle_blockscale(layer.w13_weight_scale)
|
||||
copy_or_rebind_param(
|
||||
@@ -1869,6 +1876,45 @@ class ModelOptNvFp4FusedMoEMethod(FusedMoEMethodBase):
|
||||
layer, "w2_blockscale_swizzled", w2_blockscale_swizzled
|
||||
)
|
||||
|
||||
if self.enable_flashinfer_cutedsl_moe:
|
||||
# CuteDSL expects MMA layout for weight scales. Convert from swizzled bytes.
|
||||
from flashinfer.cute_dsl.utils import convert_sf_to_mma_layout
|
||||
|
||||
from sglang.srt.layers.moe.moe_runner.flashinfer_cutedsl import (
|
||||
_FP4_SF_VEC_SIZE,
|
||||
)
|
||||
|
||||
sf_vec_size = _FP4_SF_VEC_SIZE
|
||||
num_local_experts = layer.w13_weight.shape[0]
|
||||
w13_m = layer.w13_weight.shape[1]
|
||||
w13_k = layer.w13_weight.shape[2] * 2
|
||||
w2_m = layer.w2_weight.shape[1]
|
||||
w2_k = layer.w2_weight.shape[2] * 2
|
||||
layer.w13_blockscale_mma = Parameter(
|
||||
convert_sf_to_mma_layout(
|
||||
layer.w13_blockscale_swizzled.contiguous()
|
||||
.view(torch.uint8)
|
||||
.reshape(-1),
|
||||
m=w13_m,
|
||||
k=w13_k,
|
||||
num_groups=num_local_experts,
|
||||
sf_vec_size=sf_vec_size,
|
||||
),
|
||||
requires_grad=False,
|
||||
)
|
||||
layer.w2_blockscale_mma = Parameter(
|
||||
convert_sf_to_mma_layout(
|
||||
layer.w2_blockscale_swizzled.contiguous()
|
||||
.view(torch.uint8)
|
||||
.reshape(-1),
|
||||
m=w2_m,
|
||||
k=w2_k,
|
||||
num_groups=num_local_experts,
|
||||
sf_vec_size=sf_vec_size,
|
||||
),
|
||||
requires_grad=False,
|
||||
)
|
||||
|
||||
# Both flashinfer cutlass and regular cutlass use same processing for w2
|
||||
|
||||
# Set up CUTLASS MoE parameters (reuse to keep CUDA graph stable)
|
||||
@@ -1894,27 +1940,34 @@ class ModelOptNvFp4FusedMoEMethod(FusedMoEMethodBase):
|
||||
|
||||
@property
|
||||
def load_up_proj_weight_first(self) -> bool:
|
||||
# FlashInfer CUTLASS kernel assumes [Up, Gate] Proj as W13
|
||||
return self.enable_flashinfer_cutlass_moe and self.moe_runner_config.is_gated
|
||||
# Load W13 as [Up, Gate] for FlashInfer CUTLASS/CuteDSL kernels.
|
||||
return self.moe_runner_config.is_gated and (
|
||||
self.enable_flashinfer_cutlass_moe or self.enable_flashinfer_cutedsl_moe
|
||||
)
|
||||
|
||||
def create_moe_runner(
|
||||
self, layer: torch.nn.Module, moe_runner_config: MoeRunnerConfig
|
||||
):
|
||||
self.moe_runner_config = moe_runner_config
|
||||
if get_moe_runner_backend().is_flashinfer_trtllm():
|
||||
self.runner = MoeRunner(
|
||||
MoeRunnerBackend.FLASHINFER_TRTLLM, moe_runner_config
|
||||
)
|
||||
elif get_moe_runner_backend().is_flashinfer_trtllm_routed():
|
||||
self.runner = MoeRunner(
|
||||
MoeRunnerBackend.FLASHINFER_TRTLLM_ROUTED, moe_runner_config
|
||||
)
|
||||
moe_runner_backend = get_moe_runner_backend()
|
||||
|
||||
if moe_runner_backend.is_auto():
|
||||
# TRTLLM is currently the most performant and tested FP4 MoE
|
||||
# backend, so use it as the default.
|
||||
moe_runner_backend = MoeRunnerBackend.FLASHINFER_TRTLLM
|
||||
|
||||
if moe_runner_backend.is_flashinfer_cutedsl():
|
||||
import sglang.srt.layers.moe.moe_runner.flashinfer_cutedsl # noqa: F401 – triggers @register_fused_func
|
||||
|
||||
if not moe_runner_backend.is_flashinfer_cutlass():
|
||||
self.runner = MoeRunner(moe_runner_backend, moe_runner_config)
|
||||
|
||||
def apply(
|
||||
self,
|
||||
layer: FusedMoE,
|
||||
dispatch_output: StandardDispatchOutput,
|
||||
) -> CombineInput:
|
||||
from sglang.srt.layers.moe.token_dispatcher import StandardCombineInput
|
||||
|
||||
x = dispatch_output.hidden_states
|
||||
x_sf = dispatch_output.hidden_states_scale
|
||||
@@ -1958,6 +2011,33 @@ class ModelOptNvFp4FusedMoEMethod(FusedMoEMethodBase):
|
||||
|
||||
return self.runner.run(dispatch_output, quant_info)
|
||||
|
||||
if self.enable_flashinfer_cutedsl_moe:
|
||||
from sglang.srt.layers.moe.moe_runner.flashinfer_cutedsl import (
|
||||
CuteDslFp4MoeQuantInfo,
|
||||
ensure_cutedsl_wrapper,
|
||||
)
|
||||
|
||||
ensure_cutedsl_wrapper(layer)
|
||||
w1_alpha, fc2_input_scale, w2_alpha = layer._cutedsl_scales
|
||||
w1_weight_sf = getattr(
|
||||
layer, "w13_blockscale_mma", layer.w13_blockscale_swizzled
|
||||
)
|
||||
w2_weight_sf = getattr(
|
||||
layer, "w2_blockscale_mma", layer.w2_blockscale_swizzled
|
||||
)
|
||||
quant_info = CuteDslFp4MoeQuantInfo(
|
||||
wrapper=layer._cutedsl_wrapper,
|
||||
w13_weight=layer.w13_weight,
|
||||
w2_weight=layer.w2_weight,
|
||||
w13_weight_sf=w1_weight_sf,
|
||||
w2_weight_sf=w2_weight_sf,
|
||||
w1_alpha=w1_alpha,
|
||||
w2_alpha=w2_alpha,
|
||||
fc2_input_scale=fc2_input_scale,
|
||||
input_scale=layer._cutedsl_input_scale,
|
||||
)
|
||||
return self.runner.run(dispatch_output, quant_info)
|
||||
|
||||
if self.enable_flashinfer_cutlass_moe:
|
||||
from sglang.srt.layers.moe.token_dispatcher import DispatchOutputChecker
|
||||
|
||||
@@ -1997,7 +2077,7 @@ class ModelOptNvFp4FusedMoEMethod(FusedMoEMethodBase):
|
||||
fc2_expert_weights=layer.w2_weight.view(torch.long),
|
||||
output_dtype=output_dtype,
|
||||
input_sf=x_sf,
|
||||
# swizzled_input_sf=not get_moe_a2a_backend().is_flashinfer(),
|
||||
# swizzled_input_sf intentionally omitted; not used for this path.
|
||||
quant_scales=[
|
||||
layer.w13_input_scale_quant,
|
||||
layer.w13_blockscale_swizzled.view(torch.int32),
|
||||
@@ -2015,8 +2095,6 @@ class ModelOptNvFp4FusedMoEMethod(FusedMoEMethodBase):
|
||||
enable_alltoall=get_moe_a2a_backend().is_flashinfer(),
|
||||
)[0]
|
||||
|
||||
from sglang.srt.layers.moe.token_dispatcher import StandardCombineInput
|
||||
|
||||
return StandardCombineInput(hidden_states=output)
|
||||
|
||||
from sglang.srt.layers.moe.cutlass_moe import cutlass_moe_fp4
|
||||
@@ -2038,8 +2116,6 @@ class ModelOptNvFp4FusedMoEMethod(FusedMoEMethodBase):
|
||||
apply_router_weight_on_input=moe_runner_config.apply_router_weight_on_input,
|
||||
).to(x.dtype)
|
||||
# Scale by routed_scaling_factor is fused into select_experts.
|
||||
from sglang.srt.layers.moe.token_dispatcher import StandardCombineInput
|
||||
|
||||
return StandardCombineInput(hidden_states=output)
|
||||
|
||||
def apply_without_routing_weights(
|
||||
|
||||
@@ -2148,6 +2148,7 @@ class ModelRunner(ModelRunnerKVCacheMixin):
|
||||
# TODO: Enable for flashinfer_trtllm_routed once https://github.com/flashinfer-ai/flashinfer/issues/2749 is fixed.
|
||||
# "flashinfer_trtllm_routed",
|
||||
"flashinfer_mxfp4",
|
||||
"flashinfer_cutedsl",
|
||||
# TODO: flashinfer_cutlass will cause some flashinfer compilation errors. To be fixed.
|
||||
# "flashinfer_cutlass",
|
||||
]:
|
||||
|
||||
@@ -2733,6 +2733,26 @@ class ServerArgs:
|
||||
self.tp_size,
|
||||
], "The expert parallel size must be 1 or the same as the tensor parallel size"
|
||||
|
||||
if self.moe_runner_backend == "flashinfer_cutedsl":
|
||||
assert self.quantization in [
|
||||
"modelopt_fp4"
|
||||
], f"Invalid quantization '{self.quantization}'. \nFlashInfer CuteDSL MOE currently supports only: 'modelopt_fp4'."
|
||||
assert self.ep_size in [
|
||||
1,
|
||||
self.tp_size,
|
||||
], "The expert parallel size must be 1 or the same as the tensor parallel size"
|
||||
assert self.moe_a2a_backend in [
|
||||
"none",
|
||||
"deepep",
|
||||
], (
|
||||
f"flashinfer_cutedsl supports moe_a2a_backend='none' (standard path) "
|
||||
f"or 'deepep' (DeepEP low-latency path), got '{self.moe_a2a_backend}'."
|
||||
)
|
||||
self.disable_shared_experts_fusion = True
|
||||
logger.warning(
|
||||
"FlashInfer CuteDSL MoE is enabled. --disable-shared-experts-fusion is automatically set."
|
||||
)
|
||||
|
||||
if self.moe_runner_backend == "flashinfer_trtllm":
|
||||
assert self.quantization in [
|
||||
"modelopt_fp4",
|
||||
|
||||
Reference in New Issue
Block a user