diff --git a/.buildkite/test_areas/kernels.yaml b/.buildkite/test_areas/kernels.yaml index b44d05f2cf..c53c91cb63 100644 --- a/.buildkite/test_areas/kernels.yaml +++ b/.buildkite/test_areas/kernels.yaml @@ -144,6 +144,32 @@ steps: - pytest -v -s kernels/test_fused_deepseek_v4_*.py - pytest -v -s models/test_deepseek_v4_mega_moe.py +# Own job so mHC never shares a process with FlashInfer's import-time +# ptxas override. +- label: ":nvidia: (B200) mHC Kernels" + key: kernels-mhc-test-b200 + timeout_in_minutes: 25 + device: b200-k8s + source_file_dependencies: + - csrc/ + - vllm/ + - "!vllm/distributed/kv_transfer/" + - tests/kernels/ + commands: + - pytest -v -s kernels/mhc + +- label: ":nvidia: (B200) FLA Ops Kernels" + key: kernels-fla-ops-test-b200 + timeout_in_minutes: 25 + device: b200-k8s + source_file_dependencies: + - csrc/ + - vllm/ + - "!vllm/distributed/kv_transfer/" + - tests/kernels/ + commands: + - pytest -v -s kernels/fla + # Catch-all for test files at the tests/kernels root. This job collects # the whole root so new files are wired by default. # Files with dedicated jobs elsewhere in this file are excluded via --ignore @@ -151,7 +177,7 @@ steps: # their own jobs / Kernels (B200)). - label: ":nvidia: (B200) Miscellaneous Kernels" key: kernels-root-misc-test-b200 - timeout_in_minutes: 45 + timeout_in_minutes: 30 device: b200-k8s source_file_dependencies: - csrc/ @@ -159,14 +185,14 @@ steps: - "!vllm/distributed/kv_transfer/" - tests/kernels/ commands: - # Isolate mHC from FlashInfer's import-time ptxas override. - - pytest -v -s kernels/test_mhc_kernels.py - pytest -v -s kernels/ --ignore=kernels/attention --ignore=kernels/core + --ignore=kernels/fla --ignore=kernels/helion --ignore=kernels/ir --ignore=kernels/mamba + --ignore=kernels/mhc --ignore=kernels/moe --ignore=kernels/quantization --ignore=kernels/test_concat_mla_q.py @@ -176,7 +202,6 @@ steps: --ignore=kernels/test_kda.py --ignore=kernels/test_bf16x3_router_gemm_cutedsl.py --ignore=kernels/test_ll_bf16_gemm.py - --ignore=kernels/test_mhc_kernels.py --ignore=kernels/test_shuffle_rows.py # BROKEN on main, pending kernel fixes (B200): # test_shuffle_rows.py (1: test_shuffle_rows_edge_cases) diff --git a/tests/kernels/fla/__init__.py b/tests/kernels/fla/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/kernels/test_fla_layernorm_guard.py b/tests/kernels/fla/test_fla_layernorm_guard.py similarity index 100% rename from tests/kernels/test_fla_layernorm_guard.py rename to tests/kernels/fla/test_fla_layernorm_guard.py diff --git a/tests/kernels/test_fused_gdn_post_conv.py b/tests/kernels/fla/test_fused_gdn_post_conv.py similarity index 100% rename from tests/kernels/test_fused_gdn_post_conv.py rename to tests/kernels/fla/test_fused_gdn_post_conv.py diff --git a/tests/kernels/test_fused_recurrent_packed_decode.py b/tests/kernels/fla/test_fused_recurrent_packed_decode.py similarity index 100% rename from tests/kernels/test_fused_recurrent_packed_decode.py rename to tests/kernels/fla/test_fused_recurrent_packed_decode.py diff --git a/tests/kernels/test_fused_sigmoid_gating_delta_rule.py b/tests/kernels/fla/test_fused_sigmoid_gating_delta_rule.py similarity index 100% rename from tests/kernels/test_fused_sigmoid_gating_delta_rule.py rename to tests/kernels/fla/test_fused_sigmoid_gating_delta_rule.py diff --git a/tests/kernels/mhc/__init__.py b/tests/kernels/mhc/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/kernels/test_mhc_jit_warmup.py b/tests/kernels/mhc/test_mhc_jit_warmup.py similarity index 100% rename from tests/kernels/test_mhc_jit_warmup.py rename to tests/kernels/mhc/test_mhc_jit_warmup.py diff --git a/tests/kernels/test_mhc_kernels.py b/tests/kernels/mhc/test_mhc_kernels.py similarity index 100% rename from tests/kernels/test_mhc_kernels.py rename to tests/kernels/mhc/test_mhc_kernels.py diff --git a/tests/kernels/test_mhc_tilelang_jit.py b/tests/kernels/mhc/test_mhc_tilelang_jit.py similarity index 97% rename from tests/kernels/test_mhc_tilelang_jit.py rename to tests/kernels/mhc/test_mhc_tilelang_jit.py index 1c430e7ae3..4292513d25 100644 --- a/tests/kernels/test_mhc_tilelang_jit.py +++ b/tests/kernels/mhc/test_mhc_tilelang_jit.py @@ -108,7 +108,7 @@ def test_deepseek_v4_import_and_jit_monitor_do_not_hijack_hip_symbols() -> None: # Both claims are about process-global state, `sys.modules` and the symbol # table, and a sibling test legitimately imports TileLang to exercise those # kernels, so the checks only mean something in an interpreter of their own. - script = Path(__file__).parent / "scripts" / "check_no_tilelang_hijack.py" + script = Path(__file__).parents[1] / "scripts" / "check_no_tilelang_hijack.py" result = subprocess.run( [sys.executable, str(script)], capture_output=True, diff --git a/vllm/model_executor/kernels/mhc/cpu.py b/vllm/model_executor/kernels/mhc/cpu.py index 4659540698..d12b0eae18 100644 --- a/vllm/model_executor/kernels/mhc/cpu.py +++ b/vllm/model_executor/kernels/mhc/cpu.py @@ -81,7 +81,7 @@ def hc_head_fused_cpu( hc_eps: float, ) -> torch.Tensor: """CPU-ported HC head reduction (see `test_hc_head_cpu` in - tests/kernels/test_mhc_kernels.py for the eager reference this is tested + tests/kernels/mhc/test_mhc_kernels.py for the eager reference this is tested against). The ported kernel's C++ signature takes `(hc_eps, norm_eps)` -- the