Skip to content

[https://nvbugs/5624818][fix] Fix GPT-OSS with non-paged_context_fmha#11309

Open
pengbowang-nv wants to merge 1 commit intoNVIDIA:release/1.2from
pengbowang-nv:fix-non-paged-context-fmha-with-attn-sink
Open

[https://nvbugs/5624818][fix] Fix GPT-OSS with non-paged_context_fmha#11309
pengbowang-nv wants to merge 1 commit intoNVIDIA:release/1.2from
pengbowang-nv:fix-non-paged-context-fmha-with-attn-sink

Conversation

@pengbowang-nv
Copy link
Collaborator

@pengbowang-nv pengbowang-nv commented Feb 5, 2026

Summary by CodeRabbit

  • Bug Fixes
    • Added runtime validation to ensure attention sinks are only compatible with flash attention.
    • Strengthened constraints in non-flash-attention code paths to prevent invalid configuration combinations.

Description

Fixed a GPT-OSS output error with enable_kvcache_reuse=False. It's due to selecting a kernel that does not support attention sink when seqlen is small.

After fix:

> python ./examples/llm-api/quickstart_advanced.py --model_dir /home/scratch.trt_llm_data/llm-models/gpt_oss/gpt-oss-20b --tp_size 1 --moe_ep_size 1 --moe_tp_size 1 --max_seq_len 512  --disable_kv_cache_reuse

[0] Prompt: 'Hello, my name is', Generated text: ' John Doe. I am a software engineer with a passion for developing innovative solutions. I have experience in Java, Python, and JavaScript.'

> python ./examples/llm-api/quickstart_advanced.py --model_dir /home/scratch.trt_llm_data/llm-models/gpt_oss/gpt-oss-20b --tp_size 1 --moe_ep_size 1 --moe_tp_size 1 --max_seq_len 512

[0] Prompt: 'Hello, my name is', Generated text: ' John Doe. I am a software engineer with a passion for developing innovative solutions. I have experience in Java, Python, and JavaScript.'

Test Coverage

PR Checklist

Please review the following before submitting your PR:

  • PR description clearly explains what and why. If using CodeRabbit's summary, please make sure it makes sense.

  • PR Follows TRT-LLM CODING GUIDELINES to the best of your knowledge.

  • Test cases are provided for new code paths (see test instructions)

  • Any new dependencies have been scanned for license and vulnerabilities

  • CODEOWNERS updated if ownership changes

  • Documentation updated as needed

  • Update tava architecture diagram if there is a significant design change in PR.

  • The reviewers assigned automatically/manually are appropriate for the PR.

  • Please check this after reviewing the above items as appropriate for this PR.

GitHub Bot Help

/bot [-h] ['run', 'kill', 'skip', 'reuse-pipeline'] ...

Provide a user friendly way for developers to interact with a Jenkins server.

Run /bot [-h|--help] to print this help message.

See details below for each supported subcommand.

Details

run [--reuse-test (optional)pipeline-id --disable-fail-fast --skip-test --stage-list "A10-PyTorch-1, xxx" --gpu-type "A30, H100_PCIe" --test-backend "pytorch, cpp" --add-multi-gpu-test --only-multi-gpu-test --disable-multi-gpu-test --post-merge --extra-stage "H100_PCIe-TensorRT-Post-Merge-1, xxx" --detailed-log --debug(experimental)]

Launch build/test pipelines. All previously running jobs will be killed.

--reuse-test (optional)pipeline-id (OPTIONAL) : Allow the new pipeline to reuse build artifacts and skip successful test stages from a specified pipeline or the last pipeline if no pipeline-id is indicated. If the Git commit ID has changed, this option will be always ignored. The DEFAULT behavior of the bot is to reuse build artifacts and successful test results from the last pipeline.

--disable-reuse-test (OPTIONAL) : Explicitly prevent the pipeline from reusing build artifacts and skipping successful test stages from a previous pipeline. Ensure that all builds and tests are run regardless of previous successes.

--disable-fail-fast (OPTIONAL) : Disable fail fast on build/tests/infra failures.

--skip-test (OPTIONAL) : Skip all test stages, but still run build stages, package stages and sanity check stages. Note: Does NOT update GitHub check status.

--stage-list "A10-PyTorch-1, xxx" (OPTIONAL) : Only run the specified test stages. Examples: "A10-PyTorch-1, xxx". Note: Does NOT update GitHub check status.

--gpu-type "A30, H100_PCIe" (OPTIONAL) : Only run the test stages on the specified GPU types. Examples: "A30, H100_PCIe". Note: Does NOT update GitHub check status.

--test-backend "pytorch, cpp" (OPTIONAL) : Skip test stages which don't match the specified backends. Only support [pytorch, cpp, tensorrt, triton]. Examples: "pytorch, cpp" (does not run test stages with tensorrt or triton backend). Note: Does NOT update GitHub pipeline status.

--only-multi-gpu-test (OPTIONAL) : Only run the multi-GPU tests. Note: Does NOT update GitHub check status.

--disable-multi-gpu-test (OPTIONAL) : Disable the multi-GPU tests. Note: Does NOT update GitHub check status.

--add-multi-gpu-test (OPTIONAL) : Force run the multi-GPU tests in addition to running L0 pre-merge pipeline.

--post-merge (OPTIONAL) : Run the L0 post-merge pipeline instead of the ordinary L0 pre-merge pipeline.

--extra-stage "H100_PCIe-TensorRT-Post-Merge-1, xxx" (OPTIONAL) : Run the ordinary L0 pre-merge pipeline and specified test stages. Examples: --extra-stage "H100_PCIe-TensorRT-Post-Merge-1, xxx".

--detailed-log (OPTIONAL) : Enable flushing out all logs to the Jenkins console. This will significantly increase the log volume and may slow down the job.

--debug (OPTIONAL) : Experimental feature. Enable access to the CI container for debugging purpose. Note: Specify exactly one stage in the stage-list parameter to access the appropriate container environment. Note: Does NOT update GitHub check status.

For guidance on mapping tests to stage names, see docs/source/reference/ci-overview.md
and the scripts/test_to_stage_mapping.py helper.

kill

kill

Kill all running builds associated with pull request.

skip

skip --comment COMMENT

Skip testing for latest commit on pull request. --comment "Reason for skipping build/test" is required. IMPORTANT NOTE: This is dangerous since lack of user care and validation can cause top of tree to break.

reuse-pipeline

reuse-pipeline

Reuse a previous pipeline to validate current commit. This action will also kill all currently running builds associated with the pull request. IMPORTANT NOTE: This is dangerous since lack of user care and validation can cause top of tree to break.

Signed-off-by: Pengbo Wang <221450789+pengbowang-nv@users.noreply.github.com>
@pengbowang-nv pengbowang-nv requested a review from a team as a code owner February 5, 2026 09:32
@pengbowang-nv pengbowang-nv changed the title [https://nvbugs/5624818][fix] Fix non paged context fmha with attn sink [https://nvbugs/5624818][fix] Fix non-paged_context_fmha with attention_sinks Feb 5, 2026
@pengbowang-nv pengbowang-nv changed the title [https://nvbugs/5624818][fix] Fix non-paged_context_fmha with attention_sinks [https://nvbugs/5624818][fix] Fix GPT-OSS with non-paged_context_fmha Feb 5, 2026
@pengbowang-nv
Copy link
Collaborator Author

/bot run --disable-fail-fast

@coderabbitai
Copy link
Contributor

coderabbitai bot commented Feb 5, 2026

📝 Walkthrough

Walkthrough

The changes enforce compatibility constraints between attention sinks and flash attention across two kernel files. One file adds a runtime assertion validating that attention sinks are only used when flash attention is enabled, while the other restricts the non-flash-attention fallback path to exclude cases where attention sinks are present.

Changes

Cohort / File(s) Summary
Attention Sinks Validation
cpp/kernels/fmha_v2/src/fused_multihead_attention.cpp, cpp/tensorrt_llm/kernels/contextFusedMultiHeadAttention/fmhaRunner.cpp
Added runtime assertion and conditional constraints to ensure attention sinks are only used with flash attention enabled. The assertion checks compatibility, and the fallback path now explicitly excludes attention sink scenarios.

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~8 minutes

🚥 Pre-merge checks | ✅ 2 | ❌ 1
❌ Failed checks (1 inconclusive)
Check name Status Explanation Resolution
Description check ❓ Inconclusive PR description addresses the issue and solution but lacks required sections (title format, test coverage details) and checklist completion clarity. Add properly formatted PR title following [type] convention, provide specific test case names that validate the fix, and clarify which checklist items apply to this change.
✅ Passed checks (2 passed)
Check name Status Explanation
Title check ✅ Passed The title accurately describes the main fix: preventing selection of a kernel that doesn't support attention sinks in non-paged context FMHA scenarios.
Docstring Coverage ✅ Passed Docstring coverage is 100.00% which is sufficient. The required threshold is 80.00%.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.

✨ Finishing touches
  • 📝 Generate docstrings
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Post copyable unit tests in a comment

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands and usage tips.

@tensorrt-cicd
Copy link
Collaborator

PR_Github #34956 [ run ] triggered by Bot. Commit: e06f802

@pengbowang-nv pengbowang-nv changed the title [https://nvbugs/5624818][fix] Fix GPT-OSS with non-paged_context_fmha [https://nvbugs/5624818][fix] Fix GPT-OSS with non paged_context_fmha Feb 5, 2026
@pengbowang-nv pengbowang-nv changed the title [https://nvbugs/5624818][fix] Fix GPT-OSS with non paged_context_fmha [https://nvbugs/5624818][fix] Fix GPT-OSS with non-paged_context_fmha Feb 5, 2026
@tensorrt-cicd
Copy link
Collaborator

PR_Github #34956 [ run ] completed with state SUCCESS. Commit: e06f802
/LLM/release-1.2/L0_MergeRequest_PR pipeline #334 completed with status: 'SUCCESS'

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants