From df7822b98b27b18abc7699ef36c62da50bc93714 Mon Sep 17 00:00:00 2001 From: zhouwei25 Date: Tue, 22 Jun 2021 07:37:30 +0000 Subject: [PATCH 1/2] Modify the search order of dynamic library --- paddle/fluid/platform/dynload/dynamic_loader.cc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/paddle/fluid/platform/dynload/dynamic_loader.cc b/paddle/fluid/platform/dynload/dynamic_loader.cc index be9cda4a2e9b6c..f0a46e0818af74 100644 --- a/paddle/fluid/platform/dynload/dynamic_loader.cc +++ b/paddle/fluid/platform/dynload/dynamic_loader.cc @@ -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; } From 03de7368a93674b76c32c69f00a16fffda214459 Mon Sep 17 00:00:00 2001 From: zhouwei25 Date: Wed, 23 Jun 2021 10:16:30 +0000 Subject: [PATCH 2/2] Modify the search order of dynamic library --- tools/parallel_UT_rule.py | 1 - 1 file changed, 1 deletion(-) diff --git a/tools/parallel_UT_rule.py b/tools/parallel_UT_rule.py index dbb77d07d5accc..5108d34f7bf779 100644 --- a/tools/parallel_UT_rule.py +++ b/tools/parallel_UT_rule.py @@ -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',