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]>
open-mmlab · Apr 5, 2023 · c737563 · c737563
1 parent af16b9a
commit c737563
Show file tree

Hide file tree

Showing 34 changed files with 113 additions and 150 deletions.
diff --git a/.circleci/test.yml b/.circleci/test.yml
@@ -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"

diff --git a/.github/workflows/backend-ascend.yml b/.github/workflows/backend-ascend.yml
@@ -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

diff --git a/.github/workflows/backend-ncnn.yml b/.github/workflows/backend-ncnn.yml
@@ -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)'
diff --git a/.github/workflows/backend-ort.yml b/.github/workflows/backend-ort.yml
@@ -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: |

diff --git a/.github/workflows/backend-pplnn.yml b/.github/workflows/backend-pplnn.yml
@@ -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()'
diff --git a/.github/workflows/backend-rknn.yml b/.github/workflows/backend-rknn.yml
@@ -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

diff --git a/.github/workflows/backend-snpe.yml b/.github/workflows/backend-snpe.yml
@@ -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

diff --git a/.github/workflows/backend-torchscript.yml b/.github/workflows/backend-torchscript.yml
@@ -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
diff --git a/.github/workflows/backend-tvm.yml b/.github/workflows/backend-tvm.yml
@@ -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()'
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -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,49 +103,42 @@ 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
         run: |
           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:
           - torch: 1.9.0+cu102
             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 .

diff --git a/.github/workflows/java_api.yml b/.github/workflows/java_api.yml
@@ -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

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -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