bump version to v1.0.0 (#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
open-mmlab · Apr 6, 2023 · 4bb9bc7 · 4bb9bc7
1 parent 0196cd0
commit 4bb9bc7
Show file tree

Hide file tree

Showing 83 changed files with 372 additions and 357 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -33,7 +33,7 @@ workflows:
             third_party/.* lint_only false
             tools/.* lint_only false
             setup.py lint_only false
-          base-revision: dev-1.x
+          base-revision: main
           # this is the path of the configuration we should trigger once
           # path filtering and pipeline parameter value updates are
           # complete. In this case, we are using the parent dynamic

diff --git a/.circleci/test.yml b/.circleci/test.yml
@@ -84,8 +84,7 @@ commands:
           command: |
             cd mmdeploy
             python -m mim install -r requirements/codebases.txt
-            python -m pip install -r requirements/tests.txt
-            python -m pip install -r requirements/runtime.txt
+            python -m pip install -r requirements.txt
             python -m pip install -U numpy clip numba
             cd ..
   perform_model_converter_ut:
@@ -145,8 +144,7 @@ jobs:
           command: |
             docker exec mmdeploy pip install onnxruntime==1.8.1
             docker exec mmdeploy mim install -r mmdeploy/requirements/codebases.txt
-            docker exec mmdeploy pip install -r mmdeploy/requirements/tests.txt
-            docker exec mmdeploy pip install -r mmdeploy/requirements/runtime.txt
+            docker exec mmdeploy pip install -r mmdeploy/requirements.txt
             docker exec mmdeploy pip install -U numpy clip numba
       - run:
           name: Perform Model Converter unittests
@@ -272,11 +270,3 @@ workflows:
           version: 1.8.1
           requires:
             - lint
-      - hold:
-          type: approval
-          requires:
-            - test_linux_onnxruntime
-            - test_windows_onnxruntime
-      - test_linux_tensorrt:
-          requires:
-            - hold
diff --git a/.github/ISSUE_TEMPLATE/1-bug-report.yml b/.github/ISSUE_TEMPLATE/1-bug-report.yml
@@ -9,7 +9,7 @@ body:
     label: Checklist
     options:
     - label: I have searched related issues but cannot get the expected help.
-    - 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.
+    - 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.
     - label: 3. The bug has not been fixed in the latest version.
 - type: textarea
   attributes:

diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
@@ -2,7 +2,7 @@ blank_issues_enabled: false
 
 contact_links:
   - name: 💥 FAQ
-    url: https://github.com/open-mmlab/mmdeploy/tree/1.x/docs/en/faq.md
+    url: https://github.com/open-mmlab/mmdeploy/tree/main/docs/en/faq.md
     about: Check if your issue already has solutions
   - name: 💬 Forum
     url: https://github.com/open-mmlab/mmdeploy/discussions

diff --git a/.github/workflows/backend-ascend.yml b/.github/workflows/backend-ascend.yml
@@ -18,7 +18,7 @@ concurrency:
 
 jobs:
   build_sdk_demo:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     strategy:
       matrix:
         python-version: [3.7]
@@ -37,9 +37,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

diff --git a/.github/workflows/backend-ncnn.yml b/.github/workflows/backend-ncnn.yml
@@ -18,7 +18,7 @@ concurrency:
 
 jobs:
   test_onnx2ncnn:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     strategy:
       matrix:
         python-version: [3.7]
@@ -31,13 +31,11 @@ jobs:
         uses: actions/setup-python@v2
         with:
           python-version: ${{ matrix.python-version }}
-      - name: Install unittest dependencies
+      - name: Install dependencies
         run: |
+          sudo apt update
+          sudo apt install wget gcc-multilib g++-multilib wget libprotobuf-dev protobuf-compiler
           python -m pip install cmake onnx
-      - name: update
-        run: sudo apt update
-      - name: gcc-multilib
-        run: sudo apt install gcc-multilib g++-multilib wget libprotobuf-dev protobuf-compiler
       - name: Install ncnn
         run: |
           wget https://github.com/Tencent/ncnn/archive/refs/tags/20220420.tar.gz
@@ -60,7 +58,7 @@ jobs:
           echo $(pwd)
           ln -s build/bin/mmdeploy_onnx2ncnn ./
           python .github/scripts/test_onnx2ncnn.py --run 1
-  script_install:
+  build_ncnn:
     runs-on: ubuntu-20.04
     strategy:
       matrix:
@@ -78,5 +76,5 @@ jobs:
         run: |
           python -m pip install torch==1.8.2 torchvision==0.9.2 --extra-index-url https://download.pytorch.org/whl/lts/1.8/cpu
           python -m pip install mmcv-lite
-          python tools/scripts/build_ubuntu_x64_ncnn.py
+          python tools/scripts/build_ubuntu_x64_ncnn.py 8
           python -c 'import mmdeploy.apis.ncnn as ncnn_api; assert ncnn_api.is_available(with_custom_ops=True)'
diff --git a/.github/workflows/backend-ort.yml b/.github/workflows/backend-ort.yml
@@ -17,7 +17,7 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  script_install:
+  buils_ort:
     runs-on: ubuntu-20.04
     strategy:
       matrix:
@@ -35,7 +35,7 @@ jobs:
         run: |
           python -m pip install torch==1.8.2 torchvision==0.9.2 --extra-index-url https://download.pytorch.org/whl/lts/1.8/cpu
           python -m pip install mmcv-lite openmim
-          python tools/scripts/build_ubuntu_x64_ort.py
+          python tools/scripts/build_ubuntu_x64_ort.py 8
           python -c 'import mmdeploy.apis.onnxruntime as ort_api; assert ort_api.is_available(with_custom_ops=True)'
       - name: test mmcls full pipeline
         run: |

diff --git a/.github/workflows/backend-pplnn.yml b/.github/workflows/backend-pplnn.yml
@@ -17,23 +17,47 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  script_install:
-    runs-on: ubuntu-18.04
-    strategy:
-      matrix:
-        python-version: [3.7]
+  build_pplnn_cuda:
+    runs-on: [self-hosted, linux-3090]
+    container:
+      image: openmmlab/mmdeploy:ubuntu20.04-cuda11.3
+      options: "--gpus=all --ipc=host"
     steps:
       - name: Checkout repository
         uses: actions/checkout@v3
         with:
           submodules: 'recursive'
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2
+      - name: Install dependencies
+        run: |
+          apt update && apt install unzip wget
+          python3 -V
+          python3 -m pip install openmim numpy
+          python3 -m pip install -r requirements.txt
+          python3 -m mim install $(cat requirements/codebases.txt | grep mmcls)
+          python3 -m pip list
+      - name: Build SDK
+        run: |
+          bash .circleci/scripts/linux/build.sh "cuda" "pplnn" \
+              -Dpplcv_DIR=${pplcv_DIR} \
+              -Dpplnn_DIR=${pplnn_DIR}
+          ls build/lib
+      - name: Install mmdeploy with pplnn
+        run: |
+          rm -rf .eggs && python3 -m pip install -e .
+          export LD_LIBRARY_PATH="/root/workspace/mmdeploy/build/lib:${LD_LIBRARY_PATH}"
+          python3 tools/check_env.py
+          python3 -c 'import mmdeploy.apis.pplnn as pplnn_api; assert pplnn_api.is_available()'
+
+  build_pplnn_cpu:
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
         with:
-          python-version: ${{ matrix.python-version }}
-      - name: Install mmdeploy
+          submodules: 'recursive'
+      - name: Install mmdeploy with pplnn
         run: |
           python -m pip install torch==1.8.2 torchvision==0.9.2 --extra-index-url https://download.pytorch.org/whl/lts/1.8/cpu
-          python -m pip install mmcv-lite
-          python tools/scripts/build_ubuntu_x64_pplnn.py
+          python -m pip install mmcv-lite protobuf==3.20.2
+          python tools/scripts/build_ubuntu_x64_pplnn.py 8
           python -c 'import mmdeploy.apis.pplnn as pplnn_api; assert pplnn_api.is_available()'
diff --git a/.github/workflows/backend-rknn.yml b/.github/workflows/backend-rknn.yml
@@ -19,7 +19,7 @@ concurrency:
 
 jobs:
   build_rknpu2:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     steps:
       - name: Checkout repository
         uses: actions/checkout@v3
@@ -31,7 +31,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

diff --git a/.github/workflows/backend-snpe.yml b/.github/workflows/backend-snpe.yml
@@ -18,7 +18,7 @@ concurrency:
 
 jobs:
   build_sdk_demo:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     steps:
       - name: Checkout repository
         uses: actions/checkout@v3
@@ -31,9 +31,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

diff --git a/.github/workflows/backend-torchscript.yml b/.github/workflows/backend-torchscript.yml
@@ -1,4 +1,4 @@
-name: backend-ort
+name: backend-torchscript
 
 on:
   push:
@@ -17,8 +17,8 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  script_install:
-    runs-on: ubuntu-18.04
+  build_torchscript:
+    runs-on: ubuntu-20.04
     strategy:
       matrix:
         python-version: [3.7]
@@ -33,5 +33,7 @@ jobs:
           python-version: ${{ matrix.python-version }}
       - name: Install mmdeploy
         run: |
+          python -m pip install torch==1.11.0 torchvision==0.12.0 --extra-index-url https://download.pytorch.org/whl/lts/1.11/cpu
           python -m pip install mmcv-lite
-          python tools/scripts/build_ubuntu_x64_torchscript.py
+          python tools/scripts/build_ubuntu_x64_torchscript.py 8
+          python -c 'from mmdeploy.backend.torchscript import is_available; assert is_available()'