OCR 修复:无 cuDNN 用 CPU、禁用 ir_optim 避免 SIGILL。
This commit is contained in:
@@ -10,6 +10,7 @@ from fastapi import FastAPI, File, Header, HTTPException, UploadFile
|
||||
from PIL import Image
|
||||
|
||||
os.environ.setdefault("OPENCV_IO_ENABLE_OPENEXR", "0")
|
||||
os.environ.setdefault("FLAGS_use_mkldnn", "0")
|
||||
|
||||
logging.basicConfig(level=logging.INFO, format="%(asctime)s [%(levelname)s] %(message)s")
|
||||
logger = logging.getLogger("ocr-worker")
|
||||
@@ -36,7 +37,8 @@ def _create_engine(use_gpu: bool):
|
||||
lang="ch",
|
||||
show_log=False,
|
||||
use_gpu=use_gpu,
|
||||
enable_mkldnn=not use_gpu,
|
||||
enable_mkldnn=False,
|
||||
ir_optim=False,
|
||||
det_limit_side_len=min(OCR_MAX_SIDE, 1280),
|
||||
rec_batch_num=8,
|
||||
)
|
||||
@@ -150,19 +152,7 @@ def _run_ocr_impl(content: bytes) -> dict:
|
||||
|
||||
|
||||
def run_ocr_on_bytes(content: bytes) -> dict:
|
||||
try:
|
||||
return _run_ocr_impl(content)
|
||||
except Exception as exc:
|
||||
err = str(exc).lower()
|
||||
gpu_fail = _engine_mode == "gpu" and any(
|
||||
x in err for x in ("cuda", "cudnn", "gpu", "out of memory", "resource exhausted", "precondition")
|
||||
)
|
||||
if gpu_fail and OCR_USE_GPU:
|
||||
logger.warning("GPU OCR runtime failed, retry CPU: %s", exc)
|
||||
_reset_engine()
|
||||
get_engine(force_cpu=True)
|
||||
return _run_ocr_impl(content)
|
||||
raise
|
||||
return _run_ocr_impl(content)
|
||||
|
||||
|
||||
@app.get("/health")
|
||||
|
||||
@@ -25,23 +25,23 @@ source "${VENV}/bin/activate"
|
||||
pip install -U pip wheel -i "${PIP_MIRROR}"
|
||||
|
||||
install_paddle() {
|
||||
if command -v nvidia-smi >/dev/null 2>&1; then
|
||||
local use_gpu="${OCR_USE_GPU:-false}"
|
||||
if [[ "${use_gpu}" == "true" ]] && command -v nvidia-smi >/dev/null 2>&1 && ldconfig -p 2>/dev/null | grep -q libcudnn; then
|
||||
local cuda_major
|
||||
cuda_major="$(nvidia-smi 2>/dev/null | sed -n 's/.*CUDA Version: \([0-9]*\)\.[0-9]*/\1/p' | head -1)"
|
||||
cuda_major="${cuda_major:-11}"
|
||||
echo "==> 检测到 NVIDIA GPU,CUDA 主版本: ${cuda_major}"
|
||||
echo "==> 安装 paddlepaddle-gpu (CUDA ${cuda_major}.x)…"
|
||||
if [[ "${cuda_major}" -ge 12 ]]; then
|
||||
echo "==> 安装 paddlepaddle-gpu (CUDA 12.x)…"
|
||||
pip install paddlepaddle-gpu==2.6.2 -i https://www.paddlepaddle.org.cn/packages/stable/cu123/ \
|
||||
|| pip install paddlepaddle-gpu==2.6.2 -i https://www.paddlepaddle.org.cn/packages/stable/cu118/
|
||||
else
|
||||
echo "==> 安装 paddlepaddle-gpu (CUDA 11.x)…"
|
||||
pip install paddlepaddle-gpu==2.6.2 -i https://www.paddlepaddle.org.cn/packages/stable/cu118/
|
||||
fi
|
||||
else
|
||||
echo "==> 未检测到 GPU,安装 CPU 版 paddlepaddle…"
|
||||
echo "==> 安装 paddlepaddle CPU(无 cuDNN 或 OCR_USE_GPU=false)…"
|
||||
pip install paddlepaddle==2.6.2 -i "${PIP_MIRROR}"
|
||||
fi
|
||||
pip install 'protobuf>=3.20,<4' -q
|
||||
}
|
||||
|
||||
install_paddle
|
||||
|
||||
Reference in New Issue
Block a user