From 59cac0fe4244bf4fb861e9c80f57bd9e1fa55f39 Mon Sep 17 00:00:00 2001 From: vansangpfiev Date: Wed, 18 Dec 2024 15:12:54 +0700 Subject: [PATCH 1/2] fix: only use dll search path if ENGINE_PATH is not set --- engine/services/engine_service.cc | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/engine/services/engine_service.cc b/engine/services/engine_service.cc index 1f3e4d81c..9d9aa785e 100644 --- a/engine/services/engine_service.cc +++ b/engine/services/engine_service.cc @@ -704,21 +704,24 @@ cpp::result EngineService::LoadEngine( #if defined(_WIN32) || defined(_WIN64) // register deps - std::vector paths{}; - paths.push_back(std::move(cuda_path)); - paths.push_back(std::move(engine_dir_path)); - - CTL_DBG("Registering dylib for " - << ne << " with " << std::to_string(paths.size()) << " paths."); - for (const auto& path : paths) { - CTL_DBG("Registering path: " << path.string()); - } + if (bool should_use_dll_search_path = !(getenv("ENGINE_PATH")); + should_use_dll_search_path) { + std::vector paths{}; + paths.push_back(std::move(cuda_path)); + paths.push_back(std::move(engine_dir_path)); - auto reg_result = dylib_path_manager_->RegisterPath(ne, paths); - if (reg_result.has_error()) { - CTL_DBG("Failed register lib paths for: " << ne); - } else { - CTL_DBG("Registered lib paths for: " << ne); + CTL_DBG("Registering dylib for " + << ne << " with " << std::to_string(paths.size()) << " paths."); + for (const auto& path : paths) { + CTL_DBG("Registering path: " << path.string()); + } + + auto reg_result = dylib_path_manager_->RegisterPath(ne, paths); + if (reg_result.has_error()) { + CTL_DBG("Failed register lib paths for: " << ne); + } else { + CTL_DBG("Registered lib paths for: " << ne); + } } #endif From 128b2bc07f8534fe759f203f43905051438cb912 Mon Sep 17 00:00:00 2001 From: vansangpfiev Date: Wed, 18 Dec 2024 15:20:35 +0700 Subject: [PATCH 2/2] chore: remove unused --- engine/services/engine_service.cc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/engine/services/engine_service.cc b/engine/services/engine_service.cc index 9d9aa785e..bdd080f50 100644 --- a/engine/services/engine_service.cc +++ b/engine/services/engine_service.cc @@ -704,8 +704,7 @@ cpp::result EngineService::LoadEngine( #if defined(_WIN32) || defined(_WIN64) // register deps - if (bool should_use_dll_search_path = !(getenv("ENGINE_PATH")); - should_use_dll_search_path) { + if (!(getenv("ENGINE_PATH"))) { std::vector paths{}; paths.push_back(std::move(cuda_path)); paths.push_back(std::move(engine_dir_path));