[None][fix] fix log_once usage #7210
Conversation
Signed-off-by: Yuxian Qiu <[email protected]>
📝 WalkthroughWalkthroughThe change updates logging behavior across three files: adjusts warning keys in AutoTuner and Llava-Next vision model, and enforces a non-None key precondition in the logger’s log_once. No other logic or control flow is modified except raising an assertion if a None key is passed. Changes
Sequence Diagram(s)sequenceDiagram
autonumber
participant A as AutoTuner.choose_one
participant L as Logger
Note over A: Cache miss with non-empty profiling cache
A->>L: warning_once(key=custom_op, msg=...)
activate L
L->>L: log_once(key=custom_op, severity=WARNING)
Note over L: Assert key is not None<br/>Deduplicate by key
L-->>A: logged or skipped (once)
deactivate L
sequenceDiagram
autonumber
participant V as LlavaNextVisionModel.pack_image_features
participant L as Logger
Note over V: Image feature shape misaligned<br/>with provided patch size
V->>L: warning(keyed) with key="llava_next_vision_model_pack_image_features"
activate L
L-->>V: logged (subject to once/dedup if used)
deactivate L
Estimated code review effort🎯 2 (Simple) | ⏱️ ~10 minutes Possibly related PRs
Suggested reviewers
Tip 🔌 Remote MCP (Model Context Protocol) integration is now available!Pro plan users can now connect to remote MCP servers from the Integrations page. Connect with popular remote MCPs such as Notion and Linear to add more context to your reviews and chats. ✨ 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
|
|
/bot run |
|
PR_Github #16430 [ run ] triggered by Bot |
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
There was a problem hiding this comment.
Actionable comments posted: 0
🧹 Nitpick comments (4)
tensorrt_llm/logger.py (3)
15-21: Add imports for thread-safety and typing of keysTo support the lock and hashability hint in log_once, add these imports.
Apply this diff:
import logging import os import sys -from typing import Optional +from typing import Optional +import threading +from collections.abc import Hashable
74-76: Initialize a lock for log_once key set to avoid racesCreate a lock to guard
_appeared_keysmutations.Apply this diff:
# For log_once - self._appeared_keys = set() + self._appeared_keys = set() + self._keys_lock = threading.Lock()
111-116: Strengthenlog_oncepreconditions and ensure thread‐safetyVerified that no existing
*_oncecalls passkey=Noneor omit thekey=argument, so the refactor will not break existing usage.• Change the
assertto an explicit exception to prevent it being stripped with-O.
• Validate thatkeyis hashable before using it in a set.
• Wrap the “check-then-add” in a lock to avoid duplicate logs under concurrency.Suggested diff (in
tensorrt_llm/logger.pyatlog_once):def log_once(self, severity, *msg, key): - assert key is not None, "key is required for log_once" - if key not in self._appeared_keys: - self._appeared_keys.add(key) - self.log(severity, *msg) + if key is None: + raise ValueError("key is required for log_once") + try: + hash(key) + except TypeError as te: + raise TypeError("key must be hashable for log_once") from te + first_time = False + with self._keys_lock: + if key not in self._appeared_keys: + self._appeared_keys.add(key) + first_time = True + if first_time: + self.log(severity, *msg)tensorrt_llm/_torch/autotuner.py (1)
354-358: Namespace the log_once key and fix “Autotunner” typo for consistency
- The previous
(custom_op)wasn’t a tuple; switching tocustom_opis fine.- Prefer a namespaced key to avoid accidental collisions across unrelated log_once sites.
- Keep the tag spelling consistent with other messages (“Autotuner”).
Apply this diff:
- logger.warning_once( - f"[AutoTunner] Using the fallback tactic, due to cache miss on input shapes={input_shapes}", - key=custom_op) + logger.warning_once( + f"[Autotuner] Using the fallback tactic due to cache miss on input shapes={input_shapes}", + key=f"autotuner_cache_miss:{custom_op}")
📜 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/_torch/autotuner.py(1 hunks)tensorrt_llm/_torch/models/modeling_llava_next.py(1 hunks)tensorrt_llm/logger.py(1 hunks)
⏰ 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/_torch/models/modeling_llava_next.py (1)
171-176: Good: stable key added for de-duplicating this warningPassing an explicit string key makes the warning deterministic and consistent with the new non-None precondition in the logger.
|
PR_Github #16430 [ run ] completed with state |
Signed-off-by: Yuxian Qiu <[email protected]>
Signed-off-by: Yuxian Qiu <[email protected]> Signed-off-by: Wangshanshan <[email protected]>
Signed-off-by: Yuxian Qiu <[email protected]> Signed-off-by: Wangshanshan <[email protected]>
Signed-off-by: Yuxian Qiu <[email protected]> Signed-off-by: Wangshanshan <[email protected]>
Signed-off-by: Yuxian Qiu <[email protected]> Signed-off-by: Wangshanshan <[email protected]>
Signed-off-by: Yuxian Qiu <[email protected]> Signed-off-by: Wangshanshan <[email protected]>
Signed-off-by: Yuxian Qiu <[email protected]> Signed-off-by: Wangshanshan <[email protected]>
Summary by CodeRabbit
Description
Test Coverage
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.
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.