Skip to content

Comments

[None][feat] add the eos tokens in generation config to stop words in the sampler#10389

Merged
nv-guomingz merged 3 commits intoNVIDIA:mainfrom
JadoTu:add_eos_token_v2
Jan 6, 2026
Merged

[None][feat] add the eos tokens in generation config to stop words in the sampler#10389
nv-guomingz merged 3 commits intoNVIDIA:mainfrom
JadoTu:add_eos_token_v2

Conversation

@JadoTu
Copy link
Collaborator

@JadoTu JadoTu commented Jan 3, 2026

Summary by CodeRabbit

  • Bug Fixes

    • Improved handling of end-of-sequence token behavior during text generation based on generation settings.
  • Refactor

    • Simplified and consolidated stop token logic, removing model-specific edge cases for more consistent decoding behavior across all supported models.

✏️ Tip: You can customize this high-level summary in your review settings.

Description

Justifications: add_stop_words.pptx
The previous PR#9514 was been reverted because of perf regression.
The CUDA synchronizations in the sampler have been resolved by this PR#10120. Thanks to @yuxianq !
This PR is to bring the functional support of eos tokens in the generation config again, as well as an extension on ignore eos flag.

The perf now has no CUDA Stream Synchronizations also with this PR. The overlap scheduler is not broken.
With this PR:
Output Token Throughput (tokens/sec) │ 4287.60
Without this PR:
Output Token Throughput (tokens/sec) │ 4263.69

The perf metrics are from Qwen3-Next.
image

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: jiant <107457950+JadoTu@users.noreply.github.com>
@JadoTu JadoTu requested a review from a team as a code owner January 3, 2026 03:18
@JadoTu JadoTu requested review from Superjomn and kaiyux and removed request for Superjomn January 3, 2026 03:18
@JadoTu JadoTu changed the title [None][None] add the eos tokens in generation config to stop words in the sampler [None][feat] add the eos tokens in generation config to stop words in the sampler Jan 3, 2026
@coderabbitai
Copy link
Contributor

coderabbitai bot commented Jan 3, 2026

📝 Walkthrough

Walkthrough

The changes modify stop word handling in the executor and sampling parameters modules. The executor now conditionally supplies stop_words based on the ignore_eos flag, while sampling_params simplifies stop word logic by removing model-specific branches (kimi_k2) and unifying eos_token_id incorporation across models.

Changes

Cohort / File(s) Summary
Executor stop word conditioning
tensorrt_llm/executor/base_worker.py
Modified executor request construction to conditionally set stop_words to an empty list when ignore_eos is true; otherwise retains stop_words from request.sampling_params._get_stop_words().
Sampling parameters stop word simplification
tensorrt_llm/sampling_params.py
Removed kimi_k2 model-specific end_id handling. Replaced multi-condition qwen3_next logic with unified approach: if generation_config.eos_token_id exists, ensure it is a list of ints and append each stop token to stop_token_ids if not equal to end_id and not already present.

Estimated code review effort

🎯 3 (Moderate) | ⏱️ ~20 minutes

Pre-merge checks and finishing touches

❌ Failed checks (2 warnings)
Check name Status Explanation Resolution
Docstring Coverage ⚠️ Warning Docstring coverage is 0.00% which is insufficient. The required threshold is 80.00%. You can run @coderabbitai generate docstrings to improve docstring coverage.
Description check ⚠️ Warning PR description provides context and justification but lacks critical required sections from the template. Add missing 'Test Coverage' section with specific test cases, and provide PR title following the template format (e.g., [TRTLLM-XXXX][feat] Add eos tokens support).
✅ Passed checks (1 passed)
Check name Status Explanation
Title check ✅ Passed The title accurately describes the main change: adding eos tokens from generation config to stop words in the sampler.
✨ Finishing touches
  • 📝 Generate docstrings

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.

Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 2

📜 Review details

Configuration used: Path: .coderabbit.yaml

Review profile: CHILL

Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 45ffbf1 and 8b81e22.

📒 Files selected for processing (2)
  • tensorrt_llm/executor/base_worker.py
  • tensorrt_llm/sampling_params.py
🧰 Additional context used
📓 Path-based instructions (2)
**/*.py

📄 CodeRabbit inference engine (CODING_GUIDELINES.md)

**/*.py: Code developed for TensorRT-LLM should conform to Python 3.8+
Indent Python code with 4 spaces. Do not use tabs
Always maintain the namespace when importing in Python, even if only one class or function from a module is used
Python files should use snake_case naming: some_file.py
Python classes should use PascalCase naming: class SomeClass
Python functions and methods should use snake_case naming: def my_awesome_function():
Python local variables should use snake_case naming: my_variable = ...
Python variable names that start with a number should be prefixed with 'k': k_99th_percentile = ...
Python global variables should use upper snake_case with prefix 'G': G_MY_GLOBAL = ...
Python constants should use upper snake_case naming: MY_CONSTANT = ...
Avoid shadowing variables declared in an outer scope in Python
Initialize all externally visible members of a Python class in the constructor
For Python interfaces that may be used outside a file, prefer docstrings over comments
Python comments should be reserved for code within a function, or interfaces that are local to a file
Use Google style docstrings in Python for classes and functions, which can be parsed by Sphinx
Python attributes and variables can be documented inline with type and description
Avoid using reflection in Python when functionality can be easily achieved without reflection
When using try-except blocks in Python, limit the except to the smallest set of errors possible
When using try-except blocks in Python to handle multiple possible variable types (duck-typing), keep the body of the try as small as possible, using the else block for logic

