[Kernel][Build] Bump DeepGEMM to the 26/09/30 release and adapt the sparse indexer (#61149)
Signed-off-by: Yongye Zhu <zyy1102000@gmail.com> Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
This commit is contained in:
co-authored by
Claude Opus 5.5
parent
86b1c2ef15
commit
a6009ea85b
@@ -33,7 +33,9 @@ from vllm.model_executor.warmup.jit_warmup_triton_helper import (
|
||||
)
|
||||
from vllm.platforms import current_platform
|
||||
from vllm.triton_utils import tl, triton
|
||||
from vllm.utils.deep_gemm import mqa_logits_use_mx_scales
|
||||
from vllm.utils.math_utils import round_up
|
||||
from vllm.v1.attention.ops.common import pack_ue8m0_x4
|
||||
|
||||
if current_platform.is_rocm():
|
||||
from vllm.platforms.rocm import _ON_GFX950
|
||||
@@ -742,6 +744,7 @@ def _fused_kv_compress_norm_rope_insert_indexer_attn(
|
||||
TOKEN_STRIDE: tl.constexpr, # 128 for indexer
|
||||
SCALE_DIM: tl.constexpr, # 4 for indexer (1 float32)
|
||||
KV_BLOCK_STRIDE: tl.constexpr,
|
||||
MX_SCALE: tl.constexpr, # store the scale as 4 packed UE8M0 bytes
|
||||
):
|
||||
"""Fused compress → RMSNorm → RoPE → FP8 quant → store.
|
||||
|
||||
@@ -878,7 +881,10 @@ def _fused_kv_compress_norm_rope_insert_indexer_attn(
|
||||
|
||||
# Single float32 scale
|
||||
scale_val = tl.exp2(exponent)
|
||||
tl.store(scale_ptr.to(tl.pointer_type(tl.float32)), scale_val)
|
||||
if MX_SCALE:
|
||||
tl.store(scale_ptr.to(tl.pointer_type(tl.int32)), pack_ue8m0_x4(scale_val))
|
||||
else:
|
||||
tl.store(scale_ptr.to(tl.pointer_type(tl.float32)), scale_val)
|
||||
|
||||
|
||||
# =============================================================================
|
||||
@@ -927,6 +933,7 @@ def _fused_kv_compress_norm_rope_insert_indexer_mxfp4_attn(
|
||||
TOKEN_STRIDE: tl.constexpr, # HEAD_SIZE // 2 = 64 packed bytes/token
|
||||
SCALE_DIM: tl.constexpr, # HEAD_SIZE // QUANT_BLOCK = 4 ue8m0 bytes/token
|
||||
KV_BLOCK_STRIDE: tl.constexpr,
|
||||
MX_SCALE: tl.constexpr, # unused for MXFP4 (kept for signature parity)
|
||||
):
|
||||
"""Fused compress → RMSNorm → RoPE → MXFP4 quant → store.
|
||||
|
||||
@@ -1102,6 +1109,7 @@ class FusedKVCompressNormRopeInsertIndexerTritonKernel(
|
||||
block_size: int
|
||||
kv_cache_block_size: int
|
||||
kv_block_stride: int
|
||||
mx_scale: bool
|
||||
|
||||
# Canonical kernel for the launcher's arg_names mapping; the launched
|
||||
# variant (fp8/mxfp4, same arg_names) is picked per call in __call__.
|
||||
@@ -1181,6 +1189,7 @@ class FusedKVCompressNormRopeInsertIndexerTritonKernel(
|
||||
block_size=state_block_size,
|
||||
kv_cache_block_size=kv_cache_block_size,
|
||||
kv_block_stride=kv_block_stride,
|
||||
mx_scale=not use_fp4_cache and mqa_logits_use_mx_scales(),
|
||||
)
|
||||
|
||||
def get_warmup_keys(self, vllm_config: Any) -> list[CompileKey]:
|
||||
@@ -1301,6 +1310,7 @@ class FusedKVCompressNormRopeInsertIndexerTritonKernel(
|
||||
TOKEN_STRIDE=token_stride,
|
||||
SCALE_DIM=scale_dim,
|
||||
KV_BLOCK_STRIDE=kv_cache.stride(0),
|
||||
MX_SCALE=not use_fp4_cache and mqa_logits_use_mx_scales(),
|
||||
num_warps=1,
|
||||
**pdl_kwargs,
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user