[None][feat] Update multimodal utility get_num_tokens_per_image for better generalization
#7544
Conversation
chang-l
changed the title
get_num_tokens_per_image for better generalization get_num_tokens_per_image for better generalization
📝 WalkthroughWalkthroughRefactors multimodal token counting to accept image/video objects instead of explicit dimensions. Updates find_mm_token_lengths to pass full objects. In the registry, image/video token computations derive sizes from objects and add a video fallback to per-frame counting. Tests are updated to use the new object-based API. Changes
Sequence Diagram(s)sequenceDiagram
autonumber
actor Caller
participant Multimodal as find_mm_token_lengths
participant Processor as BaseMultimodalInputProcessor
Note over Caller,Processor: Image token counting
Caller->>Multimodal: request token lengths (image)
Multimodal->>Processor: get_num_tokens_per_image(image)
Processor->>Processor: derive (H, W) from image
Processor-->>Multimodal: image token count
Multimodal-->>Caller: token lengths
rect rgba(200,230,255,0.25)
Note over Caller,Processor: Video token counting with fallback
Caller->>Multimodal: request token lengths (video frames)
Multimodal->>Processor: get_num_tokens_per_video(video)
Processor->>Processor: derive (T, H, W) from frames
alt Tokenizer supports video
Processor-->>Multimodal: video token count
else Tokenizer fails for video
Processor->>Processor: per-frame image token count (frame 0)
Processor-->>Multimodal: scaled token count by temporal_patch_size
end
Multimodal-->>Caller: token lengths
end
Estimated code review effort🎯 3 (Moderate) | ⏱️ ~25 minutes Possibly related PRs
Suggested reviewers
✨ Finishing Touches
🧪 Generate unit tests
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. 🪧 TipsChatThere are 3 ways to chat with CodeRabbit:
SupportNeed help? Create a ticket on our support page for assistance with any issues or questions. CodeRabbit Commands (Invoked using PR/Issue comments)Type Other keywords and placeholders
Status, Documentation and Community
|
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
There was a problem hiding this comment.
Actionable comments posted: 3
Caution
Some comments are outside the diff and can’t be posted inline due to platform limitations.
⚠️ Outside diff range comments (4)
tensorrt_llm/inputs/registry.py (1)
1-1: Add NVIDIA Apache-2.0 header (2025).Per repo guidelines, prepend the copyright header.
Apply:
+# Copyright (c) 2025, NVIDIA CORPORATION. All rights reserved. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# http://www.apache.org/licenses/LICENSE-2.0 +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License.tensorrt_llm/inputs/multimodal.py (2)
1-1: Add NVIDIA Apache-2.0 header (2025).Same header requirement applies here.
Apply:
+# Copyright (c) 2025, NVIDIA CORPORATION. All rights reserved. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# http://www.apache.org/licenses/LICENSE-2.0 +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License.
486-494: Fix return type and doc for find_mm_token_lengths.Function returns a dict by modality, not List[int]. Update annotation and comment.
Apply:
-def find_mm_token_lengths(mm_data: Dict[str, Any], - input_processor: Any) -> List[int]: - """Get multimodal token lengths from multimodal data items. """ +def find_mm_token_lengths(mm_data: Dict[str, Any], + input_processor: Any) -> Dict[str, List[int]]: + """Get multimodal token lengths grouped by modality.""" @@ - return num_mm_tokens # flatten all mm instances to a single list + return num_mm_tokensAlso applies to: 523-524
tests/unittest/_torch/multimodal/test_find_num_image_tokens.py (1)
1-1: Add NVIDIA Apache-2.0 header (2025).Apply standard header at file top.
Apply:
+# Copyright (c) 2025, NVIDIA CORPORATION. All rights reserved. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# http://www.apache.org/licenses/LICENSE-2.0 +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License.
🧹 Nitpick comments (2)
tensorrt_llm/inputs/registry.py (1)
161-163: Clarify fallback temporal scaling; avoid truncation.Integer division can undercount when num_frames < temporal_patch_size or not divisible. Prefer ceil groups.
Apply:
- return num_tokens_per_frame * num_frames // temporal_patch_size + groups = (num_frames + temporal_patch_size - 1) // temporal_patch_size + return num_tokens_per_frame * groupstests/unittest/_torch/multimodal/test_find_num_image_tokens.py (1)
17-26: Optional: mark as network tests or add offline fallback.Remote URLs can make unit tests flaky. Consider @pytest.mark.network and/or local cached assets.
📜 Review details
Configuration used: Path: .coderabbit.yaml
Review profile: CHILL
Plan: Pro
💡 Knowledge Base configuration:
- MCP integration is disabled by default for public repositories
- Jira integration is disabled by default for public repositories
- Linear integration is disabled by default for public repositories
You can enable these sources in your CodeRabbit configuration.
📒 Files selected for processing (3)
tensorrt_llm/inputs/multimodal.py(1 hunks)tensorrt_llm/inputs/registry.py(4 hunks)tests/unittest/_torch/multimodal/test_find_num_image_tokens.py(2 hunks)
🧰 Additional context used
📓 Path-based instructions (3)
**/*.{h,hpp,hh,hxx,cpp,cxx,cc,cu,cuh,py}
📄 CodeRabbit inference engine (CODING_GUIDELINES.md)
Use only spaces, no tabs; indent with 4 spaces.
Files:
tensorrt_llm/inputs/multimodal.pytests/unittest/_torch/multimodal/test_find_num_image_tokens.pytensorrt_llm/inputs/registry.py
**/*.py
📄 CodeRabbit inference engine (CODING_GUIDELINES.md)
**/*.py: Python code must target Python 3.8+.
Indent Python code with 4 spaces; do not use tabs.
Maintain module namespace when importing; prefer 'from package.subpackage import foo' then 'foo.SomeClass()' instead of importing the class directly.
Python filenames should be snake_case (e.g., some_file.py).
Python classes use PascalCase names.
Functions and methods use snake_case names.
Local variables use snake_case; prefix 'k' for variables that start with a number (e.g., k_99th_percentile).
Global variables use upper SNAKE_CASE prefixed with 'G' (e.g., G_MY_GLOBAL).
Constants use upper SNAKE_CASE (e.g., MY_CONSTANT).
Avoid shadowing variables from an outer scope.
Initialize all externally visible members of a class in the constructor.
Prefer docstrings for interfaces that may be used outside a file; comments for in-function or file-local interfaces.
Use Google-style docstrings for classes and functions (Sphinx-parsable).
Document attributes and variables inline so they render under the class/function docstring.
Avoid reflection when a simpler, explicit approach suffices (e.g., avoid dict(**locals()) patterns).
In try/except, catch the most specific exceptions possible.
For duck-typing try/except, keep the try body minimal and use else for the main logic.
Files:
tensorrt_llm/inputs/multimodal.pytests/unittest/_torch/multimodal/test_find_num_image_tokens.pytensorrt_llm/inputs/registry.py
**/*.{cpp,cxx,cc,h,hpp,hh,hxx,cu,cuh,py}
📄 CodeRabbit inference engine (CODING_GUIDELINES.md)
Prepend the NVIDIA Apache-2.0 copyright header with current year to the top of all source files (e.g., .cpp, .h, .cu, .py).
Files:
tensorrt_llm/inputs/multimodal.pytests/unittest/_torch/multimodal/test_find_num_image_tokens.pytensorrt_llm/inputs/registry.py
🧬 Code graph analysis (2)
tensorrt_llm/inputs/multimodal.py (1)
tensorrt_llm/inputs/registry.py (1)
get_num_tokens_per_video(136-163)
tests/unittest/_torch/multimodal/test_find_num_image_tokens.py (1)
tensorrt_llm/inputs/registry.py (2)
get_num_tokens_per_image(117-134)get_num_tokens_per_video(136-163)
⏰ 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 (4)
tensorrt_llm/inputs/multimodal.py (2)
502-509: Image path switch to object-based API looks good.
514-516: Video path switch to object-based API looks good.tests/unittest/_torch/multimodal/test_find_num_image_tokens.py (2)
137-143: LGTM: tests updated to pass image object to API.
244-251: LGTM: tests updated to pass video object to API.
chang-l
force-pushed
the
find_mm_token_from_image
branch
from
3f14a1c to
f841169
Compare
|
/bot run |
|
PR_Github #17819 [ run ] triggered by Bot |
|
PR_Github #17819 [ run ] completed with state |
|
/bot run |
|
PR_Github #17828 [ run ] triggered by Bot |
|
PR_Github #17828 [ run ] completed with state |
|
/bot run |
|
PR_Github #17949 [ run ] triggered by Bot |
|
PR_Github #17949 [ run ] completed with state |
chang-l
force-pushed
the
find_mm_token_from_image
branch
from
f841169 to
0222b62
Compare
|
/bot run |
|
PR_Github #17952 [ run ] triggered by Bot |
|
PR_Github #17952 [ run ] completed with state |
|
/bot run --reuse-test |
|
PR_Github #17955 [ run ] triggered by Bot |
|
PR_Github #17955 [ run ] completed with state |
|
/bot run --reuse-test |
|
PR_Github #17976 [ run ] triggered by Bot |
|
PR_Github #17976 [ run ] completed with state |
Signed-off-by: Chang Liu (Enterprise Products) <[email protected]>
chang-l
force-pushed
the
find_mm_token_from_image
branch
from
0222b62 to
6a6d9ab
Compare
|
/bot run |
|
PR_Github #17996 [ run ] triggered by Bot |
|
PR_Github #17996 [ run ] completed with state |
… better generalization (NVIDIA#7544) Signed-off-by: Chang Liu (Enterprise Products) <[email protected]>
3 participants
Summary by CodeRabbit
Description
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
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 thestage-listparameter 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.mdand the
scripts/test_to_stage_mapping.pyhelper.kill
killKill all running builds associated with pull request.
skip
skip --comment COMMENTSkip 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-pipelineReuse 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.