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

Make ucx linkage explicit and add a new CMake target for it #1032

Merged
merged 9 commits into from
Nov 18, 2022
Merged

Make ucx linkage explicit and add a new CMake target for it #1032

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
2790bfc
Replace calls to dlsym functions with actual functions.
vyasr Nov 18, 2022
7164f9a
Get rid of internal dlopen-based APIs.
vyasr Nov 18, 2022
2c92fe6
Inline trivial ucp function call.
vyasr Nov 18, 2022
84f83c9
Remove now extraneous typedefs.
vyasr Nov 18, 2022
617059f
Update comment.
vyasr Nov 18, 2022
d849000
Remove dlfcn header.
vyasr Nov 18, 2022
f3466c7
Add ucx to the link interface of libraft.
vyasr Nov 18, 2022
889b78a
Fix typo in project name.
vyasr Nov 18, 2022
6709291
Add a new distributed component for ucx.
vyasr Nov 18, 2022
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
Get rid of internal dlopen-based APIs.
  • Loading branch information
@vyasr
vyasr committed Nov 18, 2022
commit 7164f9a72dc835c4465b96778e8763f8c907c6e4
68 changes: 0 additions & 68 deletions cpp/include/raft/comms/detail/ucp_helper.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,75 +94,7 @@ static void recv_callback(void* request, ucs_status_t status, ucp_tag_recv_info_
* interacting with ucp.
*/
class comms_ucp_handler {
public:
comms_ucp_handler()
{
load_ucp_handle();
load_send_func();
load_recv_func();
load_free_req_func();
load_print_info_func();
load_worker_progress_func();
}

~comms_ucp_handler() { dlclose(ucp_handle); }

private:
void* ucp_handle;

dlsym_print_info print_info_func;
dlsym_rec_free req_free_func;
dlsym_worker_progress worker_progress_func;
dlsym_send send_func;
dlsym_recv recv_func;

void load_ucp_handle()
{
ucp_handle = dlopen("libucp.so", RTLD_LAZY | RTLD_NOLOAD | RTLD_NODELETE);
if (!ucp_handle) {
ucp_handle = dlopen("libucp.so", RTLD_LAZY | RTLD_NODELETE);
ASSERT(ucp_handle, "Cannot open UCX library: %s\n", dlerror());
}
// Reset any potential error
dlerror();
}

void assert_dlerror()
{
char* error = dlerror();
ASSERT(error == NULL, "Error loading function symbol: %s\n", error);
}

void load_send_func()
{
send_func = (dlsym_send)dlsym(ucp_handle, "ucp_tag_send_nb");
assert_dlerror();
}

void load_free_req_func()
{
req_free_func = (dlsym_rec_free)dlsym(ucp_handle, "ucp_request_free");
assert_dlerror();
}

void load_print_info_func()
{
print_info_func = (dlsym_print_info)dlsym(ucp_handle, "ucp_ep_print_info");
assert_dlerror();
}

void load_worker_progress_func()
{
worker_progress_func = (dlsym_worker_progress)dlsym(ucp_handle, "ucp_worker_progress");
assert_dlerror();
}

void load_recv_func()
{
recv_func = (dlsym_recv)dlsym(ucp_handle, "ucp_tag_recv_nb");
assert_dlerror();
}

ucp_tag_t build_message_tag(int rank, int tag) const
{
// keeping the rank in the lower bits enables debugging.
Expand Down