LLM inference in C/C++
C++ ggml
ggml : don't crash when backend search path can't be read (#28271)
Adrien Gallouët4cbe8b070bb0
diff --git a/ggml/src/ggml-backend-reg.cpp b/ggml/src/ggml-backend-reg.cppindex e595946707..1c18b82cd5 100644--- a/ggml/src/ggml-backend-reg.cpp+++ b/ggml/src/ggml-backend-reg.cpp@@ -490,7 +490,13 @@ static ggml_backend_reg_t ggml_backend_load_best(const char * name, bool silent,#endif// default search paths: executable directory, current directorysearch_paths.push_back(get_executable_path());- search_paths.push_back(fs::current_path());+ std::error_code cwd_ec;+ const fs::path cwd = fs::current_path(cwd_ec);+ if (cwd_ec) {+ GGML_LOG_DEBUG("%s: current_path() failure, error-message: %s\n", __func__, cwd_ec.message().c_str());+ } else {+ search_paths.push_back(cwd);+ }} else {search_paths.push_back(fs::u8path(user_search_path));}@@ -508,8 +514,14 @@ static ggml_backend_reg_t ggml_backend_load_best(const char * name, bool silent,}continue;}- fs::directory_iterator dir_it(search_path, fs::directory_options::skip_permission_denied);- for (const auto & entry : dir_it) {+ std::error_code dir_ec;+ fs::directory_iterator dir_it(search_path, fs::directory_options::skip_permission_denied, dir_ec);+ if (dir_ec) {+ GGML_LOG_DEBUG("%s: failed to enumerate %s: %s\n", __func__, path_str(search_path).c_str(), dir_ec.message().c_str());+ continue;+ }+ for (const fs::directory_iterator end; dir_it != end; dir_it.increment(dir_ec)) {+ const auto & entry = *dir_it;if (entry.is_regular_file(ec)) {auto filename = entry.path().filename();auto ext = entry.path().extension();