[None][fix] Respect CUDA_LAUNCH_BLOCKING by fixing doCheckError#11261
[None][fix] Respect CUDA_LAUNCH_BLOCKING by fixing doCheckError#11261mikeiovine merged 2 commits intoNVIDIA:mainfrom
Conversation
📝 WalkthroughWalkthroughRefactored error checking logic in cudaUtils.h by removing the public Changes
Estimated code review effort🎯 2 (Simple) | ⏱️ ~10 minutes 🚥 Pre-merge checks | ✅ 2 | ❌ 1❌ Failed checks (1 warning)
✅ Passed checks (2 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. ✨ Finishing touches
🧪 Generate unit tests (beta)
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. Comment |
There was a problem hiding this comment.
Actionable comments posted: 0
Caution
Some comments are outside the diff and can’t be posted inline due to platform limitations.
⚠️ Outside diff range comments (1)
cpp/include/tensorrt_llm/common/cudaUtils.h (1)
2-2:⚠️ Potential issue | 🟡 MinorUpdate copyright year to include 2026.
The copyright header shows
2022-2024, but this file is being meaningfully modified in 2026. As per coding guidelines, the copyright header should reflect the year of latest meaningful modification.- * SPDX-FileCopyrightText: Copyright (c) 2022-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved. + * SPDX-FileCopyrightText: Copyright (c) 2022-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
🧹 Nitpick comments (1)
cpp/include/tensorrt_llm/common/cudaUtils.h (1)
166-178: Static variable naming should use 's' prefix.Per coding guidelines, locally visible static variables should use camelCase prefixed with 's'. The variable
doCheckIfNotCapturingshould be renamed tosDoCheckIfNotCapturing.📝 Proposed fix
- static bool const doCheckIfNotCapturing = []() + static bool const sDoCheckIfNotCapturing = []() { char const* env = std::getenv("CUDA_LAUNCH_BLOCKING"); if (env != nullptr) { return std::string(env) == "1"; } `#ifndef` NDEBUG return true; `#else` return false; `#endif` }(); - return doCheckIfNotCapturing && !isCapturing(stream); + return sDoCheckIfNotCapturing && !isCapturing(stream);
|
@coderabbitai apply the suggested copyright and variable naming fixes |
|
Tip For best results, initiate chat on the files or code changes. 🧩 Analysis chain🏁 Script executed: Length of output: 1110 🏁 Script executed: Length of output: 62744
✏️ Learnings added
🧠 Learnings used💡 Use |
c98b4a0 to
06cefcc
Compare
|
/bot run |
|
PR_Github #34837 [ run ] triggered by Bot. Commit: |
|
PR_Github #34837 [ run ] completed with state
|
|
/bot run |
|
PR_Github #34910 [ run ] triggered by Bot. Commit: |
|
PR_Github #34910 [ run ] completed with state
|
06cefcc to
07debb0
Compare
|
/bot run |
|
PR_Github #34919 [ run ] triggered by Bot. Commit: |
|
PR_Github #34919 [ run ] completed with state |
07debb0 to
92c796a
Compare
|
/bot run |
|
PR_Github #35009 [ run ] triggered by Bot. Commit: |
mikeiovine
left a comment
There was a problem hiding this comment.
Thanks for cleaning it up
|
PR_Github #35009 [ run ] completed with state
|
92c796a to
8ffa120
Compare
|
/bot run |
1 similar comment
|
/bot run |
|
PR_Github #35031 [ run ] triggered by Bot. Commit: |
|
PR_Github #35031 [ run ] completed with state |
8ffa120 to
4b18a76
Compare
|
/bot run |
|
PR_Github #35142 [ run ] triggered by Bot. Commit: |
|
PR_Github #35142 [ run ] completed with state
|
Signed-off-by: Harris Nover <249353502+hnover-nv@users.noreply.github.com>
4b18a76 to
6daad3f
Compare
|
/bot run |
|
PR_Github #35200 [ run ] triggered by Bot. Commit: |
|
PR_Github #35200 [ run ] completed with state |
|
/bot skip --comment "passed last night, accidentally updated branch instead of merging, but don't need to retest" |
|
PR_Github #35243 Bot args parsing error: Failed to parse bot args |
|
/bot skip --comment "updated to main by accident, already passed" |
|
PR_Github #35244 [ skip ] triggered by Bot. Commit: |
|
PR_Github #35244 [ skip ] completed with state |
…IA#11261) Signed-off-by: Harris Nover <249353502+hnover-nv@users.noreply.github.com> Signed-off-by: Ahmet Inci <ainci@nvidia.com>
Description
The cpp macro sync_check_cuda_error(stream) is intended to conditionally synchronize the thread to the current stream and then check for any cuda errors, based on user control and build type. Namely, the user can set the environement variable CUDA_LAUNCH_BLOCKING to 0 or 1, and it should be respected. If the variable is unset, then we should sync and check for debug builds but not for other builds. (Additionally, we never sync and check if we're in the midst of capturing a cuda graph).
To avoid constantly looking up the environment variable, the existing code used a thread local variable firstCall to run the lookup once. But a conditional was inverted, so the lookup never ran, and we only followed the build-type behavior. Even if it did run, although the code returns an optional, once it ran it would have always set true or false, losing the "environement variable not set" behavior.
Here we fix all that, simplifying to using a lambda-initialized const static variable instead of the thread local and combining two functions.
Test Coverage
There do not seem to be any existing tests that directly exercise it. There are two test decorators that reference it:
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.
[ x] 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.