bump version to v0.14.0 (#1943)

* update

* bump version

* Update README.md

* fix conflicts

* fix ci

* fix circleci

* upgrade to ubuntu20.04 for github ci

* update

* install glibc

* try to fix cuda build

* try to fix cuda build

* fix build-cu102 && build_cpu_sdk

* revert to setup-python@v2

* try to fix pplnn

* fix protobuf

---------

Co-authored-by: Xin Chen <irexyc@gmail.com>
pull/1974/head v0.14.0
RunningLeon 2023-04-05 14:28:00 +08:00 committed by GitHub
parent af16b9a451
commit c73756366e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
34 changed files with 113 additions and 150 deletions

View File

@ -74,7 +74,7 @@ commands:
- run:
name: Install mmcv-full
command: |
python -m pip install opencv-python==4.5.4.60
python -m pip install opencv-python==4.5.4.60 opencv-contrib-python==4.5.4.60 opencv-python-headless==4.5.4.60
python -m pip install mmcv-full==<< parameters.version >> -f https://download.openmmlab.com/mmcv/dist/cpu/torch<< parameters.torch >>/index.html
install_mmcv_cuda:
parameters:
@ -91,7 +91,7 @@ commands:
- run:
name: Install mmcv-full
command: |
python -m pip install opencv-python==4.5.4.60
python -m pip install opencv-python==4.5.4.60 opencv-contrib-python==4.5.4.60 opencv-python-headless==4.5.4.60
python -m pip install mmcv-full==<< parameters.version >> -f https://download.openmmlab.com/mmcv/dist/<< parameters.cuda >>/torch<< parameters.torch >>/index.html
install_mmdeploy:
description: "Install MMDeploy"

View File

@ -21,13 +21,13 @@ permissions:
jobs:
build_sdk_demo:
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
strategy:
matrix:
python-version: [3.7]
steps:
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
- name: Checkout repository
@ -40,9 +40,7 @@ jobs:
run: |
sudo apt update
sudo apt install -y ffmpeg libsm6 libxext6 git ninja-build libglib2.0-0 libxrender-dev libc++1-9 libc++abi1-9
sudo add-apt-repository ppa:ignaciovizzo/opencv3-nonfree
sudo apt install libopencv-dev
pkg-config --libs opencv
- name: Install Ascend Toolkit
run: |
mkdir -p $GITHUB_WORKSPACE/Ascend

View File

@ -29,7 +29,7 @@ permissions:
jobs:
test_onnx2ncnn:
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
strategy:
matrix:
python-version: [3.7]
@ -39,7 +39,7 @@ jobs:
with:
submodules: 'recursive'
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
- name: Install unittest dependencies
@ -82,12 +82,12 @@ jobs:
with:
submodules: 'recursive'
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
- name: Install mmdeploy
run: |
python3 tools/scripts/build_ubuntu_x64_ncnn.py
python3 -m pip install torch==1.8.2 torchvision==0.9.2 --extra-index-url https://download.pytorch.org/whl/lts/1.8/cpu
python3 -m pip install mmcv-full==1.5.1 -f https://download.openmmlab.com/mmcv/dist/cpu/torch1.8.0/index.html
python3 tools/scripts/build_ubuntu_x64_ncnn.py 8
python3 -c 'import mmdeploy.apis.ncnn as ncnn_api; assert ncnn_api.is_available(with_custom_ops=True)'

View File

@ -31,14 +31,14 @@ jobs:
with:
submodules: 'recursive'
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
- name: Install mmdeploy
run: |
python3 tools/scripts/build_ubuntu_x64_ort.py
python3 -m pip install torch==1.8.2 torchvision==0.9.2 --extra-index-url https://download.pytorch.org/whl/lts/1.8/cpu
python3 -m pip install mmcv-full==1.5.1 -f https://download.openmmlab.com/mmcv/dist/cpu/torch1.8.0/index.html
python3 tools/scripts/build_ubuntu_x64_ort.py 8
python3 -c 'import mmdeploy.apis.onnxruntime as ort_api; assert ort_api.is_available(with_custom_ops=True)'
- name: test mmcls full pipeline
run: |

View File

@ -21,22 +21,15 @@ permissions:
jobs:
script_install:
runs-on: ubuntu-18.04
strategy:
matrix:
python-version: [3.7]
runs-on: ubuntu-20.04
steps:
- name: Checkout repository
uses: actions/checkout@v3
with:
submodules: 'recursive'
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-version }}
- name: Install mmdeploy
run: |
python3 tools/scripts/build_ubuntu_x64_pplnn.py
python3 -m pip install torch==1.8.2 torchvision==0.9.2 --extra-index-url https://download.pytorch.org/whl/lts/1.8/cpu
python3 -m pip install mmcv-full==1.5.1 -f https://download.openmmlab.com/mmcv/dist/cpu/torch1.8.0/index.html
python3 tools/scripts/build_ubuntu_x64_pplnn.py 8
python3 -c 'import mmdeploy.apis.pplnn as pplnn_api; assert pplnn_api.is_available()'

