From 6762958ea0ee423003849f2b35c8ae9c664f1579 Mon Sep 17 00:00:00 2001 From: Junjun2016 Date: Thu, 9 Sep 2021 09:43:17 +0800 Subject: [PATCH] [Enhancement] Upgrade CI for PyTorch1.9 (#712) * Upgrade CI for PyTorch1.9 * fix typo * merge build_cu101 and build_cu102 to build_cuda * fix substitution bug * test * test * test * test * test * test * test * test * test * test * test * test * remove redudant items * add python 3.9 to CI * add python 3.9 to setup.py * remove some versions of pytorch for python 3.9 test * fix torch version error * delete mim files * update ubuntu version * fix mmcv cuda version --- .github/workflows/build.yml | 96 +++++++++++++++++++++++++------------ setup.py | 1 + 2 files changed, 67 insertions(+), 30 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0136f2b4f..6bb5a4d14 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -4,7 +4,7 @@ on: [ push, pull_request ] jobs: lint: - runs-on: ubuntu-latest + runs-on: ubuntu-18.04 steps: - uses: actions/checkout@v2 - name: Set up Python 3.7 @@ -21,26 +21,31 @@ jobs: run: | pip install interrogate interrogate -v --ignore-init-method --ignore-module --ignore-nested-functions --exclude mmseg/ops --ignore-regex "__repr__" --fail-under 80 mmseg - build_cpu: runs-on: ubuntu-18.04 strategy: matrix: - python-version: [ 3.6, 3.7 ] - torch: [ 1.3.0, 1.5.0 ] + python-version: [3.7] + torch: [1.3.0, 1.5.0, 1.7.0, 1.9.0] include: - torch: 1.3.0 torchvision: 0.4.1 - torch: 1.5.0 torchvision: 0.6.0 + - torch: 1.7.0 + torchvision: 0.8.1 + - torch: 1.9.0 + torchvision: 0.10.0 steps: - uses: actions/checkout@v2 - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v2 with: python-version: ${{ matrix.python-version }} + - name: Upgrade pip + run: pip install pip --upgrade - name: Install Pillow - if: ${{matrix.torchvision < 0.5}} + if: ${{matrix.torchvision == '0.4.1'}} run: pip install Pillow==6.2.2 - name: Install PyTorch run: pip install torch==${{matrix.torch}}+cpu torchvision==${{matrix.torchvision}}+cpu -f https://download.pytorch.org/whl/torch_stable.html @@ -48,6 +53,7 @@ jobs: run: | pip install mmcv-full -f https://download.openmmlab.com/mmcv/dist/cpu/torch${{matrix.torch}}/index.html pip install -r requirements.txt + python -c 'import mmcv; print(mmcv.__version__)' - name: Build and install run: rm -rf .eggs && pip install -e . - name: Run unittests and generate coverage report @@ -57,55 +63,84 @@ jobs: coverage report -m build_cuda: - env: - CUDA: 10.1.105-1 - CUDA_SHORT: 10.1 - UBUNTU_VERSION: ubuntu1804 - FORCE_CUDA: 1 - MMCV_CUDA_ARGS: -gencode=arch=compute_61,code=sm_61 runs-on: ubuntu-18.04 + env: + UBUNTU_VERSION: ubuntu1804 strategy: matrix: - python-version: [ 3.6, 3.7 ] - torch: [ 1.5.0, 1.6.0, 1.7.0, 1.8.0 ] + python-version: [3.7] + torch: [1.5.0+cu101, 1.7.0+cu101, 1.8.0+cu101, 1.9.0+cu102] include: - - torch: 1.5.0 - torchvision: 0.6.0 - - torch: 1.6.0 - torchvision: 0.7.0 - - torch: 1.7.0 - torchvision: 0.8.1 - - torch: 1.8.0 - torchvision: 0.9.0 + - torch: 1.5.0+cu101 + torch_version: torch1.5.0 + torchvision: 0.6.0+cu101 + CUDA: 10.1.105-1 + CUDA_SHORT: 10-1 + - torch: 1.7.0+cu101 + torch_version: torch1.7.0 + torchvision: 0.8.1+cu101 + CUDA: 10.1.105-1 + CUDA_SHORT: 10-1 + - torch: 1.8.0+cu101 + torch_version: torch1.8.0 + torchvision: 0.9.0+cu101 + CUDA: 10.1.105-1 + CUDA_SHORT: 10-1 + - torch: 1.9.0+cu102 + torch_version: torch1.9.0 + torchvision: 0.10.0+cu102 + CUDA: 10.2.89-1 + CUDA_SHORT: 10-2 + - python-version: 3.6 + torch: 1.8.0+cu101 + torch_version: torch1.8.0 + torchvision: 0.9.0+cu101 + CUDA: 10.1.105-1 + CUDA_SHORT: 10-1 + - python-version: 3.8 + torch: 1.8.0+cu101 + torch_version: torch1.8.0 + torchvision: 0.9.0+cu101 + CUDA: 10.1.105-1 + CUDA_SHORT: 10-1 + - python-version: 3.9 + torch: 1.8.0+cu101 + torch_version: torch1.8.0 + torchvision: 0.9.0+cu101 + CUDA: 10.1.105-1 + CUDA_SHORT: 10-1 steps: - uses: actions/checkout@v2 - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v2 with: python-version: ${{ matrix.python-version }} + - name: Upgrade pip + run: pip install pip --upgrade - name: Install CUDA run: | - export INSTALLER=cuda-repo-${UBUNTU_VERSION}_${CUDA}_amd64.deb + export INSTALLER=cuda-repo-${UBUNTU_VERSION}_${{matrix.CUDA}}_amd64.deb wget http://developer.download.nvidia.com/compute/cuda/repos/${UBUNTU_VERSION}/x86_64/${INSTALLER} sudo dpkg -i ${INSTALLER} wget https://developer.download.nvidia.com/compute/cuda/repos/${UBUNTU_VERSION}/x86_64/7fa2af80.pub sudo apt-key add 7fa2af80.pub sudo apt update -qq - sudo apt install -y cuda-${CUDA_SHORT/./-} cuda-cufft-dev-${CUDA_SHORT/./-} + sudo apt install -y cuda-${{matrix.CUDA_SHORT}} cuda-cufft-dev-${{matrix.CUDA_SHORT}} sudo apt clean - export CUDA_HOME=/usr/local/cuda-${CUDA_SHORT} + export CUDA_HOME=/usr/local/cuda-${{matrix.CUDA_SHORT}} export LD_LIBRARY_PATH=${CUDA_HOME}/lib64:${CUDA_HOME}/include:${LD_LIBRARY_PATH} export PATH=${CUDA_HOME}/bin:${PATH} sudo apt-get install -y ninja-build - - name: Install Pillow - if: ${{matrix.torchvision < 0.5}} - run: pip install Pillow==6.2.2 - name: Install PyTorch - run: pip install torch==${{matrix.torch}}+cu101 torchvision==${{matrix.torchvision}}+cu101 -f https://download.pytorch.org/whl/torch_stable.html + run: pip install torch==${{matrix.torch}} torchvision==${{matrix.torchvision}} -f https://download.pytorch.org/whl/torch_stable.html - name: Install mmseg dependencies run: | - pip install mmcv-full -f https://download.openmmlab.com/mmcv/dist/cu101/torch${{matrix.torch}}/index.html + pip install mmcv-full -f https://download.openmmlab.com/mmcv/dist/${CUDA_SHORT/-/}/${{matrix.torch_version}}/index.html pip install -r requirements.txt + python -c 'import mmcv; print(mmcv.__version__)' + - name: Install dependencies for compiling onnx when python=3.9 + run: pip install protobuf && sudo apt-get install libprotobuf-dev protobuf-compiler + if: ${{matrix.python-version == '3.9'}} - name: Build and install run: rm -rf .eggs && pip install -e . - name: Run unittests and generate coverage report @@ -115,7 +150,8 @@ jobs: coverage report -m # Only upload coverage report for python3.7 && pytorch1.5 - name: Upload coverage to Codecov - uses: codecov/codecov-action@v1.0.10 + if: ${{matrix.torch == '1.5.0+cu101' && matrix.python-version == '3.7'}} + uses: codecov/codecov-action@v1.0.14 with: file: ./coverage.xml flags: unittests diff --git a/setup.py b/setup.py index 6ae6da2ee..f428fb2dd 100755 --- a/setup.py +++ b/setup.py @@ -167,6 +167,7 @@ if __name__ == '__main__': 'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.8', + 'Programming Language :: Python :: 3.9', ], license='Apache License 2.0', setup_requires=parse_requirements('requirements/build.txt'),