Skip to content

Commit 4bb9bc7

Browse files
authored
bump version to v1.0.0 (open-mmlab#1960)
* change docs from 1.x to main * bump version * update readme status info and highlights * revert version change * fix dead links * fix script * fix docs * fix building status * fix md lint error * upgrade to ubuntu20.04 for github ci * Revert "upgrade to ubuntu20.04 for github ci" This reverts commit 9c598f4. * update codebase md files * upgrade to ubuntu20.04 for github ci * fix * fix requirements * fix * fix ci * bump version * fix * fix pplnn torchscript * fix building status * fix ncnn * fix * remove circileci hold * fix pytorch image
1 parent 0196cd0 commit 4bb9bc7

File tree

83 files changed

+372
-357
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

83 files changed

+372
-357
lines changed

.circleci/config.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ workflows:
3333
third_party/.* lint_only false
3434
tools/.* lint_only false
3535
setup.py lint_only false
36-
base-revision: dev-1.x
36+
base-revision: main
3737
# this is the path of the configuration we should trigger once
3838
# path filtering and pipeline parameter value updates are
3939
# complete. In this case, we are using the parent dynamic

.circleci/test.yml

+2-12
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,7 @@ commands:
8484
command: |
8585
cd mmdeploy
8686
python -m mim install -r requirements/codebases.txt
87-
python -m pip install -r requirements/tests.txt
88-
python -m pip install -r requirements/runtime.txt
87+
python -m pip install -r requirements.txt
8988
python -m pip install -U numpy clip numba
9089
cd ..
9190
perform_model_converter_ut:
@@ -145,8 +144,7 @@ jobs:
145144
command: |
146145
docker exec mmdeploy pip install onnxruntime==1.8.1
147146
docker exec mmdeploy mim install -r mmdeploy/requirements/codebases.txt
148-
docker exec mmdeploy pip install -r mmdeploy/requirements/tests.txt
149-
docker exec mmdeploy pip install -r mmdeploy/requirements/runtime.txt
147+
docker exec mmdeploy pip install -r mmdeploy/requirements.txt
150148
docker exec mmdeploy pip install -U numpy clip numba
151149
- run:
152150
name: Perform Model Converter unittests
@@ -272,11 +270,3 @@ workflows:
272270
version: 1.8.1
273271
requires:
274272
- lint
275-
- hold:
276-
type: approval
277-
requires:
278-
- test_linux_onnxruntime
279-
- test_windows_onnxruntime
280-
- test_linux_tensorrt:
281-
requires:
282-
- hold

.github/ISSUE_TEMPLATE/1-bug-report.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ body:
99
label: Checklist
1010
options:
1111
- label: I have searched related issues but cannot get the expected help.
12-
- label: 2. I have read the [FAQ documentation](https://github.com/open-mmlab/mmdeploy/tree/1.x/docs/en/faq.md) but cannot get the expected help.
12+
- label: 2. I have read the [FAQ documentation](https://github.com/open-mmlab/mmdeploy/tree/main/docs/en/faq.md) but cannot get the expected help.
1313
- label: 3. The bug has not been fixed in the latest version.
1414
- type: textarea
1515
attributes:

.github/ISSUE_TEMPLATE/config.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ blank_issues_enabled: false
22

33
contact_links:
44
- name: 💥 FAQ
5-
url: https://github.com/open-mmlab/mmdeploy/tree/1.x/docs/en/faq.md
5+
url: https://github.com/open-mmlab/mmdeploy/tree/main/docs/en/faq.md
66
about: Check if your issue already has solutions
77
- name: 💬 Forum
88
url: https://github.com/open-mmlab/mmdeploy/discussions

.github/workflows/backend-ascend.yml

+1-3
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ concurrency:
1818

1919
jobs:
2020
build_sdk_demo:
21-
runs-on: ubuntu-18.04
21+
runs-on: ubuntu-20.04
2222
strategy:
2323
matrix:
2424
python-version: [3.7]
@@ -37,9 +37,7 @@ jobs:
3737
run: |
3838
sudo apt update
3939
sudo apt install -y ffmpeg libsm6 libxext6 git ninja-build libglib2.0-0 libxrender-dev libc++1-9 libc++abi1-9
40-
sudo add-apt-repository ppa:ignaciovizzo/opencv3-nonfree
4140
sudo apt install libopencv-dev
42-
pkg-config --libs opencv
4341
- name: Install Ascend Toolkit
4442
run: |
4543
mkdir -p $GITHUB_WORKSPACE/Ascend

.github/workflows/backend-ncnn.yml

+6-8
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ concurrency:
1818

1919
jobs:
2020
test_onnx2ncnn:
21-
runs-on: ubuntu-18.04
21+
runs-on: ubuntu-20.04
2222
strategy:
2323
matrix:
2424
python-version: [3.7]
@@ -31,13 +31,11 @@ jobs:
3131
uses: actions/setup-python@v2
3232
with:
3333
python-version: ${{ matrix.python-version }}
34-
- name: Install unittest dependencies
34+
- name: Install dependencies
3535
run: |
36+
sudo apt update
37+
sudo apt install wget gcc-multilib g++-multilib wget libprotobuf-dev protobuf-compiler
3638
python -m pip install cmake onnx
37-
- name: update
38-
run: sudo apt update
39-
- name: gcc-multilib
40-
run: sudo apt install gcc-multilib g++-multilib wget libprotobuf-dev protobuf-compiler
4139
- name: Install ncnn
4240
run: |
4341
wget https://github.com/Tencent/ncnn/archive/refs/tags/20220420.tar.gz
@@ -60,7 +58,7 @@ jobs:
6058
echo $(pwd)
6159
ln -s build/bin/mmdeploy_onnx2ncnn ./
6260
python .github/scripts/test_onnx2ncnn.py --run 1
63-
script_install:
61+
build_ncnn:
6462
runs-on: ubuntu-20.04
6563
strategy:
6664
matrix:
@@ -78,5 +76,5 @@ jobs:
7876
run: |
7977
python -m pip install torch==1.8.2 torchvision==0.9.2 --extra-index-url https://download.pytorch.org/whl/lts/1.8/cpu
8078
python -m pip install mmcv-lite
81-
python tools/scripts/build_ubuntu_x64_ncnn.py
79+
python tools/scripts/build_ubuntu_x64_ncnn.py 8
8280
python -c 'import mmdeploy.apis.ncnn as ncnn_api; assert ncnn_api.is_available(with_custom_ops=True)'

.github/workflows/backend-ort.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ concurrency:
1717
cancel-in-progress: true
1818

1919
jobs:
20-
script_install:
20+
buils_ort:
2121
runs-on: ubuntu-20.04
2222
strategy:
2323
matrix:
@@ -35,7 +35,7 @@ jobs:
3535
run: |
3636
python -m pip install torch==1.8.2 torchvision==0.9.2 --extra-index-url https://download.pytorch.org/whl/lts/1.8/cpu
3737
python -m pip install mmcv-lite openmim
38-
python tools/scripts/build_ubuntu_x64_ort.py
38+
python tools/scripts/build_ubuntu_x64_ort.py 8
3939
python -c 'import mmdeploy.apis.onnxruntime as ort_api; assert ort_api.is_available(with_custom_ops=True)'
4040
- name: test mmcls full pipeline
4141
run: |

.github/workflows/backend-pplnn.yml

+35-11
Original file line numberDiff line numberDiff line change
@@ -17,23 +17,47 @@ concurrency:
1717
cancel-in-progress: true
1818

1919
jobs:
20-
script_install:
21-
runs-on: ubuntu-18.04
22-
strategy:
23-
matrix:
24-
python-version: [3.7]
20+
build_pplnn_cuda:
21+
runs-on: [self-hosted, linux-3090]
22+
container:
23+
image: openmmlab/mmdeploy:ubuntu20.04-cuda11.3
24+
options: "--gpus=all --ipc=host"
2525
steps:
2626
- name: Checkout repository
2727
uses: actions/checkout@v3
2828
with:
2929
submodules: 'recursive'
30-
- name: Set up Python ${{ matrix.python-version }}
31-
uses: actions/setup-python@v2
30+
- name: Install dependencies
31+
run: |
32+
apt update && apt install unzip wget
33+
python3 -V
34+
python3 -m pip install openmim numpy
35+
python3 -m pip install -r requirements.txt
36+
python3 -m mim install $(cat requirements/codebases.txt | grep mmcls)
37+
python3 -m pip list
38+
- name: Build SDK
39+
run: |
40+
bash .circleci/scripts/linux/build.sh "cuda" "pplnn" \
41+
-Dpplcv_DIR=${pplcv_DIR} \
42+
-Dpplnn_DIR=${pplnn_DIR}
43+
ls build/lib
44+
- name: Install mmdeploy with pplnn
45+
run: |
46+
rm -rf .eggs && python3 -m pip install -e .
47+
export LD_LIBRARY_PATH="/root/workspace/mmdeploy/build/lib:${LD_LIBRARY_PATH}"
48+
python3 tools/check_env.py
49+
python3 -c 'import mmdeploy.apis.pplnn as pplnn_api; assert pplnn_api.is_available()'
50+
51+
build_pplnn_cpu:
52+
runs-on: ubuntu-20.04
53+
steps:
54+
- name: Checkout repository
55+
uses: actions/checkout@v3
3256
with:
33-
python-version: ${{ matrix.python-version }}
34-
- name: Install mmdeploy
57+
submodules: 'recursive'
58+
- name: Install mmdeploy with pplnn
3559
run: |
3660
python -m pip install torch==1.8.2 torchvision==0.9.2 --extra-index-url https://download.pytorch.org/whl/lts/1.8/cpu
37-
python -m pip install mmcv-lite
38-
python tools/scripts/build_ubuntu_x64_pplnn.py
61+
python -m pip install mmcv-lite protobuf==3.20.2
62+
python tools/scripts/build_ubuntu_x64_pplnn.py 8
3963
python -c 'import mmdeploy.apis.pplnn as pplnn_api; assert pplnn_api.is_available()'

.github/workflows/backend-rknn.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ concurrency:
1919

2020
jobs:
2121
build_rknpu2:
22-
runs-on: ubuntu-18.04
22+
runs-on: ubuntu-20.04
2323
steps:
2424
- name: Checkout repository
2525
uses: actions/checkout@v3
@@ -31,7 +31,7 @@ jobs:
3131
run: |
3232
sh -x tools/scripts/ubuntu_cross_build_rknn.sh rk3588
3333
build_rknpu:
34-
runs-on: ubuntu-18.04
34+
runs-on: ubuntu-20.04
3535
steps:
3636
- name: Checkout repository
3737
uses: actions/checkout@v3

.github/workflows/backend-snpe.yml

+1-3
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ concurrency:
1818

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

.github/workflows/backend-torchscript.yml

+6-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: backend-ort
1+
name: backend-torchscript
22

33
on:
44
push:
@@ -17,8 +17,8 @@ concurrency:
1717
cancel-in-progress: true
1818

1919
jobs:
20-
script_install:
21-
runs-on: ubuntu-18.04
20+
build_torchscript:
21+
runs-on: ubuntu-20.04
2222
strategy:
2323
matrix:
2424
python-version: [3.7]
@@ -33,5 +33,7 @@ jobs:
3333
python-version: ${{ matrix.python-version }}
3434
- name: Install mmdeploy
3535
run: |
36+
python -m pip install torch==1.11.0 torchvision==0.12.0 --extra-index-url https://download.pytorch.org/whl/lts/1.11/cpu
3637
python -m pip install mmcv-lite
37-
python tools/scripts/build_ubuntu_x64_torchscript.py
38+
python tools/scripts/build_ubuntu_x64_torchscript.py 8
39+
python -c 'from mmdeploy.backend.torchscript import is_available; assert is_available()'

0 commit comments

Comments
 (0)