View File

@ -22,7 +22,7 @@ permissions:
jobs:
build_rknpu2:
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
steps:
- name: Checkout repository
uses: actions/checkout@v3
@ -34,7 +34,7 @@ jobs:
run: |
sh -x tools/scripts/ubuntu_cross_build_rknn.sh rk3588
build_rknpu:
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
steps:
- name: Checkout repository
uses: actions/checkout@v3

View File

@ -21,7 +21,7 @@ permissions:
jobs:
build_sdk_demo:
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
steps:
- name: Checkout repository
uses: actions/checkout@v3
@ -34,9 +34,7 @@ jobs:
sudo apt install wget libprotobuf-dev protobuf-compiler
sudo apt update
sudo apt install -y ffmpeg libsm6 libxext6 git ninja-build libglib2.0-0 libxrender-dev libc++1-9 libc++abi1-9
sudo add-apt-repository ppa:ignaciovizzo/opencv3-nonfree
sudo apt install libopencv-dev
pkg-config --libs opencv
- name: Install snpe
run: |
wget https://media.githubusercontent.com/media/tpoisonooo/mmdeploy_snpe_testdata/main/snpe-1.59.tar.gz

View File

@ -21,7 +21,7 @@ permissions:
jobs:
script_install:
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
strategy:
matrix:
python-version: [3.7]
@ -31,9 +31,9 @@ jobs:
with:
submodules: 'recursive'
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
- name: Install mmdeploy
run: |
python3 tools/scripts/build_ubuntu_x64_torchscript.py
python3 tools/scripts/build_ubuntu_x64_torchscript.py 8

View File

@ -31,14 +31,14 @@ jobs:
with:
submodules: 'recursive'
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
- name: Install mmdeploy
run: |
python3 tools/scripts/build_ubuntu_x64_tvm.py
source ~/mmdeploy.env
python3 -m pip install torch==1.8.2 torchvision==0.9.2 --extra-index-url https://download.pytorch.org/whl/lts/1.8/cpu
python3 -m pip install mmcv-full==1.5.1 -f https://download.openmmlab.com/mmcv/dist/cpu/torch1.8.0/index.html
python3 -m pip install decorator psutil scipy attrs tornado pytest
python3 tools/scripts/build_ubuntu_x64_tvm.py 8
source ~/mmdeploy.env
python3 -c 'import mmdeploy.apis.tvm as tvm_api; assert tvm_api.is_available()'

View File

