Skip to content

Commit c737563

Browse files
RunningLeonirexyc
RunningLeon
and
irexyc
authored
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 <[email protected]>
1 parent af16b9a commit c737563

File tree

34 files changed

+113
-150
lines changed

34 files changed

+113
-150
lines changed

‎.circleci/test.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ commands:
7474
- run:
7575
name: Install mmcv-full
7676
command: |
77-
python -m pip install opencv-python==4.5.4.60
77+
python -m pip install opencv-python==4.5.4.60 opencv-contrib-python==4.5.4.60 opencv-python-headless==4.5.4.60
7878
python -m pip install mmcv-full==<< parameters.version >> -f https://download.openmmlab.com/mmcv/dist/cpu/torch<< parameters.torch >>/index.html
7979
install_mmcv_cuda:
8080
parameters:
@@ -91,7 +91,7 @@ commands:
9191
- run:
9292
name: Install mmcv-full
9393
command: |
94-
python -m pip install opencv-python==4.5.4.60
94+
python -m pip install opencv-python==4.5.4.60 opencv-contrib-python==4.5.4.60 opencv-python-headless==4.5.4.60
9595
python -m pip install mmcv-full==<< parameters.version >> -f https://download.openmmlab.com/mmcv/dist/<< parameters.cuda >>/torch<< parameters.torch >>/index.html
9696
install_mmdeploy:
9797
description: "Install MMDeploy"

‎.github/workflows/backend-ascend.yml‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@ permissions:
2121

2222
jobs:
2323
build_sdk_demo:
24-
runs-on: ubuntu-18.04
24+
runs-on: ubuntu-20.04
2525
strategy:
2626
matrix:
2727
python-version: [3.7]
2828
steps:
2929
- name: Set up Python ${{ matrix.python-version }}
30-
uses: actions/setup-python@v2
30+
uses: actions/setup-python@v4
3131
with:
3232
python-version: ${{ matrix.python-version }}
3333
- name: Checkout repository
@@ -40,9 +40,7 @@ jobs:
4040
run: |
4141
sudo apt update
4242
sudo apt install -y ffmpeg libsm6 libxext6 git ninja-build libglib2.0-0 libxrender-dev libc++1-9 libc++abi1-9
43-
sudo add-apt-repository ppa:ignaciovizzo/opencv3-nonfree
4443
sudo apt install libopencv-dev
45-
pkg-config --libs opencv
4644
- name: Install Ascend Toolkit
4745
run: |
4846
mkdir -p $GITHUB_WORKSPACE/Ascend

‎.github/workflows/backend-ncnn.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ permissions:
2929

3030
jobs:
3131
test_onnx2ncnn:
32-
runs-on: ubuntu-18.04
32+
runs-on: ubuntu-20.04
3333
strategy:
3434
matrix:
3535
python-version: [3.7]
@@ -39,7 +39,7 @@ jobs:
3939
with:
4040
submodules: 'recursive'
4141
- name: Set up Python ${{ matrix.python-version }}
42-
uses: actions/setup-python@v2
42+
uses: actions/setup-python@v4
4343
with:
4444
python-version: ${{ matrix.python-version }}
4545
- name: Install unittest dependencies
@@ -82,12 +82,12 @@ jobs:
8282
with:
8383
submodules: 'recursive'
8484
- name: Set up Python ${{ matrix.python-version }}
85-
uses: actions/setup-python@v2
85+
uses: actions/setup-python@v4
8686
with:
8787
python-version: ${{ matrix.python-version }}
8888
- name: Install mmdeploy
8989
run: |
90-
python3 tools/scripts/build_ubuntu_x64_ncnn.py
9190
python3 -m pip install torch==1.8.2 torchvision==0.9.2 --extra-index-url https://download.pytorch.org/whl/lts/1.8/cpu
9291
python3 -m pip install mmcv-full==1.5.1 -f https://download.openmmlab.com/mmcv/dist/cpu/torch1.8.0/index.html
92+
python3 tools/scripts/build_ubuntu_x64_ncnn.py 8
9393
python3 -c 'import mmdeploy.apis.ncnn as ncnn_api; assert ncnn_api.is_available(with_custom_ops=True)'

