frozenleaves/pytorch
1
0
Fork 0
mirror of https://github.com/pytorch/pytorch.git synced 2025-10-20 21:14:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

[BE] Preserve caller source location in the error message (#162808)

Browse Source 
Summary:
Currently the C10_CUDA_CHECK only shows source location in CUDAException like below:
```
Exception raised from c10_cuda_check_implementation at fbcode/caffe2/c10/cuda/CUDAException.cpp:44
```
which is not terribly useful.

By checking the original diff D39619861 that introduced c10_cuda_check_implementation, it seems the original macro would show the source location correctly but c10_cuda_check_implementation broke it.

This diff will propagate caller source location to c10_cuda_check_implementation to fix the issue.

Test Plan:
CI

Observed desired error message after the change:
```
CUDA error: an illegal memory access was encountered
Search for `cudaErrorIllegalAddress' in https://docs.nvidia.com/cuda/cuda-runtime-api/group__CUDART__TYPES.html for more information.
CUDA kernel errors might be asynchronously reported at some other API call, so the stacktrace below might be incorrect.
For debugging consider passing CUDA_LAUNCH_BLOCKING=1
Device-side assertion tracking was not enabled by user.
Exception raised from operator() at fbcode/sigrid/predictor/aed/AedContainer.cpp:659 (most recent call first):
```

Note the last line reports actual caller location.

Rollback Plan:

Reviewed By: Raymo111

Differential Revision: D81880552

Pull Request resolved: https://github.com/pytorch/pytorch/pull/162808
Approved by: https://github.com/janeyx99
This commit is contained in:
albanD
2025-09-15 13:29:43 +00:00
committed by PyTorch MergeBot
parent 456fbeaa6d
commit 09cbf34e93
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
c10/cuda/CUDAException.cpp
View File

@ -10,9 +10,9 @@ namespace c10::cuda {
void c10_cuda_check_implementation(
const int32_t err,
const char* /*filename*/,
const char* /*function_name*/,
const int /*line_number*/,
const char* filename,
const char* function_name,
const uint32_t line_number,
const bool include_device_assertions) {
const auto cuda_error = static_cast<cudaError_t>(err);
const auto cuda_kernel_failure = include_device_assertions
@ -41,7 +41,7 @@ void c10_cuda_check_implementation(
}
#endif
throw c10::AcceleratorError(
{__func__, __FILE__, int32_t(__LINE__)}, err, check_message);
{function_name, filename, line_number}, err, check_message);
}
} // namespace c10::cuda

2
c10/cuda/CUDAException.h
View File

@ -91,7 +91,7 @@ C10_CUDA_API void c10_cuda_check_implementation(
const int32_t err,
const char* filename,
const char* function_name,
const int line_number,
const uint32_t line_number,
const bool include_device_assertions);
} // namespace c10::cuda