From 154081c023a13e431f1037c905182e1d76cad0fc Mon Sep 17 00:00:00 2001 From: "PJLAB\\huanghaian" <1286304229@qq.com> Date: Tue, 30 Nov 2021 09:28:48 +0800 Subject: [PATCH 1/4] add ci --- .circleci/config.yaml | 168 ++++++++++++++++++++++++++++++++++++++++ .pre-commit-config.yaml | 7 +- 2 files changed, 172 insertions(+), 3 deletions(-) create mode 100644 .circleci/config.yaml diff --git a/.circleci/config.yaml b/.circleci/config.yaml new file mode 100644 index 00000000000..0a2e27e2444 --- /dev/null +++ b/.circleci/config.yaml @@ -0,0 +1,168 @@ +version: 2.1 + +jobs: + lint: + docker: + - image: cimg/python:3.7.4 + steps: + - checkout + - run: + name: Install dependencies + command: | + sudo apt-add-repository ppa:brightbox/ruby-ng -y + sudo apt-get update + sudo apt-get install -y ruby2.7 + - run: + name: Install pre-commit hook + command: | + pip install pre-commit + pre-commit install + - run: + name: Linting + command: pre-commit run --all-files + - run: + name: Check docstring coverage + command: | + pip install interrogate + interrogate -v --ignore-init-method --ignore-module --ignore-nested-functions --ignore-regex "__repr__" --fail-under 50 mmdet + + build_cpu: + parameters: + # The python version must match available image tags in + # https://circleci.com/developer/images/image/cimg/python + python: + type: string + default: "3.7.4" + torch: + type: string + torchvision: + type: string + docker: + - image: cimg/python:<< parameters.python >> + resource_class: large + steps: + - checkout + - run: + name: Install Libraries + command: | + sudo apt-get update + sudo apt-get install -y ninja-build libglib2.0-0 libsm6 libxrender-dev libxext6 libgl1-mesa-glx libjpeg-dev zlib1g-dev libtinfo-dev libncurses5 + - run: + name: Configure Python & pip + command: | + pip install --upgrade pip + pip install wheel + - run: + name: Install PyTorch + command: | + python -V + pip install torch==<< parameters.torch >>+cpu torchvision==<< parameters.torchvision >>+cpu -f https://download.pytorch.org/whl/torch_stable.html + - when: + condition: + equal: [ "3.9.0", << parameters.python >> ] + steps: + - run: pip install protobuf && sudo apt-get update && sudo apt-get -y install libprotobuf-dev protobuf-compiler cmake + - run: + name: Install mmdet dependencies + command: | + pip install mmcv-full -f https://download.openmmlab.com/mmcv/dist/cpu/torch<< parameters.torch >>/index.html + pip install -r requirements.txt + pip install albumentations>=0.3.2 --no-binary imgaug,albumentations + pip install git+https://github.com/cocodataset/panopticapi.git + - run: + name: Build and install + command: | + pip install -e . + - run: + name: Run unittests + command: | + coverage run --branch --source mmdet -m pytest tests/ + coverage xml + coverage report -m + + build_cu101: + machine: + image: ubuntu-1604-cuda-10.1:201909-23 + resource_class: gpu.nvidia.small + steps: + - checkout + - run: + name: Install Libraries + command: | + sudo apt-get update + sudo apt-get install -y git ninja-build libglib2.0-0 libsm6 libxrender-dev libxext6 libgl1-mesa-glx + - run: + name: Configure Python & pip + command: | + pyenv global 3.7.0 + pip install --upgrade pip + pip install wheel + - run: + name: Install PyTorch + command: | + python -V + pip install torch==1.6.0+cu101 torchvision==0.7.0+cu101 -f https://download.pytorch.org/whl/torch_stable.html + - run: + name: Install mmdet dependencies + # pip install mmcv-full -f https://download.openmmlab.com/mmcv/dist/cu101/torch${{matrix.torch_version}}/index.html + command: | + pip install mmcv-full -f https://download.openmmlab.com/mmcv/dist/cu101/torch1.6.0/index.html + pip install -r requirements.txt + pip install pycocotools + pip install albumentations>=0.3.2 --no-binary imgaug,albumentations + pip install git+https://github.com/cocodataset/panopticapi.git + python -c 'import mmcv; print(mmcv.__version__)' + - run: + name: Build and install + command: | + python setup.py check -m -s + TORCH_CUDA_ARCH_LIST=7.0 pip install -e . + - run: + name: Run unittests + command: | + pytest tests/ + +workflows: + unit_tests: + jobs: + - lint + - build_cpu: + name: build_cpu_th1.6 + torch: 1.6.0 + torchvision: 0.7.0 + requires: + - lint + - build_cpu: + name: build_cpu_th1.7 + torch: 1.7.0 + torchvision: 0.8.1 + requires: + - lint + - build_cpu: + name: build_cpu_th1.8_py3.9 + torch: 1.8.0 + torchvision: 0.9.0 + python: "3.9.0" + requires: + - lint + - build_cpu: + name: build_cpu_th1.9_py3.8 + torch: 1.9.0 + torchvision: 0.10.0 + python: "3.8.12" + requires: + - lint + - build_cpu: + name: build_cpu_th1.9_py3.9 + torch: 1.9.0 + torchvision: 0.10.0 + python: "3.9.0" + requires: + - lint + - build_cu101: + requires: + - build_cpu_th1.6 + - build_cpu_th1.7 + - build_cpu_th1.8_py3.9 + - build_cpu_th1.9_py3.8 + - build_cpu_th1.9_py3.9 diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index d7999f010ac..c461b497ce1 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -28,11 +28,12 @@ repos: args: ["--remove"] - id: mixed-line-ending args: ["--fix=lf"] - - repo: https://github.com/jumanjihouse/pre-commit-hooks - rev: 2.1.4 + - repo: https://github.com/markdownlint/markdownlint + rev: v0.11.0 hooks: - id: markdownlint - args: ["-r", "~MD002,~MD013,~MD024,~MD029,~MD033,~MD034,~MD036", "-t", "allow_different_nesting"] + args: ["-r", "~MD002,~MD013,~MD029,~MD033,~MD034", + "-t", "allow_different_nesting"] - repo: https://github.com/codespell-project/codespell rev: v2.1.0 hooks: From 0a64e268e985c7313e2ef99d0ad02837266c9c8b Mon Sep 17 00:00:00 2001 From: "PJLAB\\huanghaian" <1286304229@qq.com> Date: Tue, 30 Nov 2021 10:28:59 +0800 Subject: [PATCH 2/4] rename --- .circleci/{config.yaml => config.yml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .circleci/{config.yaml => config.yml} (100%) diff --git a/.circleci/config.yaml b/.circleci/config.yml similarity index 100% rename from .circleci/config.yaml rename to .circleci/config.yml From fc88934ae5099262b6e3b05ab91abeb6d1cfe6a7 Mon Sep 17 00:00:00 2001 From: "PJLAB\\huanghaian" <1286304229@qq.com> Date: Tue, 30 Nov 2021 19:01:59 +0800 Subject: [PATCH 3/4] fix mmtrack unittest --- .circleci/config.yml | 4 ++-- requirements/tests.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 0a2e27e2444..804bfd761f7 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -66,7 +66,7 @@ jobs: name: Install mmdet dependencies command: | pip install mmcv-full -f https://download.openmmlab.com/mmcv/dist/cpu/torch<< parameters.torch >>/index.html - pip install -r requirements.txt + pip install -r requirements/tests.txt -r requirements/optional.txt pip install albumentations>=0.3.2 --no-binary imgaug,albumentations pip install git+https://github.com/cocodataset/panopticapi.git - run: @@ -107,7 +107,7 @@ jobs: # pip install mmcv-full -f https://download.openmmlab.com/mmcv/dist/cu101/torch${{matrix.torch_version}}/index.html command: | pip install mmcv-full -f https://download.openmmlab.com/mmcv/dist/cu101/torch1.6.0/index.html - pip install -r requirements.txt + pip install -r requirements/tests.txt -r requirements/optional.txt pip install pycocotools pip install albumentations>=0.3.2 --no-binary imgaug,albumentations pip install git+https://github.com/cocodataset/panopticapi.git diff --git a/requirements/tests.txt b/requirements/tests.txt index 124a750bfb5..7470725c365 100644 --- a/requirements/tests.txt +++ b/requirements/tests.txt @@ -5,7 +5,7 @@ interrogate isort==4.3.21 # Note: used for kwarray.group_items, this may be ported to mmcv in the future. kwarray -mmtrack +-e git+https://github.com/open-mmlab/mmtracking#egg=mmtrack onnx==1.7.0 onnxruntime>=1.8.0 pytest From a4b4b5e165eeb01ed851b4386d544c06ed251ec8 Mon Sep 17 00:00:00 2001 From: "PJLAB\\huanghaian" <1286304229@qq.com> Date: Tue, 30 Nov 2021 19:27:34 +0800 Subject: [PATCH 4/4] update mmcv version --- docs/get_started.md | 5 +++-- docs_zh-CN/get_started.md | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/docs/get_started.md b/docs/get_started.md index f6b3edb0e36..14ff77e65ce 100644 --- a/docs/get_started.md +++ b/docs/get_started.md @@ -11,8 +11,9 @@ Compatible MMDetection and MMCV versions are shown as below. Please install the | MMDetection version | MMCV version | |:-------------------:|:-------------------:| -| master | mmcv-full>=1.3.14, <1.4.0 | -| 2.18.0 | mmcv-full>=1.3.14, <1.4.0 | +| master | mmcv-full>=1.3.17, <1.5.0 | +| 2.19.0 | mmcv-full>=1.3.17, <1.5.0 | +| 2.18.0 | mmcv-full>=1.3.17, <1.4.0 | | 2.17.0 | mmcv-full>=1.3.14, <1.4.0 | | 2.16.0 | mmcv-full>=1.3.8, <1.4.0 | | 2.15.1 | mmcv-full>=1.3.8, <1.4.0 | diff --git a/docs_zh-CN/get_started.md b/docs_zh-CN/get_started.md index 317af030a79..4b69679aa5c 100644 --- a/docs_zh-CN/get_started.md +++ b/docs_zh-CN/get_started.md @@ -11,8 +11,8 @@ MMDetection 和 MMCV 版本兼容性如下所示，需要安装正确的 MMCV | MMDetection 版本 | MMCV 版本 | | :--------------: | :----------------------: | -| master | mmcv-full>=1.3.17, <1.4.0 | -| 2.19.0 | mmcv-full>=1.3.17, <1.4.0 | +| master | mmcv-full>=1.3.17, <1.5.0 | +| 2.19.0 | mmcv-full>=1.3.17, <1.5.0 | | 2.18.1 | mmcv-full>=1.3.17, <1.4.0 | | 2.18.0 | mmcv-full>=1.3.14, <1.4.0 | | 2.17.0 | mmcv-full>=1.3.14, <1.4.0 |