‎.github/workflows/backend-ort.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,14 @@ jobs:
3131
with:
3232
submodules: 'recursive'
3333
- name: Set up Python ${{ matrix.python-version }}
34-
uses: actions/setup-python@v2
34+
uses: actions/setup-python@v4
3535
with:
3636
python-version: ${{ matrix.python-version }}
3737
- name: Install mmdeploy
3838
run: |
39-
python3 tools/scripts/build_ubuntu_x64_ort.py
4039
python3 -m pip install torch==1.8.2 torchvision==0.9.2 --extra-index-url https://download.pytorch.org/whl/lts/1.8/cpu
4140
python3 -m pip install mmcv-full==1.5.1 -f https://download.openmmlab.com/mmcv/dist/cpu/torch1.8.0/index.html
41+
python3 tools/scripts/build_ubuntu_x64_ort.py 8
4242
python3 -c 'import mmdeploy.apis.onnxruntime as ort_api; assert ort_api.is_available(with_custom_ops=True)'
4343
- name: test mmcls full pipeline
4444
run: |

‎.github/workflows/backend-pplnn.yml‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,22 +21,15 @@ permissions:
2121

2222
jobs:
2323
script_install:
24-
runs-on: ubuntu-18.04
25-
strategy:
26-
matrix:
27-
python-version: [3.7]
24+
runs-on: ubuntu-20.04
2825
steps:
2926
- name: Checkout repository
3027
uses: actions/checkout@v3
3128
with:
3229
submodules: 'recursive'
33-
- name: Set up Python ${{ matrix.python-version }}
34-
uses: actions/setup-python@v2
35-
with:
36-
python-version: ${{ matrix.python-version }}
3730
- name: Install mmdeploy
3831
run: |
39-
python3 tools/scripts/build_ubuntu_x64_pplnn.py
4032
python3 -m pip install torch==1.8.2 torchvision==0.9.2 --extra-index-url https://download.pytorch.org/whl/lts/1.8/cpu
4133
python3 -m pip install mmcv-full==1.5.1 -f https://download.openmmlab.com/mmcv/dist/cpu/torch1.8.0/index.html
34+
python3 tools/scripts/build_ubuntu_x64_pplnn.py 8
4235
python3 -c 'import mmdeploy.apis.pplnn as pplnn_api; assert pplnn_api.is_available()'

‎.github/workflows/backend-rknn.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ permissions:
2222

2323
jobs:
2424
build_rknpu2:
25-
runs-on: ubuntu-18.04
25+
runs-on: ubuntu-20.04
2626
steps:
2727
- name: Checkout repository
2828
uses: actions/checkout@v3
@@ -34,7 +34,7 @@ jobs:
3434
run: |
3535
sh -x tools/scripts/ubuntu_cross_build_rknn.sh rk3588
3636
build_rknpu:
37-
runs-on: ubuntu-18.04
37+
runs-on: ubuntu-20.04
3838
steps:
3939
- name: Checkout repository
4040
uses: actions/checkout@v3

‎.github/workflows/backend-snpe.yml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ permissions:
2121

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

‎.github/workflows/backend-torchscript.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ permissions:
2121

2222
jobs:
2323
script_install:
24-
runs-on: ubuntu-18.04
24+
runs-on: ubuntu-20.04
2525
strategy:
2626
matrix:
2727
python-version: [3.7]
@@ -31,9 +31,9 @@ jobs:
3131
with:
3232
submodules: 'recursive'
3333
- name: Set up Python ${{ matrix.python-version }}
34-
uses: actions/setup-python@v2
34+
uses: actions/setup-python@v4
3535
with:
3636
python-version: ${{ matrix.python-version }}
3737
- name: Install mmdeploy
3838
run: |
39-
python3 tools/scripts/build_ubuntu_x64_torchscript.py
39+
python3 tools/scripts/build_ubuntu_x64_torchscript.py 8

