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

Fix the destruction of interruptible token registry #1229

Merged
merged 17 commits into from
Feb 15, 2023
Merged

Fix the destruction of interruptible token registry #1229

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
863ead0
Wrap the registry in a shared pointer and access it using weak pointers
achirkin Feb 2, 2023
456e8e2
Merge remote-tracking branch 'rapidsai/branch-23.02' into fix-interru…
achirkin Feb 3, 2023
ddd5a61
Revert #1224
achirkin Feb 3, 2023
5d15f66
Only use the mutex if the registry still exists
achirkin Feb 3, 2023
da2fe6a
Merge branch 'branch-23.02' into fix-interruptible-destruction
cjnolet Feb 3, 2023
d7cabcb
Merge branch 'branch-23.04' into fix-interruptible-destruction
cjnolet Feb 3, 2023
8778b30
Merge branch 'branch-23.04' into fix-interruptible-destruction
cjnolet Feb 4, 2023
eb92501
Merge branch 'branch-23.04' into fix-interruptible-destruction
cjnolet Feb 7, 2023
61b66a2
Merge remote-tracking branch 'rapidsai/branch-23.04' into fix-interru…
achirkin Feb 8, 2023
1a416fa
Put both the map and the mutex into one shared_ptr and make sure to o…
achirkin Feb 8, 2023
00cccb0
Merge branch 'branch-23.04' into fix-interruptible-destruction
cjnolet Feb 8, 2023
8583e4f
Fix compile time explosion for minkowski distance (#1254)
ahendriksen Feb 9, 2023
4977c30
Merge remote-tracking branch 'rapidsai/branch-23.04' into fix-interru…
achirkin Feb 9, 2023
6230b28
Merge remote-tracking branch 'rapidsai/branch-23.04' into fix-interru…
achirkin Feb 13, 2023
221cc54
Merge remote-tracking branch 'rapidsai/branch-23.04' into fix-interru…
achirkin Feb 13, 2023
4873727
Refactor the token deleter from the lambda to a custom type
achirkin Feb 13, 2023
add6a43
Merge remote-tracking branch 'rapidsai/branch-23.04' into fix-interru…
achirkin Feb 14, 2023
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
Prev Previous commit
Next Next commit
Revert #1224
  • Loading branch information
@achirkin
achirkin committed Feb 3, 2023
commit ddd5a61311e059c209a19fac5430ee87c5f6d2ad
7 changes: 2 additions & 5 deletions cpp/include/raft/core/resource/cuda_stream.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,10 +91,7 @@ inline void set_cuda_stream(resources const& res, rmm::cuda_stream_view stream_v
*/
inline void sync_stream(const resources& res, rmm::cuda_stream_view stream)
{
// TODO: Fix interruptible segfault:
// https://github.com/rapidsai/raft/issues/1225
// interruptible::synchronize(stream);
RAFT_CUDA_TRY(cudaStreamSynchronize(stream));
interruptible::synchronize(stream);
}

/**
Expand All @@ -106,4 +103,4 @@ inline void sync_stream(const resources& res) { sync_stream(res, get_cuda_stream
* @}
*/

} // namespace raft::resource
} // namespace raft::resource