Skip to content
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

Use runtime check of cudart version for eig #2430

Merged
merged 5 commits into from
Sep 20, 2024
Merged

Use runtime check of cudart version for eig #2430

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ef629ce
Use runtime check of cudart version for eig
lowener Sep 11, 2024
9175b86
Merge branch 'branch-24.10' into 24.10-eig-stream
lowener Sep 11, 2024
e76eb18
Fix compilation
lowener Sep 11, 2024
64a9e2e
Fix uninitialized cuda event
lowener Sep 11, 2024
b90159f
Merge branch 'branch-24.10' into 24.10-eig-stream
lowener Sep 19, 2024
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
31 changes: 17 additions & 14 deletions cpp/include/raft/linalg/detail/eig.cuh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,16 +95,19 @@ void eigDC(raft::resources const& handle,
return;
#endif

#if CUDART_VERSION <= 12040
// Use a new stream instead of `cudaStreamPerThread` to avoid cusolver bug # 4580093.
int cudart_version = 0;
RAFT_CUDA_TRY(cudaRuntimeGetVersion(&cudart_version));
cudaStream_t stream_new;
cudaEvent_t sync_event = resource::detail::get_cuda_stream_sync_event(handle);
rmm::cuda_stream stream_new_wrapper;
cudaStream_t stream_new = stream_new_wrapper.value();
cudaEvent_t sync_event = resource::detail::get_cuda_stream_sync_event(handle);
RAFT_CUDA_TRY(cudaEventRecord(sync_event, stream));
RAFT_CUDA_TRY(cudaStreamWaitEvent(stream_new, sync_event));
#else
cudaStream_t stream_new = stream;
#endif
if (cudart_version < 12050) {
// Use a new stream instead of `cudaStreamPerThread` to avoid cusolver bug # 4580093.
stream_new = stream_new_wrapper.value();
RAFT_CUDA_TRY(cudaEventRecord(sync_event, stream));
RAFT_CUDA_TRY(cudaStreamWaitEvent(stream_new, sync_event));
} else {
stream_new = stream;
}
cusolverDnHandle_t cusolverH = resource::get_cusolver_dn_handle(handle);

cusolverDnParams_t dn_params = nullptr;
Expand Down Expand Up @@ -152,11 +155,11 @@ void eigDC(raft::resources const& handle,
"eig.cuh: eigensolver couldn't converge to a solution. "
"This usually occurs when some of the features do not vary enough.");

#if CUDART_VERSION <= 12040
// Synchronize the created stream with the original stream before return
RAFT_CUDA_TRY(cudaEventRecord(sync_event, stream_new));
RAFT_CUDA_TRY(cudaStreamWaitEvent(stream, sync_event));
#endif
if (cudart_version < 12050) {
// Synchronize the created stream with the original stream before return
RAFT_CUDA_TRY(cudaEventRecord(sync_event, stream_new));
RAFT_CUDA_TRY(cudaStreamWaitEvent(stream, sync_event));
}
}

enum EigVecMemUsage { OVERWRITE_INPUT, COPY_INPUT };
Expand Down
Loading