[5/N][warmup][DSv4] Migrate NVIDIA CuTeDSL attention kernels (#53566)
Signed-off-by: LopezCastroRoberto <rocastro@redhat.com> Co-authored-by: Codex <codex@openai.com>
This commit is contained in:
co-authored by
Codex
parent
485421b1c3
commit
120ec4ebd2
@@ -5,10 +5,10 @@ from dataclasses import dataclass
|
||||
from typing import Any
|
||||
|
||||
from vllm.model_executor.warmup import jit_warmup_cutedsl_helper
|
||||
from vllm.model_executor.warmup.jit_warmup import kernel_launcher
|
||||
from vllm.model_executor.warmup.jit_warmup_cutedsl_helper import (
|
||||
CuTeDSLLaunchSpec,
|
||||
VllmCuTeDSLJitKernel,
|
||||
cutedsl_kernel_launcher,
|
||||
)
|
||||
|
||||
|
||||
@@ -30,7 +30,7 @@ class _TestCuTeDSLKernel(VllmCuTeDSLJitKernel["_TestCuTeDSLKernel.CompileKey"]):
|
||||
def warmup_inputs(self, compile_key: CompileKey) -> tuple[Any, ...]:
|
||||
return (f"fake-{compile_key.variant}",)
|
||||
|
||||
@cutedsl_kernel_launcher
|
||||
@kernel_launcher
|
||||
def __call__(
|
||||
self,
|
||||
payload: str,
|
||||
@@ -38,7 +38,7 @@ class _TestCuTeDSLKernel(VllmCuTeDSLJitKernel["_TestCuTeDSLKernel.CompileKey"]):
|
||||
variant: int,
|
||||
) -> CuTeDSLLaunchSpec[CompileKey]:
|
||||
compile_key = self.dispatch(variant=variant)
|
||||
return compile_key, (payload,), {"variant": variant}
|
||||
return compile_key, (payload,)
|
||||
|
||||
|
||||
def test_cutedsl_launcher_reuses_compiled_executor(monkeypatch) -> None:
|
||||
@@ -74,3 +74,38 @@ def test_cutedsl_launcher_reuses_compiled_executor(monkeypatch) -> None:
|
||||
(("entry", 2), ("fake-2",)),
|
||||
]
|
||||
assert launch_calls == [(1, ("runtime",)), (2, ("other",))]
|
||||
|
||||
|
||||
def test_cutedsl_launcher_runs_post_launch_finalizer(monkeypatch) -> None:
|
||||
events: list[str] = []
|
||||
|
||||
def compile_cutedsl(entry: tuple[str, int], *args: Any) -> Any:
|
||||
def executor(*runtime_args: Any) -> None:
|
||||
events.append("launch")
|
||||
|
||||
return executor
|
||||
|
||||
class FinalizedKernel(_TestCuTeDSLKernel):
|
||||
@kernel_launcher
|
||||
def __call__(
|
||||
self,
|
||||
payload: str,
|
||||
*,
|
||||
variant: int,
|
||||
) -> CuTeDSLLaunchSpec[_TestCuTeDSLKernel.CompileKey]:
|
||||
compile_key = self.dispatch(variant=variant)
|
||||
|
||||
def finalize() -> str:
|
||||
events.append("finalize")
|
||||
return "output"
|
||||
|
||||
return compile_key, (payload,), "unused", finalize
|
||||
|
||||
monkeypatch.setattr(
|
||||
jit_warmup_cutedsl_helper,
|
||||
"compile_cutedsl",
|
||||
compile_cutedsl,
|
||||
)
|
||||
|
||||
assert FinalizedKernel()("runtime", variant=1) == "output"
|
||||
assert events == ["launch", "finalize"]
|
||||
|
||||
@@ -4,10 +4,10 @@
|
||||
from dataclasses import dataclass
|
||||
from typing import Any
|
||||
|
||||
from vllm.model_executor.warmup.jit_warmup import kernel_launcher
|
||||
from vllm.model_executor.warmup.jit_warmup_triton_helper import (
|
||||
LaunchSpec,
|
||||
VllmTritonJitKernel,
|
||||
kernel_launcher,
|
||||
)
|
||||
|
||||
|
||||
@@ -107,13 +107,13 @@ def test_compute_slot_mapping_uses_named_launcher_inputs(monkeypatch) -> None:
|
||||
)
|
||||
launches: list[tuple[Any, ...]] = []
|
||||
|
||||
def launch(grid: Any, inputs: Any, **kwargs: Any) -> None:
|
||||
launches.append((grid, inputs, kwargs))
|
||||
def launch(launch_spec: Any, inputs: Any) -> None:
|
||||
launches.append((launch_spec, inputs))
|
||||
|
||||
monkeypatch.setattr(owner, "launch", launch)
|
||||
owner.compile(compile_key)
|
||||
|
||||
grid, inputs, kwargs = launches[0]
|
||||
(grid, kwargs), inputs = launches[0]
|
||||
assert grid == (2,)
|
||||
assert inputs["num_tokens"] == 2
|
||||
assert inputs["block_table_stride"] == 128
|
||||
|
||||
Reference in New Issue
Block a user