‎.github/workflows/backend-tvm.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,14 @@ jobs:
3131
with:
3232
submodules: 'recursive'
3333
- name: Set up Python ${{ matrix.python-version }}
34-
uses: actions/setup-python@v2
34+
uses: actions/setup-python@v4
3535
with:
3636
python-version: ${{ matrix.python-version }}
3737
- name: Install mmdeploy
3838
run: |
39-
python3 tools/scripts/build_ubuntu_x64_tvm.py
40-
source ~/mmdeploy.env
4139
python3 -m pip install torch==1.8.2 torchvision==0.9.2 --extra-index-url https://download.pytorch.org/whl/lts/1.8/cpu
4240
python3 -m pip install mmcv-full==1.5.1 -f https://download.openmmlab.com/mmcv/dist/cpu/torch1.8.0/index.html
4341
python3 -m pip install decorator psutil scipy attrs tornado pytest
42+
python3 tools/scripts/build_ubuntu_x64_tvm.py 8
43+
source ~/mmdeploy.env
4444
python3 -c 'import mmdeploy.apis.tvm as tvm_api; assert tvm_api.is_available()'

‎.github/workflows/build.yml‎

Lines changed: 25 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ permissions:
2525

2626
jobs:
2727
build_cpu_model_convert:
28-
runs-on: ubuntu-18.04
28+
runs-on: ubuntu-20.04
2929
strategy:
3030
matrix:
3131
python-version: [3.7]
@@ -39,9 +39,9 @@ jobs:
3939
torch_version: torch1.9
4040
torchvision: 0.10.0
4141
steps:
42-
- uses: actions/checkout@v2
42+
- uses: actions/checkout@v3
4343
- name: Set up Python ${{ matrix.python-version }}
44-
uses: actions/setup-python@v2
44+
uses: actions/setup-python@v4
4545
with:
4646
python-version: ${{ matrix.python-version }}
4747
- name: Install PyTorch
@@ -63,7 +63,7 @@ jobs:
6363
coverage report -m
6464
6565
build_cpu_sdk:
66-
runs-on: ubuntu-18.04
66+
runs-on: ubuntu-20.04
6767
steps:
6868
- name: Checkout repository
6969
uses: actions/checkout@v3
@@ -73,16 +73,18 @@ jobs:
7373
run: sudo apt update
7474
- name: gcc-multilib
7575
run: |
76-
sudo apt install gcc-multilib g++-multilib wget libprotobuf-dev protobuf-compiler
7776
sudo apt update
78-
sudo apt install -y ffmpeg libsm6 libxext6 git ninja-build libglib2.0-0 libxrender-dev libc++1-9 libc++abi1-9
79-
sudo add-apt-repository ppa:ignaciovizzo/opencv3-nonfree
80-
sudo apt install libopencv-dev lcov wget
81-
pkg-config --libs opencv
77+
sudo apt install libopencv-dev lcov wget -y
8278
- name: Build and run SDK unit test without backend
8379
run: |
8480
mkdir -p build && pushd build
85-
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
81+
cmake .. \
82+
-DMMDEPLOY_CODEBASES=all \
83+
-DMMDEPLOY_BUILD_SDK=ON \
84+
-DMMDEPLOY_BUILD_SDK_PYTHON_API=OFF \
85+
-DMMDEPLOY_TARGET_DEVICES=cpu \
86+
-DMMDEPLOY_COVERAGE=ON \
87+
-DMMDEPLOY_BUILD_TEST=ON
8688
make -j2
8789
mkdir -p mmdeploy_test_resources/transform
8890
cp ../tests/data/tiger.jpeg mmdeploy_test_resources/transform/
@@ -101,49 +103,42 @@ jobs:
101103
- name: update
102104
run: sudo apt update
103105
- name: Set up Python
104-
uses: actions/setup-python@v2
106+
uses: actions/setup-python@v4
105107
with:
106108
python-version: 3.8
107109
- name: gcc-multilib
108110
run: |
109111
sh -x tools/scripts/ubuntu_cross_build_aarch64.sh
110112
111113
build_cuda102:
112-
runs-on: ubuntu-18.04
114+
runs-on: ubuntu-20.04
113115
container:
114116
image: pytorch/pytorch:1.9.0-cuda10.2-cudnn7-devel
115117
env:
116118
FORCE_CUDA: 1
117119
strategy:
118120
matrix:
119-
python-version: [3.7]
121+
python-version: [3.8]
120122
torch: [1.9.0+cu102]
121123
mmcv: [1.4.2]
122124
include:
123125
- torch: 1.9.0+cu102
124126
torch_version: torch1.9
125127
torchvision: 0.10.0+cu102
126128
steps:
127-
- uses: actions/checkout@v2
128-
- name: Set up Python ${{ matrix.python-version }}
129-
uses: actions/setup-python@v2
130-
with:
131-
python-version: ${{ matrix.python-version }}
129+
- uses: actions/checkout@v3
132130
- name: Install system dependencies
133131
run: |
134132
apt-key adv --keyserver keyserver.ubuntu.com --recv-keys A4B469963BF863CC
135-
apt-get update && apt-get install -y ffmpeg libsm6 libxext6 git ninja-build libglib2.0-0 libxrender-dev python${{matrix.python-version}}-dev
136-
apt-get clean
137-
rm -rf /var/lib/apt/lists/*
133+
apt-get update && apt-get install -y git
138134
- name: Install PyTorch
139135
run: python -m pip install torch==${{matrix.torch}} torchvision==${{matrix.torchvision}} -f https://download.pytorch.org/whl/torch_stable.html
140136
- name: Install dependencies
141137
run: |
142138
python -V
139+
python -m pip install -U pip
143140
python -m pip install mmcv-full==${{matrix.mmcv}} -f https://download.openmmlab.com/mmcv/dist/cu102/${{matrix.torch_version}}/index.html
144-
CFLAGS=`python -c 'import sysconfig;print("-I"+sysconfig.get_paths()["include"])'` python -m pip install -r requirements.txt
145-
pip install -U pycuda
146-
python -m pip install -U numpy
141+
python -m pip install -r requirements.txt
147142
- name: Build and install
148143
run: |
149144
rm -rf .eggs && python -m pip install -e .
@@ -155,41 +150,30 @@ jobs:
155150
coverage report -m
156151
157152
build_cuda111:
158-
runs-on: ubuntu-18.04
153+
runs-on: ubuntu-20.04
159154
container:
160155
image: pytorch/pytorch:1.8.0-cuda11.1-cudnn8-devel
161-
162156
strategy:
163157
matrix:
164-
python-version: [3.7]
158+
python-version: [3.8]
165159
torch: [1.8.0+cu111]
166160
mmcv: [1.4.2]
167161
include:
168162
- torch: 1.8.0+cu111
169163
torch_version: torch1.8
170164
torchvision: 0.9.0+cu111
171-
172165
steps:
173-
- uses: actions/checkout@v2
174-
- name: Set up Python ${{ matrix.python-version }}
175-
uses: actions/setup-python@v2
176-
with:
177-
python-version: ${{ matrix.python-version }}
166+
- uses: actions/checkout@v3
178167
- name: Install system dependencies
179168
run: |
180169
apt-key adv --keyserver keyserver.ubuntu.com --recv-keys A4B469963BF863CC
181-
apt-get update && apt-get install -y ffmpeg libsm6 libxext6 git ninja-build libglib2.0-0 libxrender-dev python${{matrix.python-version}}-dev
182-
apt-get clean
183-
rm -rf /var/lib/apt/lists/*
184-
- name: Install PyTorch
185-
run: python -m pip install torch==${{matrix.torch}} torchvision==${{matrix.torchvision}} -f https://download.pytorch.org/whl/torch_stable.html
170+
apt-get update && apt-get install -y git
186171
- name: Install dependencies
187172
run: |
188173
python -V
174+
python -m pip install -U pip
189175
python -m pip install mmcv-full==${{matrix.mmcv}} -f https://download.openmmlab.com/mmcv/dist/cu111/${{matrix.torch_version}}/index.html
190-
CFLAGS=`python -c 'import sysconfig;print("-I"+sysconfig.get_paths()["include"])'` python -m pip install -r requirements.txt
191-
pip install -U pycuda
192-
python -m pip install -U numpy
176+
python -m pip install -r requirements.txt
193177
- name: Build and install
194178
run: |
195179
rm -rf .eggs && python -m pip install -e .

0 commit comments

Comments
 (0)