Skip to content

Fix: delay CUDADriverWrapper instantiation to avoid uncaught exception #25117

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 20, 2025
Merged

Fix: delay CUDADriverWrapper instantiation to avoid uncaught exception #25117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions onnxruntime/contrib_ops/cuda/bert/tensorrt_fused_multihead_attention/cudaDriverWrapper.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,10 +136,8 @@ CUresult CUDADriverWrapper::cuLaunchKernel(
f, gridDimX, gridDimY, gridDimZ, blockDimX, blockDimY, blockDimZ, sharedMemBytes, hStream, kernelParams, extra);
}

// Initialize the singleton instance
CUDADriverWrapper CUDADriverWrapper::instance;

const CUDADriverWrapper* CUDADriverWrapper::GetInstance() {
static CUDADriverWrapper instance;
return &instance;
}

Expand Down
2 changes: 0 additions & 2 deletions onnxruntime/contrib_ops/cuda/bert/tensorrt_fused_multihead_attention/cudaDriverWrapper.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,6 @@ class CUDADriverWrapper {
CUfunction f, uint32_t gridDimX, uint32_t gridDimY, uint32_t gridDimZ,
uint32_t blockDimX, uint32_t blockDimY, uint32_t blockDimZ, uint32_t sharedMemBytes, CUstream hStream,
void** kernelParams, void** extra);

static CUDADriverWrapper instance;
};

inline void cuErrCheck_(CUresult stat, const CUDADriverWrapper& wrap, const char* file, int line) {
Expand Down
Loading