Skip to content

[https://nvbugs/5684820][fix] fix the detokenizer issue for DeepSeek-v3.2 - #10106

Merged
lfr-0531 merged 2 commits into
NVIDIA:mainfrom
lfr-0531:user/fanrongl/fix_detokenizer_for_ds32
Dec 22, 2025
Merged

[https://nvbugs/5684820][fix] fix the detokenizer issue for DeepSeek-v3.2#10106
lfr-0531 merged 2 commits into
NVIDIA:mainfrom
lfr-0531:user/fanrongl/fix_detokenizer_for_ds32

Conversation

@lfr-0531

@lfr-0531 lfr-0531 commented Dec 18, 2025

Copy link
Copy Markdown
Collaborator

Summary by CodeRabbit

Bug Fixes

  • Improved tokenizer stability and reliability by filtering out invalid token entries that may occur during incremental decoding operations. Added diagnostic warning logs to provide enhanced visibility when anomalies are detected during token conversion. Changes ensure consistent and robust behavior across all decoding implementations.

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

Description

When benchmarking with random data, it is possible to generate token IDs that fall outside the tokenizer's vocabulary. This causes trtllm_decode_incrementally to yield 'None' tokens. In this PR, we fix this issue by filtering out these 'None' tokens. We have also verified the accuracy:

  • NVFP4 model on B200: GSM8k=94.88, GPQA=79.80
  • FP8 model on H200: GSM8k=95.79, GPQA=78.28

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.

Comment thread tensorrt_llm/llmapi/tokenizer.py Outdated
Signed-off-by: Fanrong Li <23290157+lfr-0531@users.noreply.github.com>
@lfr-0531
lfr-0531 force-pushed the user/fanrongl/fix_detokenizer_for_ds32 branch from 9336892 to 83b3ba8 Compare December 20, 2025 08:31
@lfr-0531
lfr-0531 marked this pull request as ready for review December 20, 2025 08:31
@lfr-0531

Copy link
Copy Markdown
Collaborator Author

/bot run

@coderabbitai

coderabbitai Bot commented Dec 20, 2025

Copy link
Copy Markdown
Contributor
📝 Walkthrough

Walkthrough

The changes add filtering and warning logic to tokenizer decoding methods to handle None tokens produced by convert_ids_to_tokens. Both trtllm_decode_incrementally and TransformersTokenizer.decode_incrementally now remove None entries from token lists and emit warnings when encountered.

Changes

Cohort / File(s) Summary
None Token Filtering in Tokenizer Decoding
tensorrt_llm/tokenizer/tokenizer.py
Added logic to filter out None tokens in trtllm_decode_incrementally and TransformersTokenizer.decode_incrementally methods; warning is logged when None tokens are encountered before filtering

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~10 minutes

  • Straightforward filtering and logging additions applied consistently across two methods
  • Logic is contained to a single file with minimal scope
  • No structural changes or new APIs introduced

Pre-merge checks and finishing touches

❌ Failed checks (1 warning, 1 inconclusive)
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 ❓ Inconclusive The description explains the issue and solution, but the Test Coverage section is incomplete and lacks specific test information. Add specific test cases or test coverage details in the Test Coverage section to document how the fix is validated.
✅ Passed checks (1 passed)
Check name Status Explanation
Title check ✅ Passed The title clearly identifies the fix for the detokenizer issue affecting DeepSeek-v3.2, with proper NVBugs ticket reference and [fix] type tag.
✨ Finishing touches
  • 📝 Generate docstrings
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Post copyable unit tests in a comment

📜 Recent 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 21a93fb and 83b3ba8.

📒 Files selected for processing (1)
  • tensorrt_llm/tokenizer/tokenizer.py (1 hunks)
🧰 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/tokenizer/tokenizer.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/tokenizer/tokenizer.py
🧠 Learnings (4)
📓 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-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/tokenizer/tokenizer.py
📚 Learning: 2025-08-14T21:04:50.248Z
Learnt from: thorjohnsen
Repo: NVIDIA/TensorRT-LLM PR: 6910
File: cpp/tensorrt_llm/batch_manager/kvCacheManager.cpp:0-0
Timestamp: 2025-08-14T21:04:50.248Z
Learning: In KV cache onboarding logic during prefill in cpp/tensorrt_llm/batch_manager/kvCacheManager.cpp, when calculating which blocks fall within the attention window, use getTokensPerBlock() to advance token indices rather than block->getUniqueTokens().size(), because the calculation needs to consider the post-prefill state where blocks will be filled to capacity, not their current token count.

Applied to files:

  • tensorrt_llm/tokenizer/tokenizer.py
📚 Learning: 2025-08-15T06:46:54.897Z
Learnt from: eopXD
Repo: NVIDIA/TensorRT-LLM PR: 6767
File: cpp/tensorrt_llm/batch_manager/kvCacheManager.cpp:0-0
Timestamp: 2025-08-15T06:46:54.897Z
Learning: In cpp/tensorrt_llm/batch_manager/kvCacheManager.cpp addToken function, newly allocated blocks are unshared by design. The beam search path in addToken (when sequence.getNumTokens() > windowSize) is currently broken/non-functional with SWA, so the block allocation doesn't follow a shared-then-unshared pattern.

Applied to files:

  • tensorrt_llm/tokenizer/tokenizer.py
⏰ 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). (1)
  • GitHub Check: Pre-commit Check
🔇 Additional comments (1)
tensorrt_llm/tokenizer/tokenizer.py (1)

216-222: None token filtering is correctly implemented; both decode paths are now defensive.

The fix for trtllm_decode_incrementally appropriately handles out-of-vocabulary token IDs by filtering None values and logging a clear warning. The hf_decode_incrementally path is already protected via the list comprehension that filters None results from decode_stream.step(), so no additional changes are needed there.


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
Copy Markdown
Collaborator

PR_Github #29228 [ run ] triggered by Bot. Commit: 83b3ba8

@tensorrt-cicd

Copy link
Copy Markdown
Collaborator

PR_Github #29228 [ run ] completed with state SUCCESS. Commit: 83b3ba8
/LLM/main/L0_MergeRequest_PR pipeline #22433 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

@lfr-0531

Copy link
Copy Markdown
Collaborator Author

/bot run

@tensorrt-cicd

Copy link
Copy Markdown
Collaborator

PR_Github #29285 [ run ] triggered by Bot. Commit: 83b3ba8

@tensorrt-cicd

Copy link
Copy Markdown
Collaborator

PR_Github #29285 [ run ] completed with state SUCCESS. Commit: 83b3ba8
/LLM/main/L0_MergeRequest_PR pipeline #22483 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

@lfr-0531

Copy link
Copy Markdown
Collaborator Author

/bot run

@tensorrt-cicd

Copy link
Copy Markdown
Collaborator

PR_Github #29300 [ run ] triggered by Bot. Commit: 83b3ba8

@tensorrt-cicd

Copy link
Copy Markdown
Collaborator

PR_Github #29300 [ run ] completed with state SUCCESS. Commit: 83b3ba8
/LLM/main/L0_MergeRequest_PR pipeline #22497 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

@lfr-0531

Copy link
Copy Markdown
Collaborator Author

/bot run

@lfr-0531

Copy link
Copy Markdown
Collaborator Author

/bot run

@tensorrt-cicd

Copy link
Copy Markdown
Collaborator

PR_Github #29317 [ run ] triggered by Bot. Commit: 8e6ed61

@tensorrt-cicd

Copy link
Copy Markdown
Collaborator

PR_Github #29321 [ run ] triggered by Bot. Commit: 8e6ed61

@tensorrt-cicd

Copy link
Copy Markdown
Collaborator

PR_Github #29317 [ run ] completed with state ABORTED. Commit: 8e6ed61

@tensorrt-cicd

Copy link
Copy Markdown
Collaborator

PR_Github #29321 [ run ] completed with state SUCCESS. Commit: 8e6ed61
/LLM/main/L0_MergeRequest_PR pipeline #22514 completed with status: 'SUCCESS'

@lfr-0531
lfr-0531 merged commit f0bd60a into NVIDIA:main Dec 22, 2025
5 checks passed
codego7250 pushed a commit to codego7250/TensorRT-LLM that referenced this pull request Dec 22, 2025
…v3.2 (NVIDIA#10106)

Signed-off-by: Fanrong Li <23290157+lfr-0531@users.noreply.github.com>
codego7250 pushed a commit to codego7250/TensorRT-LLM that referenced this pull request Dec 23, 2025
…v3.2 (NVIDIA#10106)

Signed-off-by: Fanrong Li <23290157+lfr-0531@users.noreply.github.com>
JunyiXu-nv pushed a commit to JunyiXu-nv/TensorRT-LLM that referenced this pull request Dec 30, 2025
…v3.2 (NVIDIA#10106)

Signed-off-by: Fanrong Li <23290157+lfr-0531@users.noreply.github.com>
videodanchik pushed a commit to videodanchik/TensorRT-LLM that referenced this pull request Jan 14, 2026
…v3.2 (NVIDIA#10106)

Signed-off-by: Fanrong Li <23290157+lfr-0531@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