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

Jump to bottom

Only load versioned libcufile #548

Merged
merged 4 commits into from
Apr 27, 2023
Merged

Only load versioned libcufile #548

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
25a1c7d
Overload `load_library` to handle multiple names
jakirkham Apr 26, 2023
bc322c8
Load versioned `libcufile`'s only
jakirkham Apr 26, 2023
a3b0b93
Update gds/src/cufile_stub.cpp
grlee77 Apr 26, 2023
e66ae6d
Merge branch 'branch-23.06' into fix_dlopen_libcufile
jakirkham Apr 27, 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
20 changes: 20 additions & 0 deletions cpp/include/cucim/dynlib/helper.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
#include "../macros/defines.h"

#include <string>
#include <vector>

#if CUCIM_PLATFORM_LINUX
# include <dlfcn.h>
Expand Down Expand Up @@ -74,6 +75,25 @@ inline LibraryHandle load_library(const char* library_name, int mode = -1)
#endif
}

inline LibraryHandle load_library(const std::vector<const char*>& names,
int mode = -1)
{
#if CUCIM_PLATFORM_LINUX
LibraryHandle handle_ = nullptr;
for (const char* name : names)
{
handle_= load_library(name, mode);
if (handle_ != nullptr)
{
return handle_;
}
}
return nullptr;
#else
# error "This platform is not supported!"
#endif
}

inline std::string get_last_load_library_error()
{
#if CUCIM_PLATFORM_LINUX
Expand Down
18 changes: 16 additions & 2 deletions gds/src/cufile_stub.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,23 @@ void CuFileStub::load()
#if !CUCIM_STATIC_GDS
if (handle_ == nullptr)
{
// Note: Load the dynamic library with RTLD_NODELETE flag because libcufile.so uses therad_local which can
// Note: Load the dynamic library with RTLD_NODELETE flag because libcufile.so uses thread_local which can
// cause a segmentation fault if the library is dynamically loaded/unloaded. (See #158)
handle_ = cucim::dynlib::load_library("libcufile.so", RTLD_LAZY | RTLD_LOCAL | RTLD_NODELETE);
// CUDA versions before CUDA 11.7.1 did not ship libcufile.so.0, so this is
// a workaround that adds support for all prior versions of libcufile.
handle_ = cucim::dynlib::load_library(
{
"libcufile.so.0",
"libcufile.so.1.3.0" /* 11.7.0 */,
"libcufile.so.1.2.1" /* 11.6.2, 11.6.1 */,
"libcufile.so.1.2.0" /* 11.6.0 */,
"libcufile.so.1.1.1" /* 11.5.1 */,
"libcufile.so.1.1.0" /* 11.5.0 */,
"libcufile.so.1.0.2" /* 11.4.4, 11.4.3, 11.4.2 */,
"libcufile.so.1.0.1" /* 11.4.1 */,
"libcufile.so.1.0.0" /* 11.4.0 */
},
RTLD_LAZY | RTLD_LOCAL | RTLD_NODELETE);
if (handle_ == nullptr)
{
return;
Expand Down