1
0
mirror of https://github.com/sui-feng-cb/AzurLaneAutoScript1.git synced 2026-08-19 20:55:05 +08:00

Feat: adopt upstream standalone ONNX OCR backend

Adopt the standalone OnnxOcr from upstream PR #5893 (381bb8d05,
by Horizon101011), which vendors cnocr's pure-Python pipeline so
the ONNX path loads no mxnet at runtime. Backend is selected via
deploy config, keeping onnxruntime a standard dependency and onnx
the default.

Co-authored-by: Horizon101011 <43370844+Horizon101011@users.noreply.github.com>
This commit is contained in:
positnuec
2026-08-16 21:56:43 +08:00
parent b1100369f7
commit 239f252881
17 changed files with 338 additions and 166 deletions

View File

@@ -66,7 +66,7 @@ class ModuleBase:
def early_ocr_import(self):
"""
Start a thread to import cnocr and mxnet while the Alas instance just starting to take screenshots
Start a thread to import OCR dependencies while the Alas instance just starting to take screenshots
The import is paralleled since taking screenshot is I/O-bound while importing is CPU-bound,
thus would speed up the startup 0.5 ~ 1.0s and even 5s on slow PCs.
"""
@@ -79,6 +79,11 @@ class ModuleBase:
logger.info('No ocr in daemon task, skip early_ocr_import')
return
from module.webui.setting import State
if State.deploy_config.UseOcrServer:
logger.info('UseOcrServer enabled, skip early_ocr_import')
return
def do_ocr_import():
# Wait first image
import time
@@ -88,8 +93,8 @@ class ModuleBase:
time.sleep(0.01)
logger.info('early_ocr_import start')
from module.ocr.al_ocr import AlOcr
_ = AlOcr
from module.ocr.models import OCR_MODEL
OCR_MODEL.load()
logger.info('early_ocr_import finish')
logger.info('early_ocr_import call')