@ -25,7 +25,7 @@ permissions:
jobs:
build_cpu_model_convert:
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
strategy:
matrix:
python-version: [3.7]
@ -39,9 +39,9 @@ jobs:
torch_version: torch1.9
torchvision: 0.10.0
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
- name: Install PyTorch
@ -63,7 +63,7 @@ jobs:
coverage report -m
build_cpu_sdk:
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
steps:
- name: Checkout repository
uses: actions/checkout@v3
@ -73,16 +73,18 @@ jobs:
run: sudo apt update
- name: gcc-multilib
run: |
sudo apt install gcc-multilib g++-multilib wget libprotobuf-dev protobuf-compiler
sudo apt update
sudo apt install -y ffmpeg libsm6 libxext6 git ninja-build libglib2.0-0 libxrender-dev libc++1-9 libc++abi1-9
sudo add-apt-repository ppa:ignaciovizzo/opencv3-nonfree
sudo apt install libopencv-dev lcov wget
pkg-config --libs opencv
sudo apt install libopencv-dev lcov wget -y
- name: Build and run SDK unit test without backend
run: |
mkdir -p build && pushd build
cmake .. -DCMAKE_CXX_COMPILER=g++-7 -DMMDEPLOY_CODEBASES=all -DMMDEPLOY_BUILD_SDK=ON -DMMDEPLOY_BUILD_SDK_PYTHON_API=OFF -DMMDEPLOY_TARGET_DEVICES=cpu -DMMDEPLOY_COVERAGE=ON -DMMDEPLOY_BUILD_TEST=ON
cmake .. \
-DMMDEPLOY_CODEBASES=all \
-DMMDEPLOY_BUILD_SDK=ON \
-DMMDEPLOY_BUILD_SDK_PYTHON_API=OFF \
-DMMDEPLOY_TARGET_DEVICES=cpu \
-DMMDEPLOY_COVERAGE=ON \
-DMMDEPLOY_BUILD_TEST=ON
make -j2
mkdir -p mmdeploy_test_resources/transform
cp ../tests/data/tiger.jpeg mmdeploy_test_resources/transform/
@ -101,7 +103,7 @@ jobs:
- name: update
run: sudo apt update
- name: Set up Python
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: 3.8
- name: gcc-multilib
@ -109,14 +111,14 @@ jobs:
sh -x tools/scripts/ubuntu_cross_build_aarch64.sh
build_cuda102:
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
container:
image: pytorch/pytorch:1.9.0-cuda10.2-cudnn7-devel
env:
FORCE_CUDA: 1
strategy:
matrix:
python-version: [3.7]
python-version: [3.8]
torch: [1.9.0+cu102]
mmcv: [1.4.2]
include:
@ -124,26 +126,19 @@ jobs:
torch_version: torch1.9
torchvision: 0.10.0+cu102
steps:
- uses: actions/checkout@v2
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-version }}
- uses: actions/checkout@v3
- name: Install system dependencies
run: |
apt-key adv --keyserver keyserver.ubuntu.com --recv-keys A4B469963BF863CC
apt-get update && apt-get install -y ffmpeg libsm6 libxext6 git ninja-build libglib2.0-0 libxrender-dev python${{matrix.python-version}}-dev
apt-get clean
rm -rf /var/lib/apt/lists/*
apt-get update && apt-get install -y git
- name: Install PyTorch
run: python -m pip install torch==${{matrix.torch}} torchvision==${{matrix.torchvision}} -f https://download.pytorch.org/whl/torch_stable.html
- name: Install dependencies
run: |
python -V
python -m pip install -U pip
python -m pip install mmcv-full==${{matrix.mmcv}} -f https://download.openmmlab.com/mmcv/dist/cu102/${{matrix.torch_version}}/index.html
CFLAGS=`python -c 'import sysconfig;print("-I"+sysconfig.get_paths()["include"])'` python -m pip install -r requirements.txt
pip install -U pycuda
python -m pip install -U numpy
python -m pip install -r requirements.txt
- name: Build and install
run: |
rm -rf .eggs && python -m pip install -e .
@ -155,41 +150,30 @@ jobs:
coverage report -m
build_cuda111:
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
container:
image: pytorch/pytorch:1.8.0-cuda11.1-cudnn8-devel
strategy:
matrix:
python-version: [3.7]
python-version: [3.8]
torch: [1.8.0+cu111]
mmcv: [1.4.2]
include:
- torch: 1.8.0+cu111
torch_version: torch1.8
torchvision: 0.9.0+cu111
steps:
- uses: actions/checkout@v2
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-version }}
- uses: actions/checkout@v3
- name: Install system dependencies
run: |
apt-key adv --keyserver keyserver.ubuntu.com --recv-keys A4B469963BF863CC
apt-get update && apt-get install -y ffmpeg libsm6 libxext6 git ninja-build libglib2.0-0 libxrender-dev python${{matrix.python-version}}-dev
apt-get clean
rm -rf /var/lib/apt/lists/*
- name: Install PyTorch
run: python -m pip install torch==${{matrix.torch}} torchvision==${{matrix.torchvision}} -f https://download.pytorch.org/whl/torch_stable.html
apt-get update && apt-get install -y git
- name: Install dependencies
run: |
python -V
python -m pip install -U pip
python -m pip install mmcv-full==${{matrix.mmcv}} -f https://download.openmmlab.com/mmcv/dist/cu111/${{matrix.torch_version}}/index.html
CFLAGS=`python -c 'import sysconfig;print("-I"+sysconfig.get_paths()["include"])'` python -m pip install -r requirements.txt
pip install -U pycuda
python -m pip install -U numpy
python -m pip install -r requirements.txt
- name: Build and install
run: |
rm -rf .eggs && python -m pip install -e .

View File

@ -19,14 +19,14 @@ permissions:
jobs:
test_java_api:
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
steps:
- name: Checkout repository
uses: actions/checkout@v3
with:
submodules: 'recursive'
- name: Set up Python 3.7
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: 3.7
- name: Install unittest dependencies

View File

@ -7,11 +7,11 @@ permissions:
jobs:
lint:
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Set up Python 3.7
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: 3.7
- name: Install pre-commit hook

View File

@ -21,7 +21,7 @@ permissions:
jobs:
test_ncnn_PTQ:
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
container:
image: pytorch/pytorch:1.8.0-cuda11.1-cudnn8-devel
@ -36,26 +36,17 @@ jobs:
torchvision: 0.9.0+cu111
steps:
- uses: actions/checkout@v2
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-version }}
- uses: actions/checkout@v3
- name: Install system dependencies
run: |
apt-key adv --keyserver keyserver.ubuntu.com --recv-keys A4B469963BF863CC
apt-get update && apt-get install -y wget ffmpeg libsm6 libxext6 git ninja-build libglib2.0-0 libxrender-dev python${{matrix.python-version}}-dev
apt-get clean
rm -rf /var/lib/apt/lists/*
- name: Install PyTorch
run: python -m pip install torch==${{matrix.torch}} torchvision==${{matrix.torchvision}} -f https://download.pytorch.org/whl/torch_stable.html
apt-get update && apt-get install -y git
- name: Install dependencies
run: |
python -V
python -m pip install -U pip
python -m pip install mmcv-full==${{matrix.mmcv}} -f https://download.openmmlab.com/mmcv/dist/cu111/${{matrix.torch_version}}/index.html
CFLAGS=`python -c 'import sysconfig;print("-I"+sysconfig.get_paths()["include"])'` python -m pip install -r requirements.txt
python -m pip install -U numpy
python -m pip install -r requirements.txt
- name: Install mmcls
run: |
cd ~

View File

@ -19,7 +19,7 @@ permissions:
jobs:
test_rust_api:
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
steps:
- name: Checkout repository
uses: actions/checkout@v3
@ -27,7 +27,7 @@ jobs:
submodules: 'recursive'
- name: Set up Python 3.7
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: 3.7
- name: Install latest nightly Rust

View File

@ -5,7 +5,7 @@ endif ()
message(STATUS "CMAKE_INSTALL_PREFIX: ${CMAKE_INSTALL_PREFIX}")
cmake_minimum_required(VERSION 3.14)
project(MMDeploy VERSION 0.13.0)
project(MMDeploy VERSION 0.14.0)
set(CMAKE_CXX_STANDARD 17)

View File

@ -30,7 +30,8 @@ English | [简体中文](README_zh-CN.md)
## Highlights
The new v1 version has been released, which is adapted to the preview version of upstream codebase, please **align the version** when using it.
The MMDeploy 1.x has been released, which is adapted to upstream codebases from OpenMMLab 2.0. Please **align the version** when using it.
The default branch has been switched to `main` from `master`. MMDeploy 0.x (`master`) will be deprecated and new features will only be added to MMDeploy 1.x (`main`) in future.
| mmdeploy | mmengine | mmcv | mmdet | others |
| :------: | :------: | :------: | :------: | :----: |

View File

@ -28,9 +28,10 @@
[English](README.md) | 简体中文
## 1.x 预览版本
## MMDeploy 1.x 版本
全新的 v1 版本已发布,针对上游算法预览版做适配,使用时务必**对齐版本**。
全新的 MMDeploy 1.x 已发布该版本适配OpenMMLab 2.0生态体系,使用时务必**对齐版本**。
MMDeploy 代码库默认分支从`master`切换至`main`。 MMDeploy 0.x (`master`)将逐步废弃,新特性将只添加到 MMDeploy 1.x (`main`)。
| mmdeploy | mmengine | mmcv | mmdet | mmcls and others |
| :------: | :------: | :------: | :------: | :--------------: |

View File

@ -14,7 +14,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="MMDeployCSharp" Version="0.13.0" />
<PackageReference Include="MMDeployCSharp" Version="0.14.0" />
<PackageReference Include="OpenCvSharp4" Version="4.5.5.20211231" />
<PackageReference Include="OpenCvSharp4.Extensions" Version="4.5.5.20211231" />
<PackageReference Include="OpenCvSharp4.runtime.win" Version="4.5.5.20211231" />

View File

@ -14,7 +14,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="MMDeployCSharp" Version="0.13.0" />
<PackageReference Include="MMDeployCSharp" Version="0.14.0" />
<PackageReference Include="OpenCvSharp4" Version="4.5.5.20211231" />
<PackageReference Include="OpenCvSharp4.runtime.win" Version="4.5.5.20211231" />
</ItemGroup>

View File

@ -14,7 +14,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="MMDeployCSharp" Version="0.13.0" />
<PackageReference Include="MMDeployCSharp" Version="0.14.0" />
<PackageReference Include="OpenCvSharp4" Version="4.5.5.20211231" />
<PackageReference Include="OpenCvSharp4.runtime.win" Version="4.5.5.20211231" />
</ItemGroup>

View File

@ -14,7 +14,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="MMDeployCSharp" Version="0.13.0" />
<PackageReference Include="MMDeployCSharp" Version="0.14.0" />
<PackageReference Include="OpenCvSharp4" Version="4.5.5.20211231" />
<PackageReference Include="OpenCvSharp4.runtime.win" Version="4.5.5.20211231" />
</ItemGroup>

View File

@ -14,7 +14,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="MMDeployCSharp" Version="0.13.0" />
<PackageReference Include="MMDeployCSharp" Version="0.14.0" />
<PackageReference Include="OpenCvSharp4" Version="4.5.5.20211231" />
<PackageReference Include="OpenCvSharp4.runtime.win" Version="4.5.5.20211231" />
</ItemGroup>

View File

@ -14,7 +14,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="MMDeployCSharp" Version="0.13.0" />
<PackageReference Include="MMDeployCSharp" Version="0.14.0" />
<PackageReference Include="OpenCvSharp4" Version="4.5.5.20211231" />
<PackageReference Include="OpenCvSharp4.runtime.win" Version="4.5.5.20211231" />
</ItemGroup>

View File

@ -14,7 +14,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="MMDeployCSharp" Version="0.13.0" />
<PackageReference Include="MMDeployCSharp" Version="0.14.0" />
<PackageReference Include="OpenCvSharp4" Version="4.5.5.20211231" />
<PackageReference Include="OpenCvSharp4.runtime.win" Version="4.5.5.20211231" />
</ItemGroup>

View File

@ -21,7 +21,7 @@
______________________________________________________________________
This tutorial takes `mmdeploy-0.13.0-windows-amd64.zip` and `mmdeploy-0.13.0-windows-amd64-cuda11.3.zip` as examples to show how to use the prebuilt packages. The former supports onnxruntime cpu inference, the latter supports onnxruntime-gpu and tensorrt inference.
This tutorial takes `mmdeploy-0.14.0-windows-amd64.zip` and `mmdeploy-0.14.0-windows-amd64-cuda11.3.zip` as examples to show how to use the prebuilt packages. The former supports onnxruntime cpu inference, the latter supports onnxruntime-gpu and tensorrt inference.
The directory structure of the prebuilt package is as follows, where the `dist` folder is about model converter, and the `sdk` folder is related to model inference.
@ -81,8 +81,8 @@ In order to use `ONNX Runtime` backend, you should also do the following steps.
5. Install `mmdeploy` (Model Converter) and `mmdeploy_runtime` (SDK Python API).
```bash
pip install mmdeploy==0.13.0
pip install mmdeploy-runtime==0.13.0
pip install mmdeploy==0.14.0
pip install mmdeploy-runtime==0.14.0
```
:point_right: If you have installed it before, please uninstall it first.
@ -100,7 +100,7 @@ In order to use `ONNX Runtime` backend, you should also do the following steps.
![sys-path](https://user-images.githubusercontent.com/16019484/181463801-1d7814a8-b256-46e9-86f2-c08de0bc150b.png)
:exclamation: Restart powershell to make the environment variables setting take effect. You can check whether the settings are in effect by `echo $env:PATH`.
8. Download SDK C/cpp Library mmdeploy-0.13.0-windows-amd64.zip
8. Download SDK C/cpp Library mmdeploy-0.14.0-windows-amd64.zip
### TensorRT
@ -109,8 +109,8 @@ In order to use `TensorRT` backend, you should also do the following steps.
5. Install `mmdeploy` (Model Converter) and `mmdeploy_runtime` (SDK Python API).
```bash
pip install mmdeploy==0.13.0
pip install mmdeploy-runtime-gpu==0.13.0
pip install mmdeploy==0.14.0
pip install mmdeploy-runtime-gpu==0.14.0
```
:point_right: If you have installed it before, please uninstall it first.
@ -129,7 +129,7 @@ In order to use `TensorRT` backend, you should also do the following steps.
7. Install pycuda by `pip install pycuda`
8. Download SDK C/cpp Library mmdeploy-0.13.0-windows-amd64-cuda11.3.zip
8. Download SDK C/cpp Library mmdeploy-0.14.0-windows-amd64-cuda11.3.zip
## Model Convert
@ -141,7 +141,7 @@ After preparation work, the structure of the current working directory should be
```
..
|-- mmdeploy-0.13.0-windows-amd64
|-- mmdeploy-0.14.0-windows-amd64
|-- mmclassification
|-- mmdeploy
`-- resnet18_8xb32_in1k_20210831-fbbb1da6.pth
@ -189,7 +189,7 @@ After installation of mmdeploy-tensorrt prebuilt package, the structure of the c
```
..
|-- mmdeploy-0.13.0-windows-amd64-cuda11.3
|-- mmdeploy-0.14.0-windows-amd64-cuda11.3
|-- mmclassification
|-- mmdeploy
`-- resnet18_8xb32_in1k_20210831-fbbb1da6.pth
@ -252,8 +252,8 @@ The structure of current working directory
```
.
|-- mmdeploy-0.13.0-windows-amd64-cuda11.1-tensorrt8.2.3.0
|-- mmdeploy-0.13.0-windows-amd64-onnxruntime1.8.1
|-- mmdeploy-0.14.0-windows-amd64
|-- mmdeploy-0.14.0-windows-amd64-cuda11.3
|-- mmclassification
|-- mmdeploy
|-- resnet18_8xb32_in1k_20210831-fbbb1da6.pth
@ -324,7 +324,7 @@ The following describes how to use the SDK's C API for inference
It is recommended to use `CMD` here.
Under `mmdeploy-0.13.0-windows-amd64\\example\\cpp\\build\\Release` directory
Under `mmdeploy-0.14.0-windows-amd64\\example\\cpp\\build\\Release` directory
```
.\image_classification.exe cpu C:\workspace\work_dir\onnx\resnet\ C:\workspace\mmclassification\demo\demo.JPEG
@ -344,7 +344,7 @@ The following describes how to use the SDK's C API for inference
It is recommended to use `CMD` here.
Under `mmdeploy-0.13.0-windows-amd64-cuda11.3\\example\\cpp\\build\\Release` directory
Under `mmdeploy-0.14.0-windows-amd64-cuda11.3\\example\\cpp\\build\\Release` directory
```
.\image_classification.exe cuda C:\workspace\work_dir\trt\resnet C:\workspace\mmclassification\demo\demo.JPEG

View File

@ -117,14 +117,14 @@ Take the latest precompiled package as example, you can install it as follows:
```shell
# 1. install MMDeploy model converter
pip install mmdeploy==0.13.0
pip install mmdeploy==0.14.0
# 2. install MMDeploy sdk inference
# you can install one to install according whether you need gpu inference
# 2.1 support onnxruntime
pip install mmdeploy-runtime==0.13.0
pip install mmdeploy-runtime==0.14.0
# 2.2 support onnxruntime-gpu, tensorrt
pip install mmdeploy-runtime-gpu==0.13.0
pip install mmdeploy-runtime-gpu==0.14.0
# 3. install inference engine
# 3.1 install TensorRT
@ -229,9 +229,9 @@ result = inference_model(
You can directly run MMDeploy demo programs in the precompiled package to get inference results.
```shell
wget https://github.com/open-mmlab/mmdeploy/releases/download/v0.13.0/mmdeploy-0.13.0-linux-x86_64-cuda11.3.tar.gz
tar xf mmdeploy-0.13.0-linux-x86_64-cuda11.3
cd mmdeploy-0.13.0-linux-x86_64-cuda11.3
wget https://github.com/open-mmlab/mmdeploy/releases/download/v0.14.0/mmdeploy-0.14.0-linux-x86_64-cuda11.3.tar.gz
tar xf mmdeploy-0.14.0-linux-x86_64-cuda11.3
cd mmdeploy-0.14.0-linux-x86_64-cuda11.3
# run python demo
python example/python/object_detection.py cuda ../mmdeploy_model/faster-rcnn ../mmdetection/demo/demo.jpg
# run C/C++ demo

View File

@ -23,7 +23,7 @@ ______________________________________________________________________
目前,`MMDeploy`在`Windows`平台下提供`cpu`以及`cuda`两种Device的预编译包其中`cpu`版支持使用onnxruntime cpu进行推理`cuda`版支持使用onnxruntime-gpu以及tensorrt进行推理可以从[Releases](https://github.com/open-mmlab/mmdeploy/releases)获取。。
本篇教程以`mmdeploy-0.13.0-windows-amd64.zip`和`mmdeploy-0.13.0-windows-amd64-cuda11.3.zip`为例,展示预编译包的使用方法。
本篇教程以`mmdeploy-0.14.0-windows-amd64.zip`和`mmdeploy-0.14.0-windows-amd64-cuda11.3.zip`为例,展示预编译包的使用方法。
为了方便使用者快速上手,本教程以分类模型(mmclassification)为例,展示两种预编译包的使用方法。
@ -89,8 +89,8 @@ ______________________________________________________________________
5. 安装`mmdeploy`(模型转换)以及`mmdeploy_runtime`模型推理Python API的预编译包
```bash
pip install mmdeploy==0.13.0
pip install mmdeploy-runtime==0.13.0
pip install mmdeploy==0.14.0
pip install mmdeploy-runtime==0.14.0
```
:point_right: 如果之前安装过,需要先卸载后再安装。
@ -108,7 +108,7 @@ ______________________________________________________________________
![sys-path](https://user-images.githubusercontent.com/16019484/181463801-1d7814a8-b256-46e9-86f2-c08de0bc150b.png)
:exclamation: 重启powershell让环境变量生效可以通过 echo $env:PATH 来检查是否设置成功。
8. 下载 SDK C/cpp Library mmdeploy-0.13.0-windows-amd64.zip
8. 下载 SDK C/cpp Library mmdeploy-0.14.0-windows-amd64.zip
### TensorRT
@ -117,8 +117,8 @@ ______________________________________________________________________
5. 安装`mmdeploy`(模型转换)以及`mmdeploy_runtime`模型推理Python API的预编译包
```bash
pip install mmdeploy==0.13.0
pip install mmdeploy-runtime-gpu==0.13.0
pip install mmdeploy==0.14.0
pip install mmdeploy-runtime-gpu==0.14.0
```
:point_right: 如果之前安装过,需要先卸载后再安装
@ -137,7 +137,7 @@ ______________________________________________________________________
7. 安装pycuda `pip install pycuda`
8. 下载 SDK C/cpp Library mmdeploy-0.13.0-windows-amd64-cuda11.3.zip
8. 下载 SDK C/cpp Library mmdeploy-0.14.0-windows-amd64-cuda11.3.zip
## 模型转换
@ -149,7 +149,7 @@ ______________________________________________________________________
```
..
|-- mmdeploy-0.13.0-windows-amd64
|-- mmdeploy-0.14.0-windows-amd64
|-- mmclassification
|-- mmdeploy
`-- resnet18_8xb32_in1k_20210831-fbbb1da6.pth
@ -197,7 +197,7 @@ export2SDK(deploy_cfg, model_cfg, work_dir, pth=model_checkpoint, device=device)
```
..
|-- mmdeploy-0.13.0-windows-amd64-cuda11.3
|-- mmdeploy-0.14.0-windows-amd64-cuda11.3
|-- mmclassification
|-- mmdeploy
`-- resnet18_8xb32_in1k_20210831-fbbb1da6.pth
@ -260,8 +260,8 @@ export2SDK(deploy_cfg, model_cfg, work_dir, pth=model_checkpoint, device=device)
```
.
|-- mmdeploy-0.13.0-windows-amd64-cuda11.1-tensorrt8.2.3.0
|-- mmdeploy-0.13.0-windows-amd64-onnxruntime1.8.1
|-- mmdeploy-0.14.0-windows-amd64
|-- mmdeploy-0.14.0-windows-amd64-cuda11.3
|-- mmclassification
|-- mmdeploy
|-- resnet18_8xb32_in1k_20210831-fbbb1da6.pth
@ -340,7 +340,7 @@ python .\mmdeploy\demo\python\image_classification.py cpu .\work_dir\onnx\resnet
这里建议使用cmd这样如果exe运行时如果找不到相关的dll的话会有弹窗
在mmdeploy-0.13.0-windows-amd64-onnxruntime1.8.1\\example\\cpp\\build\\Release目录下
在mmdeploy-0.14.0-windows-amd64\\example\\cpp\\build\\Release目录下
```
.\image_classification.exe cpu C:\workspace\work_dir\onnx\resnet\ C:\workspace\mmclassification\demo\demo.JPEG
@ -360,7 +360,7 @@ python .\mmdeploy\demo\python\image_classification.py cpu .\work_dir\onnx\resnet
这里建议使用cmd这样如果exe运行时如果找不到相关的dll的话会有弹窗
在mmdeploy-0.13.0-windows-amd64-cuda11.1-tensorrt8.2.3.0\\example\\cpp\\build\\Release目录下
在mmdeploy-0.14.0-windows-amd64-cuda11.3\\example\\cpp\\build\\Release目录下
```
.\image_classification.exe cuda C:\workspace\work_dir\trt\resnet C:\workspace\mmclassification\demo\demo.JPEG

View File

@ -113,14 +113,14 @@ mim install mmcv-full
```shell
# 1. 安装 MMDeploy 模型转换工具含trt/ort自定义算子
pip install mmdeploy==0.13.0
pip install mmdeploy==0.14.0
# 2. 安装 MMDeploy SDK推理工具
# 根据是否需要GPU推理可任选其一进行下载安装
# 2.1 支持 onnxruntime 推理
pip install mmdeploy-runtime==0.13.0
pip install mmdeploy-runtime==0.14.0
# 2.2 支持 onnxruntime-gpu tensorrt 推理
pip install mmdeploy-runtime-gpu==0.13.0
pip install mmdeploy-runtime-gpu==0.14.0
# 3. 安装推理引擎
# 3.1 安装推理引擎 TensorRT
@ -223,10 +223,10 @@ result = inference_model(
你可以直接运行预编译包中的 demo 程序,输入 SDK Model 和图像,进行推理,并查看推理结果。
```shell
wget https://github.com/open-mmlab/mmdeploy/releases/download/v0.13.0/mmdeploy-0.13.0-linux-x86_64-cuda11.3.tar.gz
tar xf mmdeploy-0.13.0-linux-x86_64-cuda11.3
wget https://github.com/open-mmlab/mmdeploy/releases/download/v0.14.0/mmdeploy-0.14.0-linux-x86_64-cuda11.3.tar.gz
tar xf mmdeploy-0.14.0-linux-x86_64-cuda11.3
cd mmdeploy-0.13.0-linux-x86_64-cuda11.3
cd mmdeploy-0.14.0-linux-x86_64-cuda11.3
# 运行 python demo
python example/python/object_detection.py cuda ../mmdeploy_model/faster-rcnn ../mmdetection/demo/demo.jpg
# 运行 C/C++ demo

View File

@ -1,7 +1,7 @@
# Copyright (c) OpenMMLab. All rights reserved.
from typing import Tuple
__version__ = '0.13.0'
__version__ = '0.14.0'
short_version = __version__

View File

@ -1,7 +1,6 @@
mmaction2<1.0.0
mmcls>=0.21.0,<=0.22.1
mmdet>=2.19.0,<=2.20.0
mmdet3d<1.0.0
mmedit<1.0.0
mmocr>=0.3.0,<=0.4.1
mmpose>=0.24.0,<=0.25.1

View File

@ -2,7 +2,7 @@ grpcio
matplotlib
multiprocess
numpy
onnx>=1.8.0
protobuf<=3.20.2
onnx>=1.13.0
protobuf==3.20.2
six
terminaltables

Binary file not shown.

Before

Width:  |  Height:  |  Size: 315 KiB

After

Width:  |  Height:  |  Size: 182 KiB

View File

@ -1,2 +1,2 @@
# Copyright (c) OpenMMLab. All rights reserved.
__version__ = '0.13.0'
__version__ = '0.14.0'

View File

@ -29,8 +29,6 @@ def get_job(argv) -> int:
nproc = cmd_result('nproc')
if nproc is not None and len(nproc) > 0:
job = max(int(nproc) - 2, 1)
else:
job = 1
else:
job = int(argv[1])
return job