From 692a99dbedec4d93be0952eb830704e00bdf721e Mon Sep 17 00:00:00 2001 From: jade Date: Tue, 31 Oct 2023 08:29:42 +0000 Subject: [PATCH] =?UTF-8?q?*=20=20=E6=9B=B4=E6=96=B0=E7=AE=B1=E5=8F=B7?= =?UTF-8?q?=E5=9B=BE=E7=89=87=E6=8A=93=E6=8B=8Dconta=5FcaptureV3.0.1.9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/python-release.yml | 146 ++++++++++++++------------- README.md | 26 ++--- 2 files changed, 87 insertions(+), 85 deletions(-) diff --git a/.github/workflows/python-release.yml b/.github/workflows/python-release.yml index ab55468..39a5718 100644 --- a/.github/workflows/python-release.yml +++ b/.github/workflows/python-release.yml @@ -117,76 +117,78 @@ 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_capture -# 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 -# ls requirements/RKNN/requirements.txt -l -# pip install -r requirements/RKNN/requirements.txt -# python packing_app.py \ -# --head_str \ -# "import sys \nsys.path.append('/usr/local/site-packages/')\nimport ruamel\nimport ruamel.yaml\nimport scipy\nimport scipy.spatial\nimport absl\nimport absl.logging\nimport google\nimport google.protobuf\nimport google.protobuf.descriptor\nimport wrapt\nimport google.protobuf.any_pb2\nimport absl.app\nimport google.protobuf.wrappers_pb2\nimport opt_einsum\nimport gast\nimport astunparse\nimport termcolor\nimport google.protobuf.json_format\nimport absl.testing\nimport absl.testing.parameterized\nimport flatbuffers\nimport requests\nimport h5py\nimport lmdb\nimport sklearn\nimport networkx\nimport onnx.numpy_helper\nimport onnx.backend\nimport onnx.backend.base\nimport ply\nimport ply.lex\nimport ply.yacc\nimport dill\n" \ -# --app_name local_conta_capture_rknn \ -# --lib_path local_conta_capture_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 -# ls requirements/Ascend/requirements.txt -l -# pip install -r requirements.txt -# pip install -r requirements/Ascend/requirements.txt -# python packing_app.py \ -# --head_str "import sys \nsys.path.append('/usr/local/Ascend/nnrt/latest/python/site-packages')\nsys.path.append('/usr/local/site-packages')\nfrom acllite.acllite_model import AclLiteModel\nfrom acllite.acllite_imageproc import AclLiteImageProc\nfrom acllite.acllite_image import AclLiteImage\nfrom acllite.acllite_resource import AclLiteResource\n" \ -# --app_name local_conta_capture_ascend \ -# --lib_path local_conta_capture_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 }} # 给最高的权限 + 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_capture + 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 + ls requirements/RKNN/requirements.txt -l + pip install -r requirements/RKNN/requirements.txt + python packing_app.py \ + --head_str \ + "import sys \nsys.path.append('/usr/local/site-packages/')\nimport ruamel\nimport ruamel.yaml\nimport scipy\nimport scipy.spatial\nimport absl\nimport absl.logging\nimport google\nimport google.protobuf\nimport google.protobuf.descriptor\nimport wrapt\nimport google.protobuf.any_pb2\nimport absl.app\nimport google.protobuf.wrappers_pb2\nimport opt_einsum\nimport gast\nimport astunparse\nimport termcolor\nimport google.protobuf.json_format\nimport absl.testing\nimport absl.testing.parameterized\nimport flatbuffers\nimport requests\nimport h5py\nimport lmdb\nimport sklearn\nimport networkx\nimport onnx.numpy_helper\nimport onnx.backend\nimport onnx.backend.base\nimport ply\nimport ply.lex\nimport ply.yacc\nimport dill\n" \ + --app_name local_conta_capture_rknn \ + --lib_path local_conta_capture_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 + ls requirements/Ascend/requirements.txt -l + pip install -r requirements.txt + pip install -r requirements/Ascend/requirements.txt + python packing_app.py \ + --head_str "import sys \nsys.path.append('/usr/local/Ascend/nnrt/latest/python/site-packages')\nsys.path.append('/usr/local/site-packages')\nfrom acllite.acllite_model import AclLiteModel\nfrom acllite.acllite_imageproc import AclLiteImageProc\nfrom acllite.acllite_image import AclLiteImage\nfrom acllite.acllite_resource import AclLiteResource\n" \ + --app_name local_conta_capture_ascend \ + --lib_path local_conta_capture_aarch64_lib64 \ + --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 }} # 给最高的权限 diff --git a/README.md b/README.md index 85c80e3..bdbff52 100644 --- a/README.md +++ b/README.md @@ -1,16 +1,16 @@ # 箱号图片抓拍 -## 箱号图片抓拍V3.0.1.8 - 2023-10-10 07:56:37 -conta_captureV3.0.1.8 -* [发布地址](https://github.com/jadehh/ContainerOCR/releases/tag/conta_captureV3.0.1.8) -* [详细地址](https://github.com/jadehh/jadehh_file/releases/tag/conta_captureV3.0.1.8) +## 箱号图片抓拍V3.0.1.9 - 2023-10-31 08:29:42 +conta_captureV3.0.1.9 +* [发布地址](https://github.com/jadehh/ContainerOCR/releases/tag/conta_captureV3.0.1.9) +* [详细地址](https://github.com/jadehh/jadehh_file/releases/tag/conta_captureV3.0.1.9) ### 下载地址 -* [conta_capture_lib64.zip](https://gh.ddlc.top/https://github.com/jadehh/jadehh_file/releases/download/conta_captureV3.0.1.8/conta_capture_lib64.zip) -* [local_conta_capture_x86_lib64.zip](https://gh.ddlc.top/https://github.com/jadehh/jadehh_file/releases/download/conta_captureV3.0.1.8/local_conta_capture_x86_lib64.zip) -* [local_conta_capture_aarch64_lib64.zip](https://gh.ddlc.top/https://github.com/jadehh/jadehh_file/releases/download/conta_captureV3.0.1.8/local_conta_capture_aarch64_lib64.zip) -* [conta_capture_amd64_lib64.zip](https://gh.ddlc.top/https://github.com/jadehh/jadehh_file/releases/download/conta_captureV3.0.1.8/conta_capture_amd64_lib64.zip) -* [conta_capture](https://gh.ddlc.top/https://github.com/jadehh/jadehh_file/releases/download/conta_captureV3.0.1.8/conta_capture) -* [local_conta_capture_onnx](https://gh.ddlc.top/https://github.com/jadehh/jadehh_file/releases/download/conta_captureV3.0.1.8/local_conta_capture_onnx) -* [local_conta_capture_ascend](https://gh.ddlc.top/https://github.com/jadehh/jadehh_file/releases/download/conta_captureV3.0.1.8/local_conta_capture_ascend) -* [local_conta_capture_rknn](https://gh.ddlc.top/https://github.com/jadehh/jadehh_file/releases/download/conta_captureV3.0.1.8/local_conta_capture_rknn) -* [conta_capture_amd64](https://gh.ddlc.top/https://github.com/jadehh/jadehh_file/releases/download/conta_captureV3.0.1.8/conta_capture_amd64) +* [conta_capture_lib64.zip](https://gh.ddlc.top/https://github.com/jadehh/jadehh_file/releases/download/conta_captureV3.0.1.9/conta_capture_lib64.zip) +* [local_conta_capture_x86_lib64.zip](https://gh.ddlc.top/https://github.com/jadehh/jadehh_file/releases/download/conta_captureV3.0.1.9/local_conta_capture_x86_lib64.zip) +* [local_conta_capture_aarch64_lib64.zip](https://gh.ddlc.top/https://github.com/jadehh/jadehh_file/releases/download/conta_captureV3.0.1.9/local_conta_capture_aarch64_lib64.zip) +* [conta_capture_amd64_lib64.zip](https://gh.ddlc.top/https://github.com/jadehh/jadehh_file/releases/download/conta_captureV3.0.1.9/conta_capture_amd64_lib64.zip) +* [conta_capture](https://gh.ddlc.top/https://github.com/jadehh/jadehh_file/releases/download/conta_captureV3.0.1.9/conta_capture) +* [local_conta_capture_onnx](https://gh.ddlc.top/https://github.com/jadehh/jadehh_file/releases/download/conta_captureV3.0.1.9/local_conta_capture_onnx) +* [local_conta_capture_ascend](https://gh.ddlc.top/https://github.com/jadehh/jadehh_file/releases/download/conta_captureV3.0.1.9/local_conta_capture_ascend) +* [local_conta_capture_rknn](https://gh.ddlc.top/https://github.com/jadehh/jadehh_file/releases/download/conta_captureV3.0.1.9/local_conta_capture_rknn) +* [conta_capture_amd64](https://gh.ddlc.top/https://github.com/jadehh/jadehh_file/releases/download/conta_captureV3.0.1.9/conta_capture_amd64) ---- \ No newline at end of file