fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-16 09:50:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: 将OCR模型改为同步加载

Browse Source 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/3342
This commit is contained in:
MistEO
2023-01-12 15:16:54 +08:00
parent c021ff5955
commit 8a6a1e7b41
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/MaaCore/Config/ResourceLoader.cpp
View File

@@ -27,7 +27,6 @@ bool asst::ResourceLoader::load(const std::filesystem::path& path)
auto full_path = path / Filename; \
bool ret = load_resource<Config>(full_path); \
if (!ret) { \
m_loaded = false; \
Log.error(#Config, " load failed, path:", full_path); \
return false; \
} \
@@ -40,7 +39,6 @@ bool asst::ResourceLoader::load(const std::filesystem::path& path)
auto full_templ_dir = path / TemplDir; \
bool ret = load_resource_with_templ<Config>(full_path, full_templ_dir); \
if (!ret) { \
m_loaded = false; \
Log.error(#Config, "load failed, path:", full_path, ", templ dir:", full_templ_dir); \
return false; \
} \
@@ -73,11 +71,8 @@ bool asst::ResourceLoader::load(const std::filesystem::path& path)
});
auto ocr_future = std::async(std::launch::async, [&]() -> bool {
// fastdeploy 不知道有啥问题，没法异步加载两个模型，改成同步算了
LoadResourceAndCheckRet(WordOcr, "PaddleOCR"_p);
return true;
});
auto ocr_char_future = std::async(std::launch::async, [&]() -> bool {
LoadResourceAndCheckRet(CharOcr, "PaddleCharOCR"_p);
return true;
});
@@ -85,7 +80,11 @@ bool asst::ResourceLoader::load(const std::filesystem::path& path)
#undef LoadTemplByConfigAndCheckRet
#undef LoadResourceAndCheckRet
m_loaded = config_future.get() && tile_future.get() && ocr_future.get() && ocr_char_future.get();
m_loaded = true;
m_loaded &= config_future.get();
m_loaded &= tile_future.get();
m_loaded &= ocr_future.get();
return m_loaded;
}