From b5525a92be0e539667c17548cff5f081372ce3d9 Mon Sep 17 00:00:00 2001 From: jade Date: Tue, 31 Oct 2023 08:07:44 +0000 Subject: [PATCH] =?UTF-8?q?*=20=20=E6=9B=B4=E6=96=B0=E7=AE=B1=E5=8F=B7?= =?UTF-8?q?=E8=AF=86=E5=88=AB=E6=9C=8D=E5=8A=A1conta=5FocrV3.0.2.6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/python-release.yml | 147 ++++++++++++++------------- README.md | 21 ++-- 2 files changed, 88 insertions(+), 80 deletions(-) diff --git a/.github/workflows/python-release.yml b/.github/workflows/python-release.yml index 4dda769..476634d 100644 --- a/.github/workflows/python-release.yml +++ b/.github/workflows/python-release.yml @@ -55,7 +55,7 @@ jobs: pip install -r requirements/Paddle/requirements.txt python packing_app.py \ --head_str "import sys\nsys.path.append('/usr/local/conta_detect-1.0/python_lib')\nimport paddle\n" \ - --is_exec False + --is_exec True - name: Amd64打包编译 if: ${{ matrix.device_type=='Amd64'}} run: | @@ -66,7 +66,7 @@ jobs: --name 箱号识别服务Amd64 \ --app_name conta_ocr_amd64 \ --lib_path conta_ocr_amd64_lib64 \ - --is_exec False + --is_exec True - name: 发布 uses: softprops/action-gh-release@v1 @@ -108,7 +108,79 @@ jobs: --extra_sys_str /usr/local/site-packages,/usr/local/opencv \ --app_name local_conta_ocr_onnx \ --lib_path local_conta_ocr_x86_lib64 \ - --is_exec False + --is_exec True + - name: 发布 + uses: softprops/action-gh-release@v1 + if: startsWith(github.ref, 'refs/tags/') + with: + files: + "./code/Output/*" + env: + GITHUB_TOKEN: ${{ secrets.GH_PAT }} # 给最高的权限 + aarch64_job: + # The host should always be Linux + name: ${{ matrix.device_type }}箱号识别服务打包 + runs-on: ${{ matrix.os }} + strategy: + fail-fast: false + matrix: + os: [ "ubuntu-latest" ] #, "macos-latest", "windows-latest" + #device_type: ["RKNN","Ascend"] + device_type: ["RKNN","Ascend"] + steps: + - name: 下载代码 + uses: actions/checkout@v3 + with: + repository: jadehh/ContainerOCR + ref: conta_ocr + path: code + token: ${{ secrets.GH_PAT }} # `GH_PAT` is a secret that contains your PAT + - name: RKNN打包环境准备 + if: ${{ matrix.device_type=='RKNN'}} + uses: uraimo/run-on-arch-action@v2 + with: + arch: aarch64 + distro: ubuntu18.04 + + # Not required, but speeds up builds by storing container images in + # a GitHub package registry. + githubToken: ${{ github.token }} + dockerRunArgs: | + --volume "${PWD}/code:/code" + base_image: jadehh/miniconda3:aarch64-4.9.2 + # Set an output parameter `uname` for use in subsequent steps + run: | + cd /code + pip install -r requirements.txt + pip install -r requirements/RKNN/requirements.txt + python packing_app.py \ + --extra_sys_str /usr/local/site-packages \ + --app_name local_conta_ocr_rknn \ + --lib_path local_conta_ocr_aarch64_lib64 \ + --is_exec True + - name: Ascend打包环境准备 + if: ${{ matrix.device_type=='Ascend'}} + uses: uraimo/run-on-arch-action@v2 + with: + arch: aarch64 + distro: ubuntu18.04 + + # Not required, but speeds up builds by storing container images in + # a GitHub package registry. + githubToken: ${{ github.token }} + dockerRunArgs: | + --volume "${PWD}/code:/code" + base_image: jadehh/miniconda3:aarch64-4.9.2 + # Set an output parameter `uname` for use in subsequent steps + run: | + cd /code + pip install -r requirements.txt + pip install -r requirements/Ascend/requirements.txt + python packing_app.py \ + --extra_sys_str /usr/local/site-packages \ + --app_name local_conta_ocr_ascend \ + --lib_path local_conta_ocr_aarch64_lib64 \ + --is_exec True - name: 发布 uses: softprops/action-gh-release@v1 if: startsWith(github.ref, 'refs/tags/') @@ -117,72 +189,3 @@ jobs: "./code/Output/*" env: GITHUB_TOKEN: ${{ secrets.GH_PAT }} # 给最高的权限 -# aarch64_job: -# # The host should always be Linux -# name: ${{ matrix.device_type }}箱号识别服务打包 -# runs-on: ${{ matrix.os }} -# strategy: -# fail-fast: false -# matrix: -# os: [ "ubuntu-latest" ] #, "macos-latest", "windows-latest" -# device_type: ["RKNN","Ascend"] -# steps: -# - name: 下载代码 -# uses: actions/checkout@v3 -# with: -# repository: jadehh/ContainerOCR -# ref: conta_ocr -# path: code -# token: ${{ secrets.GH_PAT }} # `GH_PAT` is a secret that contains your PAT -# - name: RKNN打包环境准备 -# if: ${{ matrix.device_type=='RKNN'}} -# uses: uraimo/run-on-arch-action@v2 -# with: -# arch: aarch64 -# distro: ubuntu18.04 -# -# # Not required, but speeds up builds by storing container images in -# # a GitHub package registry. -# githubToken: ${{ github.token }} -# dockerRunArgs: | -# --volume "${PWD}/code:/code" -# base_image: jadehh/miniconda3:aarch64-4.9.2 -# # Set an output parameter `uname` for use in subsequent steps -# run: | -# cd /code -# pip install -r requirements.txt -# pip install -r requirements/RKNN/requirements.txt -# python packing_app.py \ -# --extra_sys_str /usr/local/site-packages \ -# --app_name local_conta_ocr_rknn \ -# --lib_path local_conta_ocr_aarch64_lib64 -# - name: Ascend打包环境准备 -# if: ${{ matrix.device_type=='Ascend'}} -# uses: uraimo/run-on-arch-action@v2 -# with: -# arch: aarch64 -# distro: ubuntu18.04 -# -# # Not required, but speeds up builds by storing container images in -# # a GitHub package registry. -# githubToken: ${{ github.token }} -# dockerRunArgs: | -# --volume "${PWD}/code:/code" -# base_image: jadehh/miniconda3:aarch64-4.9.2 -# # Set an output parameter `uname` for use in subsequent steps -# run: | -# cd /code -# pip install -r requirements.txt -# pip install -r requirements/Ascend/requirements.txt -# python packing_app.py \ -# --extra_sys_str /usr/local/site-packages \ -# --app_name local_conta_ocr_ascend \ -# --lib_path local_conta_ocr_aarch64_lib64 -# - name: 发布 -# uses: softprops/action-gh-release@v1 -# if: startsWith(github.ref, 'refs/tags/') -# with: -# files: -# "./code/Output/*" -# env: -# GITHUB_TOKEN: ${{ secrets.GH_PAT }} # 给最高的权限 diff --git a/README.md b/README.md index 56fa945..67689ed 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,16 @@ # 箱号识别服务 -## 箱号识别服务V3.0.2.5 - 2023-10-25 05:59:07 -conta_ocrV3.0.2.5 -* [发布地址](https://github.com/jadehh/ContainerOCR/releases/tag/conta_ocrV3.0.2.5) -* [详细地址](https://github.com/jadehh/jadehh_file/releases/tag/conta_ocrV3.0.2.5) +## 箱号识别服务V3.0.2.6 - 2023-10-31 08:07:44 +conta_ocrV3.0.2.6 +* [发布地址](https://github.com/jadehh/ContainerOCR/releases/tag/conta_ocrV3.0.2.6) +* [详细地址](https://github.com/jadehh/jadehh_file/releases/tag/conta_ocrV3.0.2.6) ### 下载地址 -* [conta_ocr_lib64.zip](https://gh.ddlc.top/https://github.com/jadehh/jadehh_file/releases/download/conta_ocrV3.0.2.5/conta_ocr_lib64.zip) -* [local_conta_ocr_x86_lib64.zip](https://gh.ddlc.top/https://github.com/jadehh/jadehh_file/releases/download/conta_ocrV3.0.2.5/local_conta_ocr_x86_lib64.zip) -* [local_conta_ocr_aarch64_lib64.zip](https://gh.ddlc.top/https://github.com/jadehh/jadehh_file/releases/download/conta_ocrV3.0.2.5/local_conta_ocr_aarch64_lib64.zip) -* [conta_ocr_amd64_lib64.zip](https://gh.ddlc.top/https://github.com/jadehh/jadehh_file/releases/download/conta_ocrV3.0.2.5/conta_ocr_amd64_lib64.zip) +* [conta_ocr_lib64.zip](https://gh.ddlc.top/https://github.com/jadehh/jadehh_file/releases/download/conta_ocrV3.0.2.6/conta_ocr_lib64.zip) +* [local_conta_ocr_x86_lib64.zip](https://gh.ddlc.top/https://github.com/jadehh/jadehh_file/releases/download/conta_ocrV3.0.2.6/local_conta_ocr_x86_lib64.zip) +* [local_conta_ocr_aarch64_lib64.zip](https://gh.ddlc.top/https://github.com/jadehh/jadehh_file/releases/download/conta_ocrV3.0.2.6/local_conta_ocr_aarch64_lib64.zip) +* [conta_ocr_amd64_lib64.zip](https://gh.ddlc.top/https://github.com/jadehh/jadehh_file/releases/download/conta_ocrV3.0.2.6/conta_ocr_amd64_lib64.zip) +* [conta_ocr](https://gh.ddlc.top/https://github.com/jadehh/jadehh_file/releases/download/conta_ocrV3.0.2.6/conta_ocr) +* [local_conta_ocr_onnx](https://gh.ddlc.top/https://github.com/jadehh/jadehh_file/releases/download/conta_ocrV3.0.2.6/local_conta_ocr_onnx) +* [local_conta_ocr_ascend](https://gh.ddlc.top/https://github.com/jadehh/jadehh_file/releases/download/conta_ocrV3.0.2.6/local_conta_ocr_ascend) +* [local_conta_ocr_rknn](https://gh.ddlc.top/https://github.com/jadehh/jadehh_file/releases/download/conta_ocrV3.0.2.6/local_conta_ocr_rknn) +* [conta_ocr_amd64](https://gh.ddlc.top/https://github.com/jadehh/jadehh_file/releases/download/conta_ocrV3.0.2.6/conta_ocr_amd64) ---- \ No newline at end of file