Repository navigation
Conversation
Add RuntimeHooks (pyexecutor/runtime_hooks.py), a per-model seam through which a modeling_v2 target can take over parts of the decode step without changing the engine's behaviour for other models: - step-input staging, so a target can write the next step's inputs from its own buffers; - the speculative sampler's store writer; - executor events and an execution-stream loop; - a decode prologue that runs before the model forward. The executor, CUDA graph runner, decoder runner, KV cache manager V2, attention backends and the speculative modules read the hooks at their call sites. Every hook is off unless a model installs it, and the default behaviour is unchanged. Signed-off-by: Xiao Wang <24860335+xwang233@users.noreply.github.com>
Add model-specific CUDA kernels under cpp/tensorrt_llm/kernels/glmMoeDsa/ and their torch ops under cpp/tensorrt_llm/thop/glmMoeDsa/, one <stem>Op.cpp per kernel <stem>.cu, registered as trtllm::glm_moe_dsa_<what>. They cover the decode path of GLM-5.2: the post-attention hop and its routing, the RoPE KV append, the sparse MLA decode, the cross-rank indexer top-k, the dense MLP, and the draft model's routed MoE, live-row hop and tail. The kernels build as one OBJECT library for the SM100 family and are used only by the GLM-5.2 modeling_v2 targets. Signed-off-by: Xiao Wang <24860335+xwang233@users.noreply.github.com>
Add the glm_moe_dsa family to modeling_v2 with three targets, each claiming its own parallel topology through the family's route(): - glm_5_2_nvfp4__sm_103__tp8: tensor-parallel attention and MoE on 8 GPUs; - glm_5_2_nvfp4__sm_103__tep: tensor-parallel attention with expert-parallel experts on 4 or 8 GPUs; - glm_5_2_nvfp4__sm_103__dep: attention data parallelism with expert-parallel experts on 8 or 16 GPUs. Code the targets share (kernel packages, dispatch, attention, the layer composition, the speculative worker and the runtime-hook wiring) lives in models/glm_moe_dsa/shared/. Each target selects the fast paths it serves through its own plan; the paths default on inside the target and can be turned off with TRTLLM_STAIRCASE_GLM_LL_DISABLE or per-path TRTLLM_STAIRCASE_GLM_LL_* variables. Any configuration that no target claims runs the built-in model. Signed-off-by: Xiao Wang <24860335+xwang233@users.noreply.github.com>
Unit tests of the glm_moe_dsa family: routing and target claims, isolation from other models, the per-target plans, the adopted layers and the runtime hooks, plus kernel tests against the native implementations. Tests that need the GLM-5.2 checkpoint find it under llm_models_root() and skip when it is not available. Signed-off-by: Xiao Wang <24860335+xwang233@users.noreply.github.com>
Add the glm_moe_dsa family and its three targets to the modeling_v2 README. Signed-off-by: Xiao Wang <24860335+xwang233@users.noreply.github.com>
|
@PerkzZheng, could you help to review this PR as trt-llm-torch-attention-devs? Thanks~ Assignment explanation
Affinity and workload are snapshots at selection, not live counters. Existing reservations on this PR are counted once. |
…use the TP8 fast paths Each of the two targets gets a short README: the fast paths were designed and tuned for the TP8 target, these targets run the subset that applies at their topology, and both should be revisited with fast paths of their own. Signed-off-by: Xiao Wang <24860335+xwang233@users.noreply.github.com>
clang-format on five C++ files and one test .cu (whitespace only), an unused local and a blank line flagged by ruff, two CuTe tensor names that codespell reads as misspellings, and the prep packet's pinned slots allocated with prefer_pinned(), as the pinned-memory policy requires. The stager declines when prefer_pinned() is False, so a packet is only built when it is True. Signed-off-by: Xiao Wang <24860335+xwang233@users.noreply.github.com>
| @@ -0,0 +1,3 @@ | |||
| # SPDX-FileCopyrightText: Copyright (c) 2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved. | |||
There was a problem hiding this comment.
do we have ways to combine things into one general target like https://github.com/NVIDIA/TensorRT-LLM/pull/20267/changes did? during target distribution, we can create different targets.
There was a problem hiding this comment.
Thanks, done in b209b9f. The tp8, tep and dep targets are now one target, glm_5_2_nvfp4__sm_103__default, following the #20267 convention. route() admits the same layouts as before and returns that class for all of them; the target picks the fast paths of the layout when it is built (target_paths in its modeling.py). The per-layout tables, forward and module adoption are unchanged. Only TP8 is tuned; the target README says TEP and DEP run the applicable subset and should be revisited, and a layout-specific target can be split out again later if one earns its own forward. The three GSM8K gates (tp8, tep4, dep8) pass on GB300 on the current head, after merging main.
…ads as a hardcoded password bandit B105 matches "token" in an assigned name, so it flagged the routed-MoE layout rule ROUTED_MOE_TOKEN_MAJOR_RULE. It is now ROUTED_MOE_UNFINALIZED_LAYOUT_RULE; the text is unchanged. Signed-off-by: Xiao Wang <24860335+xwang233@users.noreply.github.com>
|
[by Claude Code] @eopXD Could you review this PR? Thanks! |
Add RuntimeHooks, a per-model declaration of engine-side fast paths the model provides itself: a step-input stager, a speculative sampler store writer, a decode prologue, executor events, and running the overlap loop on the execution stream. Every hook defaults to off, and a model without a declaration runs the native path unchanged. Also add two extension points a model can use: FMHA libraries a backend puts ahead of the enabled ones, and the DSA indexer's reused top-k copy as an overridable method. Signed-off-by: Xiao Wang <24860335+xwang233@users.noreply.github.com>
…side the distributed warmup guard after_warmup may run collectives, so a rank-local failure there must arm the rank-crash watchdog like a warmup failure does. Signed-off-by: Xiao Wang <24860335+xwang233@users.noreply.github.com>
…side the distributed warmup guard after_warmup may run collectives, so a rank-local failure there must arm the rank-crash watchdog like a warmup failure does. Signed-off-by: Xiao Wang <24860335+xwang233@users.noreply.github.com>
…ay of a captured graph The step-input window closes right before the replay of an already captured CUDA graph. An eager step, an initial capture or a warmup would run the model before the staged writes are issued, so the decoder runner now offers the window only on such a replay, and StepInputStager documents the restriction. Add behavioral tests with reference hooks: the runner window lifecycle (staged writes issued before the completion event and the replay, discard on a failure while the window is open), steps that are not a replay never open a window, before_replay runs only before the replay of a captured graph, and the speculative sampler's store writer against the native stores on nonconsecutive slots, with its native fallbacks. Signed-off-by: Xiao Wang <24860335+xwang233@users.noreply.github.com>
…ay of a captured graph The step-input window closes right before the replay of an already captured CUDA graph. An eager step, an initial capture or a warmup would run the model before the staged writes are issued, so the decoder runner now offers the window only on such a replay, and StepInputStager documents the restriction. Add behavioral tests with reference hooks: the runner window lifecycle (staged writes issued before the completion event and the replay, discard on a failure while the window is open), steps that are not a replay never open a window, before_replay runs only before the replay of a captured graph, and the speculative sampler's store writer against the native stores on nonconsecutive slots, with its native fallbacks. Signed-off-by: Xiao Wang <24860335+xwang233@users.noreply.github.com>
|
@xwang233 just to check: I saw many new added cpp kernels, are they all for the modeling v2 specific GLM model target? |
|
Hi @Wanli-Jiang , yes those are GLM-5.2 modeling_v2 specific kernels. Can you point me the "modeling v2 specific model folder" path, so that I can move those kernels there? |
…he sampler store writer Main's one-model speculative decoding work now batches the overlap input gathers and moves the sampler's host copies off the critical path natively, so these two hooks no longer fit the code they replaced. Remove them and their call sites; they can be ported onto the new native paths later. Keep the decode prologue, the executor events, the execution-stream loop and the two extension points (prepended FMHA libraries, the DSA indexer's overridable top-k copy). Signed-off-by: Xiao Wang <24860335+xwang233@users.noreply.github.com>
Signed-off-by: Xiao Wang <24860335+xwang233@users.noreply.github.com> # Conflicts: # tensorrt_llm/_torch/pyexecutor/engine/runners/decoder/runner.py # tensorrt_llm/_torch/pyexecutor/py_executor.py # tests/unittest/_torch/executor/test_py_executor.py
Takes the runtime hooks branch, which now carries main up to 94348c4 and drops the step-input stager and sampler store writer hooks. - glm_moe_dsa: the sm103 target no longer serves deferred_input_prep or sampler_store; make_runtime_hooks declares only the decode prologue, the execution-stream loop and the executor events. - Routing: one route() for GlmMoeDsaForCausalLM covering the sm103 and the sm107 TP16 targets, via the @routes registry. - CMake: the GLM kernel exclude covers only this target's .cu files; its thop ops join th_common_glm_moe_dsa next to the TP16 ones. - Accuracy test module holds both the TP16 and the sm103 classes. Signed-off-by: Xiao Wang <24860335+xwang233@users.noreply.github.com>
|
@Wanli-Jiang Yes. All the new kernels under I agree they should live with the model. #20896 gives each family its own For now, I resolved the conflicts with the TP16 target in this PR. Both targets build into the existing |
…_model main renamed the decoder runner's model attribute to _model, so reading self.model failed at runner construction for every model. Update two tests to main's code: the GVR prior test calls sparse_attn_indexer on a SimpleNamespace, which now needs the indexer seams bound; the forward-step stub needs route_capture, enable_spec_decode and runtime_draft_len. Signed-off-by: Xiao Wang <24860335+xwang233@users.noreply.github.com>
Signed-off-by: Xiao Wang <24860335+xwang233@users.noreply.github.com>
…-v2-runtime-hooks Signed-off-by: Xiao Wang <24860335+xwang233@users.noreply.github.com> # Conflicts: # tensorrt_llm/_torch/pyexecutor/py_executor.py
Signed-off-by: Xiao Wang <24860335+xwang233@users.noreply.github.com>
|
@yunruis, could you help to review this PR as trt-llm-torch-attention-devs? Thanks~ @PerkzZheng requested an OOTO handoff of unstarted reviews ( Assignment explanation
Affinity and workload are snapshots at selection, not live counters. Existing reservations on this PR are counted once. |
Signed-off-by: Xiao Wang <24860335+xwang233@users.noreply.github.com>
…deling-v2-runtime-hooks Signed-off-by: Xiao Wang <24860335+xwang233@users.noreply.github.com> # Conflicts: # tensorrt_llm/_torch/pyexecutor/py_executor.py
Signed-off-by: Xiao Wang <24860335+xwang233@users.noreply.github.com>
…ownership rules Main now routes sm_103 tep4 to glm_5_2_nvfp4__sm_103__tep4 (NVIDIA#20662), and its claims suite no longer lets a target import a family-level shared package. - The sm_103 low-latency target serves only the layout its fast paths were built for: attention and experts tensor-parallel over eight ranks (tp8). It is renamed glm_5_2_nvfp4__sm_103__tp8 (ModelingV2Glm52Nvfp4Sm103Tp8); the tep and dep layouts, their path sets and the dep cells are removed. - glm_moe_dsa/shared moves into the target directory: its modules beside modeling.py, its kernel packages beside the target's routed-MoE ones under kernels/. Relative imports are rewritten for the new locations. - routing.py keeps main's tp16 and tep4 branches and adds the tp8 branch. - The accuracy gate is TestModelingV2Glm52Nvfp4Sm103Tp8::test_gsm8k_tp8; the tep4 and dep8 cases and their test-list entries are removed. Signed-off-by: Xiao Wang <24860335+xwang233@users.noreply.github.com>
Signed-off-by: Xiao Wang <24860335+xwang233@users.noreply.github.com>
Dev Engineer Review
modeling_v2targets for SM103: TP8, TEP, and DEP.RuntimeHooks; default hooks remain disabled. Existing executor paths retain native behavior when hooks are absent or ineligible.QA Engineer Review
tests/integration/defs/accuracy/modeling_v2/test_glm_moe_dsa.pyfor TP8, TEP4, and DEP8. Tests are restricted to SM103 and require the applicable GPU and MPI topology.tests/integration/test_lists/test-db/l0_gb300_multi_gpus.ymltests/integration/test_lists/test-db/l0_gb300_multi_nodes_node2_gpu8.ymlPer-File QA Perspective
cpp/tensorrt_llm/CMakeLists.txt,cpp/tensorrt_llm/kernels/CMakeLists.txt,cpp/tensorrt_llm/kernels/glmMoeDsa/CMakeLists.txt,cpp/tensorrt_llm/thop/CMakeLists.txt, andcpp/tensorrt_llm/thop/glmMoeDsa/CMakeLists.txt: Verify target inclusion, architecture selection, symbol resolution, and Torch operator linkage.cpp/tensorrt_llm/kernels/glmMoeDsa/*: Verify SM103 support, validation errors, deterministic reductions, cross-rank synchronization, timeout behavior, PDL ordering, and invalid-input handling.cpp/tensorrt_llm/thop/glmMoeDsa/*: Verify operator schemas, tensor validation, workspace requirements, stream behavior, fallback errors, and output shapes.tensorrt_llm/_torch/_experimental/modeling_v2/models/glm_moe_dsa/*: Verify routing, TP8/TEP/DEP target selection, weight loading, fast-path eligibility, native fallback, dispatch installation, speculative decoding, and rank-uniform decisions.tensorrt_llm/_torch/_experimental/modeling_v2/models/glm_moe_dsa/shared/*: Verify attention, top-k, KV append, sparse MLA, MoE, deferred normalization, draft-loop, workspace, health-check, and host-page-retention contracts.tensorrt_llm/_torch/pyexecutor/runtime_hooks.py: Verify that all hooks remain disabled by default and that invalid hook declarations fail clearly.tensorrt_llm/_torch/pyexecutor/engine/runners/decoder/runner.py,py_executor.py,cuda_graph_runner.py,kv_cache/kv_cache_manager_v2.py, and speculative-decoding files: Verify native behavior when hooks are absent, staging cleanup after exceptions, CUDA-graph replay, stream synchronization, and sampler-store integration.tensorrt_llm/_torch/attention/backends/*: Verify staged metadata updates, FMHA library precedence, reused MTP rows, and unchanged native paths.tensorrt_llm/_torch/_experimental/modeling_v2/README.md,_router_index.py, and package initializers: Verify documented target names, shared-package import rules, and resolved-mode behavior.tests/integration/defs/accuracy/modeling_v2/test_glm_moe_dsa.py: Covers whole-model GSM8K accuracy for TP8, TEP4, and DEP8. It is listed in the GB300 CI test lists.tests/unittest/_torch/executor/test_runtime_hooks.py: Covers runtime-hook protocols, default-off isolation, staged/native paths, and executor lifecycle integration. No integration test-list entry is expected for this unit test.tests/unittest/_torch/attention/sparse/dsa/test_dsa_indexer.py: Covers reused top-k rows, decode filling, and MTP shared-row storage. No integration test-list entry is expected.tests/unittest/_torch/attention/test_fmha_manager.py: Covers prepended FMHA library ordering and unavailable-library fallback. No integration test-list entry is expected.tests/unittest/_torch/executor/test_gpu_keepalive.pyandtests/unittest/_torch/executor/test_py_executor.py: Update test stubs for new executor-hook fields. No integration test-list entry is expected.tests/unittest/_torch/modeling_v2/test_modeling_v2_claims.py: Covers family-shared import rules. No integration test-list entry is expected.tests/integration/test_lists/test-db/*.yml: Adds GB300 CI entries for the GLM GSM8K gates with extended timeouts. Verify that the selected topology matches each test’s required rank count.Description
This PR adds a GLM-5.2 NVFP4 low-latency decode target for GB300 (SM103) to
modeling_v2:models/glm_moe_dsa/glm_5_2_nvfp4__sm_103__tp8(ModelingV2Glm52Nvfp4Sm103Tp8).The optimization work targets one layout: attention and MoE tensor-parallel over 8 GPUs (TP8),
no attention DP, with one-model MTP-Eagle as a linear chain of five draft tokens. The family's
route()sends only that deployment to this target. Other GLM-5.2 deployments go to the otherglm_moe_dsatargets or to the built-in model:glm_5_2_nvfp4__sm_103__tep4from [TRTLLM-16980][feat] modeling_v2: GLM-5.2-NVFP4 sm_103 tep4 target #20662. An earlierrevision of this PR also served TEP and DEP with a subset of its TP8 fast paths; it no longer
does, so the two targets do not overlap.
glm_5_2_nvfp4__sm_107__tp16from [None][feat] Staircase: GLM-5.2 NVFP4 low-latency decode target for Rubin (modeling_v2, TP16) #20517.routing.pykeeps main's TP16 and TEP4 branches and adds the TP8 one. The NoTarget messagenames all three targets.
Layout
The target follows main's target-ownership rules (
test_modeling_v2_claims.py): everything itruns lives in its own directory. Next to
modeling.pyandweights.pyare:dispatch.py);attention.py,attention_forward.py);layers.py);spec_worker.py);runtime.py);kernels/.The fast paths default on inside the target.
TRTLLM_STAIRCASE_GLM_LL_DISABLE=1turns them alloff, and per-path
TRTLLM_STAIRCASE_GLM_LL_*variables turn off single paths.Executor:
RuntimeHooks(reviewed in #20797)The target takes over parts of the decode step through
RuntimeHooks, a per-model seam thatis off by default:
The target also has a step-input stager and a sampler store writer
(
kernels/deferred_input_prep). They are not served: #19989 onmainreworked the engine pathsthey hooked, so #20797 does not carry those two hooks. The code stays for a follow-up that ports
them onto the new native paths.
The target's side is
runtime.py. The engine side, its tests and the note about #20306 are in#20797.
Kernels and ops
Model-specific CUDA kernels are under
cpp/tensorrt_llm/kernels/glmMoeDsa/, and their torchops under
cpp/tensorrt_llm/thop/glmMoeDsa/: one<stem>Op.cppper<stem>.cu, registeredas
trtllm::glm_moe_dsa_*in theth_common_glm_moe_dsalibrary next to the TP16 target's ops.They are used only by this target. They cover:
Moving them into the target's own
csrc/under the per-family build of #20896 is a follow-up.Test Coverage
tests/integration/defs/accuracy/modeling_v2/test_glm_moe_dsa.py::TestModelingV2Glm52Nvfp4Sm103Tp8::test_gsm8k_tp8.modeling_v2="require", so a deployment that misses the target, or astep a fast path covers but cannot run, fails instead of silently falling back to the
built-in model.
l0_gb300_multi_nodes_node2_gpu8.the latest merges of main; CI re-runs it on the current head.
tests/unittest/_torch/executor/test_runtime_hooks.pyand the touchedexecutor and attention tests cover the hooks both off (the default) and installed.
[−0.30, +0.99].
PR Checklist
llm_argschange.GitHub Bot Help
To see a list of available CI bot commands, please comment
/bot help.