Files:

  • tensorrt_llm/executor/base_worker.py
  • tensorrt_llm/sampling_params.py
**/*.{cpp,h,cu,cuh,py}

📄 CodeRabbit inference engine (CODING_GUIDELINES.md)

All TensorRT-LLM Open Source Software code should contain an NVIDIA copyright header that includes the year of its latest meaningful modification

Files:

  • tensorrt_llm/executor/base_worker.py
  • tensorrt_llm/sampling_params.py
🧠 Learnings (3)
📓 Common learnings
Learnt from: samuellees
Repo: NVIDIA/TensorRT-LLM PR: 6974
File: tensorrt_llm/serve/scripts/benchmark_dataset.py:558-566
Timestamp: 2025-08-18T08:42:02.640Z
Learning: In TensorRT-LLM's RandomDataset (tensorrt_llm/serve/scripts/benchmark_dataset.py), when using --random-token-ids option, sequence length accuracy is prioritized over semantic correctness for benchmarking purposes. The encode/decode operations should use skip_special_tokens=True and add_special_tokens=False to ensure exact target token lengths.
📚 Learning: 2025-12-12T03:27:18.859Z
Learnt from: tongyuantongyu
Repo: NVIDIA/TensorRT-LLM PR: 9655
File: tensorrt_llm/_torch/pyexecutor/sampler.py:3031-3031
Timestamp: 2025-12-12T03:27:18.859Z
Learning: In tensorrt_llm/_torch/pyexecutor/sampler.py, when reviewing code that iterates through requests, ensure it does not convert excessive data into Python lists. Instead, the code should use torch.gather or indexing to gather only the data that will be used in the for loop before converting to Python lists. This minimizes data movement and improves performance.

Applied to files:

  • tensorrt_llm/executor/base_worker.py
📚 Learning: 2025-08-18T08:42:02.640Z
Learnt from: samuellees
Repo: NVIDIA/TensorRT-LLM PR: 6974
File: tensorrt_llm/serve/scripts/benchmark_dataset.py:558-566
Timestamp: 2025-08-18T08:42:02.640Z
Learning: In TensorRT-LLM's RandomDataset (tensorrt_llm/serve/scripts/benchmark_dataset.py), when using --random-token-ids option, sequence length accuracy is prioritized over semantic correctness for benchmarking purposes. The encode/decode operations should use skip_special_tokens=True and add_special_tokens=False to ensure exact target token lengths.

Applied to files:

  • tensorrt_llm/sampling_params.py
🧬 Code graph analysis (1)
tensorrt_llm/executor/base_worker.py (2)
tests/unittest/_torch/modeling/test_modeling_out_of_tree.py (1)
  • sampling_params (58-59)
tensorrt_llm/sampling_params.py (1)
  • _get_stop_words (423-436)
⏰ Context from checks skipped due to timeout of 90000ms. You can increase the timeout in your CodeRabbit configuration to a maximum of 15 minutes (900000ms). (2)
  • GitHub Check: Check PR Checklist Resolution
  • GitHub Check: Pre-commit Check

@JadoTu
Copy link
Collaborator Author

JadoTu commented Jan 3, 2026

/bot run

@JadoTu JadoTu requested a review from nv-guomingz January 3, 2026 08:44
@tensorrt-cicd
Copy link
Collaborator

PR_Github #30436 [ run ] triggered by Bot. Commit: 8b81e22

@tensorrt-cicd
Copy link
Collaborator

PR_Github #30436 [ run ] completed with state SUCCESS. Commit: 8b81e22
/LLM/main/L0_MergeRequest_PR pipeline #23463 completed with status: 'FAILURE'

⚠️ Action Required:

  • Please check the failed tests and fix your PR
  • If you cannot view the failures, ask the CI triggerer to share details
  • Once fixed, request an NVIDIA team member to trigger CI again

Signed-off-by: jiant <107457950+JadoTu@users.noreply.github.com>
@JadoTu
Copy link
Collaborator Author

JadoTu commented Jan 4, 2026

/bot run

@tensorrt-cicd
Copy link
Collaborator

PR_Github #30467 [ run ] triggered by Bot. Commit: cff1f94

@tensorrt-cicd
Copy link
Collaborator

PR_Github #30467 [ run ] completed with state SUCCESS. Commit: cff1f94
/LLM/main/L0_MergeRequest_PR pipeline #23489 completed with status: 'FAILURE'

⚠️ Action Required:

  • Please check the failed tests and fix your PR
  • If you cannot view the failures, ask the CI triggerer to share details
  • Once fixed, request an NVIDIA team member to trigger CI again

@JadoTu
Copy link
Collaborator Author

JadoTu commented Jan 4, 2026

/bot run

@tensorrt-cicd
Copy link
Collaborator

PR_Github #30477 [ run ] triggered by Bot. Commit: bc5c725

@tensorrt-cicd
Copy link
Collaborator

PR_Github #30477 [ run ] completed with state SUCCESS. Commit: bc5c725
/LLM/main/L0_MergeRequest_PR pipeline #23499 completed with status: 'SUCCESS'
Pipeline passed with automatic retried tests. Check the rerun report for details.

@nv-guomingz nv-guomingz merged commit 82aaf98 into NVIDIA:main Jan 6, 2026
9 checks passed
videodanchik pushed a commit to videodanchik/TensorRT-LLM that referenced this pull request Jan 14, 2026
… the sampler (NVIDIA#10389)

Signed-off-by: jiant <107457950+JadoTu@users.noreply.github.com>
Signed-off-by: Daniil Kulko <kulkodaniil@gmail.com>
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.

3 participants