build: CPU/GPU 双环境、产物命名与打包修复
交付:
· 产物按变体命名:CPU -> dist/ocr-server/,GPU -> dist/ocr-server-gpu/。
变体由构建环境实际装的 paddle 自动判断,不需要人工声明
· GPU 包额外加 --collect-binaries nvidia。漏收的后果实测是最难查的那种:
引擎能正常加载、设备也识别成 GPU,但第一次推理才报
cudnn64_9.dll error 126
· --copy-metadata 的发行包名随变体变化(paddlepaddle / paddlepaddle-gpu),
改由 scripts/paddle_env.py 动态取;写死任何一个在另一种环境下都打不出包
· 新增 scripts/prepare_release_config.py 按变体覆盖发布配置(用 Python 改写
以保持 UTF-8,PowerShell 的 Set-Content 会把中文注释写坏)
环境:
· paddle 从 pyproject 依赖里移除,改用 scripts/install_paddle.py 安装。
它没法写死:CPU/GPU 互斥,GPU 还得按显卡选 CUDA 通道(RTX 50 系必须 cu129)。
钉死 CPU 版时,uv sync / uv run / PyCharm 自动同步都会把装好的
paddlepaddle-gpu 静默挤掉、服务悄悄退回 CPU(实测踩过三次)
· 新增 scripts/switch_env.py:.venv(CPU)与 .venv-gpu(GPU)两套环境共存,
切换零成本;所有 uv run 补 --no-sync,打包改用 uv sync --inexact
· 预置模型扩到 8 套(v4/v5 × 服务端/移动端 × 检测/识别,约 398MB)
其它:
· scripts/start.* 先找发布包再退回源码环境;入口脚本名固定是 ocr-server
· benchmark_ocr.py 输出 segments 与 chars,换设备/模型时可直接比对召回
· .gitignore 覆盖 .venv-gpu/ 与 dist*/
Co-Authored-By: Claude Code <noreply@anthropic.com>
This commit is contained in:
@@ -0,0 +1,150 @@
|
||||
"""在 CPU / GPU 两套虚拟环境之间切换。
|
||||
|
||||
.venv CPU 环境
|
||||
.venv-gpu GPU 环境
|
||||
|
||||
两套环境**同时存在**,切换只是「用哪个跑哪个」,不需要卸载重装。之所以不做成
|
||||
一个环境来回切:paddlepaddle 与 paddlepaddle-gpu 互斥(都提供 `paddle` 顶层包和
|
||||
同一批文件),而且 GPU 版还要带上约 3GB 的 CUDA 运行库,反复装卸很浪费。
|
||||
|
||||
用法:
|
||||
python scripts/switch_env.py --cpu # 建立/更新 CPU 环境
|
||||
python scripts/switch_env.py --gpu # 建立/更新 GPU 环境(通道按显卡自动推荐)
|
||||
python scripts/switch_env.py --gpu --cuda cu126 # 指定 CUDA 通道
|
||||
python scripts/switch_env.py --list # 只看两套环境的现状,不做改动
|
||||
|
||||
建好之后怎么用(入口脚本名固定是 ocr-server,由 pyproject.toml 的 [project.scripts]
|
||||
决定,与 CPU/GPU 变体无关,变的只是所在的虚拟环境目录):
|
||||
启动服务(CPU):.venv\\Scripts\\ocr-server.exe
|
||||
启动服务(GPU):.venv-gpu\\Scripts\\ocr-server.exe
|
||||
打 GPU 包(产出 dist\\ocr-server-gpu\\):
|
||||
$env:UV_PROJECT_ENVIRONMENT=".venv-gpu"; .\\scripts\\package-windows.ps1
|
||||
"""
|
||||
|
||||
import argparse
|
||||
import os
|
||||
import subprocess
|
||||
import sys
|
||||
from pathlib import Path
|
||||
|
||||
PROJECT_ROOT = Path(__file__).resolve().parents[1]
|
||||
SCRIPTS_DIR = PROJECT_ROOT / "scripts"
|
||||
|
||||
CPU_VENV = ".venv"
|
||||
GPU_VENV = ".venv-gpu"
|
||||
|
||||
|
||||
def venv_python(relative: str) -> Path:
|
||||
if os.name == "nt":
|
||||
return PROJECT_ROOT / relative / "Scripts" / "python.exe"
|
||||
return PROJECT_ROOT / relative / "bin" / "python"
|
||||
|
||||
|
||||
def run(command: list[str], env: dict[str, str] | None = None) -> int:
|
||||
print(f" $ {' '.join(command)}", flush=True)
|
||||
return subprocess.run(command, cwd=PROJECT_ROOT, env=env, check=False).returncode
|
||||
|
||||
|
||||
def sync_venv(relative: str) -> int:
|
||||
"""把项目依赖同步进指定虚拟环境。
|
||||
|
||||
`--inexact` 不能省:paddle 不在 pyproject 的依赖里,普通 sync 会把手动装进去的
|
||||
paddlepaddle / paddlepaddle-gpu 当成「多余包」删掉。
|
||||
"""
|
||||
venv_path = (PROJECT_ROOT / relative).resolve()
|
||||
env = {**os.environ, "UV_PROJECT_ENVIRONMENT": str(venv_path)}
|
||||
print(f"[同步依赖] {relative}")
|
||||
return run(["uv", "sync", "--dev", "--inexact"], env=env)
|
||||
|
||||
|
||||
def describe(relative: str) -> str:
|
||||
python = venv_python(relative)
|
||||
if not python.is_file():
|
||||
return "未创建"
|
||||
probe = (
|
||||
"import importlib.metadata as md\n"
|
||||
"found = []\n"
|
||||
"for name in ('paddlepaddle', 'paddlepaddle-gpu'):\n"
|
||||
" try:\n"
|
||||
" found.append(f'{name}=={md.version(name)}')\n"
|
||||
" except md.PackageNotFoundError:\n"
|
||||
" pass\n"
|
||||
"if not found:\n"
|
||||
" print('未安装 paddle')\n"
|
||||
"else:\n"
|
||||
" import paddle\n"
|
||||
" cuda = paddle.device.is_compiled_with_cuda()\n"
|
||||
" count = paddle.device.cuda.device_count() if cuda else 0\n"
|
||||
" print(','.join(found) + f' | CUDA 可用:{cuda},GPU 数:{count}')\n"
|
||||
)
|
||||
result = subprocess.run(
|
||||
[str(python), "-c", probe],
|
||||
capture_output=True,
|
||||
text=True,
|
||||
encoding="utf-8",
|
||||
cwd=PROJECT_ROOT,
|
||||
check=False,
|
||||
)
|
||||
if result.returncode != 0:
|
||||
return "paddle 状态未知(导入失败)"
|
||||
return result.stdout.strip()
|
||||
|
||||
|
||||
def main() -> int:
|
||||
parser = argparse.ArgumentParser(description="在 CPU / GPU 两套虚拟环境之间切换")
|
||||
group = parser.add_mutually_exclusive_group()
|
||||
group.add_argument("--cpu", action="store_true", help=f"建立/更新 CPU 环境({CPU_VENV})")
|
||||
group.add_argument("--gpu", action="store_true", help=f"建立/更新 GPU 环境({GPU_VENV})")
|
||||
group.add_argument("--list", action="store_true", help="只查看现状")
|
||||
parser.add_argument("--cuda", choices=("cu118", "cu126", "cu129"), help="GPU 版的 CUDA 通道")
|
||||
parser.add_argument("--version", help="paddle 版本,默认 3.2.2")
|
||||
args = parser.parse_args()
|
||||
|
||||
if args.list or not (args.cpu or args.gpu):
|
||||
if not args.list:
|
||||
parser.print_help()
|
||||
return 2
|
||||
print(f"CPU 环境 {CPU_VENV:10} {describe(CPU_VENV)}")
|
||||
print(f"GPU 环境 {GPU_VENV:10} {describe(GPU_VENV)}")
|
||||
return 0
|
||||
|
||||
relative = CPU_VENV if args.cpu else GPU_VENV
|
||||
if args.cuda and args.cpu:
|
||||
print("--cuda 只在 --gpu 时有意义", file=sys.stderr)
|
||||
return 2
|
||||
|
||||
if sync_venv(relative) != 0:
|
||||
return 1
|
||||
|
||||
print(f"[安装 paddle] {relative}")
|
||||
command = [
|
||||
sys.executable,
|
||||
str(SCRIPTS_DIR / "install_paddle.py"),
|
||||
"--python",
|
||||
str(venv_python(relative)),
|
||||
]
|
||||
command.append("--cpu" if args.cpu else "--gpu")
|
||||
if args.cuda:
|
||||
command += ["--cuda", args.cuda]
|
||||
if args.version:
|
||||
command += ["--version", args.version]
|
||||
if run(command) != 0:
|
||||
return 1
|
||||
|
||||
# 入口脚本名固定是 ocr-server(见 pyproject.toml 的 [project.scripts]),
|
||||
# 和所在环境是 CPU 还是 GPU 无关。
|
||||
executable = "Scripts\\ocr-server.exe" if os.name == "nt" else "bin/ocr-server"
|
||||
print(f"\n{relative} 就绪。")
|
||||
print(f" 启动:{relative}/{executable}")
|
||||
if args.cpu:
|
||||
print(' 打 CPU 包:直接运行 scripts/package-windows.ps1(产出 dist/ocr-server/)')
|
||||
else:
|
||||
print(
|
||||
" 打 GPU 包:设 UV_PROJECT_ENVIRONMENT=.venv-gpu 后运行 scripts/package-windows.ps1"
|
||||
"(产出 dist/ocr-server-gpu/)"
|
||||
)
|
||||
return 0
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
raise SystemExit(main())
|
||||
Reference in New Issue
Block a user