From 9fd41f8d9d394089f270f5c997724753ab9154be Mon Sep 17 00:00:00 2001 From: "firedcto@gmail.com" Date: Wed, 11 Sep 2024 11:37:33 +0800 Subject: [PATCH] update launcher config and build script --- .github/workflows/build.yml | 6 +++--- launcher.json | 27 ++++++++++++++++----------- 2 files changed, 19 insertions(+), 14 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a9e8022..f9d0b3f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -40,7 +40,8 @@ jobs: run: | echo "tag: ${{ steps.changes.outputs.tag }}" echo "changes: ${{ steps.changes.outputs.changes }}" - python -m ok.update.package_launcher ${{ steps.tagName.outputs.tag }} CPU + python -m ok.update.package_launcher ${{ steps.tagName.outputs.tag }} + python -m ok.update.gen_md5 .\dist mv dist ok-ww 7z a -t7z -r "ok-ww-release-${{ steps.tagName.outputs.tag }}.7z" "ok-ww" @@ -55,8 +56,7 @@ jobs: tag_name: ${{ github.ref }} release_name: Release ${{ github.ref }} body: | - 下载release.7z文件然后解压缩后运行, 如果需要查找问题 - 最好使用模拟器运行安卓版，可以挂后台，稳定。PC版游戏可能兼容性较差，无法挂后台。 + 下载release.7z文件解压缩运行ok-ww.exe, Download release.7z and extract and execute the ok-ww.exe 更新内容： ${{ steps.changes.outputs.changes }} draft: false diff --git a/launcher.json b/launcher.json index c5eec7d..d462c5c 100644 --- a/launcher.json +++ b/launcher.json @@ -1,4 +1,18 @@ [ + { + "name": "GPU(Nvidia RTX >= 2000)", + "requires_cuda": "12.3", + "entry": "main_gpu.py", + "install_dependencies": [ + "paddlepaddle-gpu==3.0.0b1 -i https://www.paddlepaddle.org.cn/packages/stable/cu123/", + "PySide6-Fluent-Widgets>=1.5.5 --no-deps", + "ok-script pycaw paddleocr==2.8.1 psutil wmi>=1.5.1 typing-extensions>=4.11.0 numpy>=1.26.4 opencv-python>=4.9.0.80" + ], + "uninstall_dependencies": [ + "openvino-telemetry packaging rapidocr-openvino" + ], + "target_size": 6070947351 + }, { "name": "CPU", "entry": "main.py", @@ -7,17 +21,8 @@ "ok-script pycaw rapidocr-openvino psutil wmi>=1.5.1 typing-extensions>=4.11.0 numpy>=1.26.4 opencv-python>=4.9.0.80" ], "uninstall_dependencies": [ - ] - }, - { - "name": "GPU(Nvidia RTX >= 3000)", - "entry": "main_gpu.py", - "install_dependencies": [ - "paddlepaddle-gpu==3.0.0b1 -i https://www.paddlepaddle.org.cn/packages/stable/cu123/", - "PySide6-Fluent-Widgets>=1.5.5 --no-deps", - "ok-script pycaw paddleocr==2.8.1 psutil wmi>=1.5.1 typing-extensions>=4.11.0 numpy>=1.26.4 opencv-python>=4.9.0.80" + "paddlepaddle-gpu nvidia-cublas-cu12 nvidia-cuda-runtime-cu12 nvidia-cudnn-cu12 nvidia-cufft-cu12 nvidia-curand-cu12 nvidia-cusolver-cu12 nvidia-cusparse-cu12 opt-einsum astor decorator httpx networkx protobuf Pillow" ], - "uninstall_dependencies": [ - ] + "target_size": 616621272 } ] \ No newline at end of file