diff --git a/paddle/fluid/platform/dynload/dynamic_loader.cc b/paddle/fluid/platform/dynload/dynamic_loader.cc index be9cda4a2e9b6c709c96ee4ffe005597b9f44c24..f0a46e0818af748b37e0abce44096fe3cf73b126 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; } diff --git a/tools/parallel_UT_rule.py b/tools/parallel_UT_rule.py index dbb77d07d5accc55db059e74d27b65f9266ef7a3..5108d34f7bf779413c630b2b1fa31f5b8095e68d 100644 --- a/tools/parallel_UT_rule.py +++ b/tools/parallel_UT_rule.py @@ -665,7 +665,6 @@ TWO_PARALLEL_JOB = [ 'convert_model2dot_ernie', 'im2col_test', 'test_logical_op', - 'test_imperative_mnist', 'test_imperative_deepcf', 'test_cholesky_op', 'test_sample_logits_op',