Skip to content

Modify the search order of dynamic library #33722

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 3 commits into from
Jun 24, 2021
Merged

Modify the search order of dynamic library #33722

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
df7822b
Modify the search order of dynamic library
zhwesky2010 Jun 22, 2021
f91578a
Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…
zhwesky2010 Jun 22, 2021
03de736
Modify the search order of dynamic library
zhwesky2010 Jun 23, 2021
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
10 changes: 5 additions & 5 deletions paddle/fluid/platform/dynload/dynamic_loader.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,17 +219,17 @@ static inline void* GetDsoHandleFromSearchPath(
for (auto dso : dso_names) {
// 1. search in user config path by FLAGS
dso_handle = GetDsoHandleFromSpecificPath(config_path, dso, dynload_flags);
// 2. search in extra paths
// 2. search in system default path
if (nullptr == dso_handle) {
dso_handle = GetDsoHandleFromDefaultPath(dso, dynload_flags);
}
// 3. search in extra paths
if (nullptr == dso_handle) {
for (auto path : extra_paths) {
VLOG(3) << "extra_paths: " << path;
dso_handle = GetDsoHandleFromSpecificPath(path, dso, dynload_flags);
}
}
// 3. search in system default path
if (nullptr == dso_handle) {
dso_handle = GetDsoHandleFromDefaultPath(dso, dynload_flags);
}
if (nullptr != dso_handle) break;
}

Expand Down
1 change: 0 additions & 1 deletion tools/parallel_UT_rule.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -665,7 +665,6 @@
'convert_model2dot_ernie',
'im2col_test',
'test_logical_op',
'test_imperative_mnist',
'test_imperative_deepcf',
'test_cholesky_op',
'test_sample_logits_op',
Expand Down