merge dev-1.x

open-mmlab · Dec 27, 2023 · 5a1dc65 · 5a1dc65
2 parents fd0825a + 5b88c7b
commit 5a1dc65
Show file tree

Hide file tree

Showing 88 changed files with 3,350 additions and 1,272 deletions.
diff --git a/.circleci/docker/Dockerfile b/.circleci/docker/Dockerfile
@@ -2,6 +2,8 @@ ARG PYTORCH="1.8.1"
 ARG CUDA="10.2"
 ARG CUDNN="7"
 
+ARG DEBIAN_FRONTEND=noninteractive
+
 FROM pytorch/pytorch:${PYTORCH}-cuda${CUDA}-cudnn${CUDNN}-devel
 
 # To fix GPG key error when running apt-get update

diff --git a/.circleci/test.yml b/.circleci/test.yml
@@ -54,9 +54,7 @@ jobs:
             pip install wheel
       - run:
           name: Install PyTorch
-          command: |
-            python -V
-            python -m pip install torch==<< parameters.torch >>+cpu torchvision==<< parameters.torchvision >>+cpu -f https://download.pytorch.org/whl/torch_stable.html
+          command: 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 >>]
@@ -65,38 +63,44 @@ jobs:
       - run:
           name: Install mmdet3d dependencies
           command: |
-            python -m pip install git+ssh://[email protected]/open-mmlab/mmengine.git@main
+            pip install git+ssh://[email protected]/open-mmlab/mmengine.git@main
             pip install -U openmim
             mim install 'mmcv >= 2.0.0rc4'
-            mim install 'mmdet >= 3.0.0'
-            pip install -r requirements.txt
+            pip install git+ssh://[email protected]/open-mmlab/[email protected]
+            pip install -r requirements/tests.txt
       - run:
           name: Build and install
           command: |
             pip install -e .
       - run:
           name: Run unittests
           command: |
-            python -m coverage run --branch --source mmdet3d -m pytest tests/
-            python -m coverage xml
-            python -m coverage report -m
+            coverage run --branch --source mmdet3d -m pytest tests/
+            coverage xml
+            coverage report -m
 
   build_cuda:
     parameters:
       torch:
         type: string
       cuda:
         type: enum
-        enum: ["10.1", "10.2", "11.1"]
+        enum: ["11.1", "11.7"]
       cudnn:
         type: integer
-        default: 7
+        default: 8
     machine:
-      image: ubuntu-2004-cuda-11.4:202110-01
+      image: linux-cuda-11:default
       # docker_layer_caching: true
-    resource_class: gpu.nvidia.small
+    resource_class: gpu.nvidia.small.multi
     steps:
       - checkout
+      - run:
+          name: Install nvidia-container-toolkit and Restart Docker
+          command: |
+            sudo apt-get update
+            sudo apt-get install -y nvidia-container-toolkit
+            sudo systemctl restart docker
       - run:
           # Cloning repos in VM since Docker doesn't have access to the private key
           name: Clone Repos
@@ -116,15 +120,15 @@ jobs:
             docker exec mmdet3d pip install -U openmim
             docker exec mmdet3d mim install 'mmcv >= 2.0.0rc4'
             docker exec mmdet3d pip install -e /mmdetection
-            docker exec mmdet3d pip install -r requirements.txt
+            docker exec mmdet3d pip install -r requirements/tests.txt
       - run:
           name: Build and install
           command: |
             docker exec mmdet3d pip install -e .
       - run:
           name: Run unittests
           command: |
-            docker exec mmdet3d python -m pytest tests/
+            docker exec mmdet3d pytest tests/
 
 workflows:
   pr_stage_lint:
@@ -148,15 +152,15 @@ workflows:
                 - dev-1.x
       - build_cpu:
           name: minimum_version_cpu
-          torch: 1.6.0
-          torchvision: 0.7.0
+          torch: 1.8.1
+          torchvision: 0.9.1
           python: 3.7.4 # The lowest python 3.7.x version available on CircleCI images
           requires:
             - lint
       - build_cpu:
           name: maximum_version_cpu
-          torch: 1.13.0
-          torchvision: 0.14.0
+          torch: 2.0.0
+          torchvision: 0.15.1
           python: 3.9.0
           requires:
             - minimum_version_cpu
@@ -169,7 +173,14 @@ workflows:
           torch: 1.8.1
           # Use double quotation mark to explicitly specify its type
           # as string instead of number
-          cuda: "10.2"
+          cuda: "11.1"
+          requires:
+            - hold
+      - build_cuda:
+          name: maximum_version_gpu
+          torch: 2.0.0
+          cuda: "11.7"
+          cudnn: 8
           requires:
             - hold
   merge_stage_test:
@@ -178,8 +189,8 @@ workflows:
     jobs:
       - build_cuda:
           name: minimum_version_gpu
-          torch: 1.6.0
-          cuda: "10.1"
+          torch: 1.8.1
+          cuda: "11.1"
           filters:
             branches:
               only:

diff --git a/.github/workflows/merge_stage_test.yml b/.github/workflows/merge_stage_test.yml
@@ -21,7 +21,7 @@ jobs:
     runs-on: ubuntu-22.04
     strategy:
       matrix:
-        python-version: [3.7, 3.8, 3.9]
+        python-version: [3.8, 3.9]
         torch: [1.8.1]
         include:
           - torch: 1.8.1
@@ -43,7 +43,7 @@ jobs:
           pip install -U openmim
           mim install 'mmcv >= 2.0.0rc4'
       - name: Install MMDet
-        run: mim install 'mmdet>=3.0.0'
+        run: pip install git+https://github.com/open-mmlab/[email protected]
       - name: Install other dependencies
         run: pip install -r requirements/tests.txt
       - name: Build and install
@@ -59,12 +59,8 @@ jobs:
     strategy:
       matrix:
         python-version: [3.7]
-        torch: [1.6.0, 1.7.1, 1.8.1, 1.9.1, 1.10.1, 1.11.0, 1.12.1, 1.13.0]
+        torch: [1.8.1, 1.9.1, 1.10.1, 1.11.0, 1.12.0, 1.13.0]
         include:
-          - torch: 1.6.0
-            torchvision: 0.7.0
-          - torch: 1.7.1
-            torchvision: 0.8.2
           - torch: 1.8.1
             torchvision: 0.9.1
           - torch: 1.9.1
@@ -73,13 +69,13 @@ jobs:
             torchvision: 0.11.2
           - torch: 1.11.0
             torchvision: 0.12.0
-          - torch: 1.12.1
-            torchvision: 0.13.1
+          - torch: 1.12.0
+            torchvision: 0.13.0
           - torch: 1.13.0
             torchvision: 0.14.0
-          - torch: 2.0.0
+          - python-version: 3.8
+            torch: 2.0.0
             torchvision: 0.15.1
-            python-version: 3.8
     steps:
       - uses: actions/checkout@v3
       - name: Set up Python ${{ matrix.python-version }}
@@ -97,7 +93,7 @@ jobs:
           pip install -U openmim
           mim install 'mmcv >= 2.0.0rc4'
       - name: Install MMDet
-        run: mim install 'mmdet>=3.0.0'
+        run: pip install git+https://github.com/open-mmlab/[email protected]
       - name: Install other dependencies
         run: pip install -r requirements/tests.txt
       - name: Build and install
@@ -147,7 +143,7 @@ jobs:
           pip install git+https://github.com/open-mmlab/mmengine.git@main
           pip install -U openmim
           mim install 'mmcv >= 2.0.0rc4'
-          mim install 'mmdet>=3.0.0'
+          pip install git+https://github.com/open-mmlab/[email protected]
           pip install -r requirements/tests.txt
       - name: Build and install
         run: pip install -e .
@@ -183,7 +179,43 @@ jobs:
           pip install git+https://github.com/open-mmlab/mmengine.git@main
           pip install -U openmim
           mim install 'mmcv >= 2.0.0rc4'
-          mim install 'mmdet>=3.0.0'
+          pip install git+https://github.com/open-mmlab/[email protected]
+          pip install -r requirements/tests.txt
+      - name: Build and install
+        run: pip install -e .
+      - name: Run unittests and generate coverage report
+        run: |
+          coverage run --branch --source mmcv -m pytest tests
+          coverage xml
+          coverage report -m
+
+  build_cu117:
+    runs-on: ubuntu-22.04
+    container:
+      image: pytorch/pytorch:2.0.0-cuda11.7-cudnn8-devel
+    strategy:
+      matrix:
+        python-version: [3.9]
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Upgrade pip
+        run: pip install pip --upgrade && pip install wheel
+      - name: Fetch GPG keys
+        run: |
+          apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/cuda/repos/ubuntu1804/x86_64/3bf863cc.pub
+          apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/machine-learning/repos/ubuntu1804/x86_64/7fa2af80.pub
+      - name: Install system dependencies
+        run: apt-get update && apt-get install -y git ffmpeg libturbojpeg
+      - name: Install mmdet3d dependencies
+        run: |
+          pip install git+https://github.com/open-mmlab/mmengine.git@main
+          pip install -U openmim
+          mim install 'mmcv >= 2.0.0rc4'
+          pip install git+https://github.com/open-mmlab/[email protected]
           pip install -r requirements/tests.txt
       - name: Build and install
         run: pip install -e .
@@ -201,12 +233,17 @@ jobs:
         platform: [cpu, cu111]
         torch: [1.8.1]
         torchvision: [0.9.1]
+        include:
+          - python-version: 3.8
+            platform: cu117
+            torch: 2.0.0
+            torchvision: 0.15.1
     steps:
       - uses: actions/checkout@v3
-      - name: Set up Python ${{ matrix.python }}
+      - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v4
         with:
-          python-version: ${{ matrix.python }}
+          python-version: ${{ matrix.python-version }}
       - name: Upgrade pip
         run: python -m pip install pip --upgrade && pip install wheel
       - name: Install lmdb
@@ -218,7 +255,7 @@ jobs:
           pip install git+https://github.com/open-mmlab/mmengine.git@main
           pip install -U openmim
           mim install 'mmcv >= 2.0.0rc4'
-          mim install 'mmdet>=3.0.0'
+          pip install git+https://github.com/open-mmlab/[email protected]
           pip install -r requirements/tests.txt
       - name: Build and install
         run: pip install -e .

diff --git a/.github/workflows/pr_stage_test.yml b/.github/workflows/pr_stage_test.yml
@@ -40,7 +40,7 @@ jobs:
           pip install -U openmim
           mim install 'mmcv >= 2.0.0rc4'
       - name: Install MMDet
-        run: mim install 'mmdet>=3.0.0'
+        run: pip install git+https://github.com/open-mmlab/[email protected]
       - name: Install other dependencies
         run: pip install -r requirements/tests.txt
       - name: Build and install
@@ -86,7 +86,43 @@ jobs:
           pip install git+https://github.com/open-mmlab/mmengine.git@main
           pip install -U openmim
           mim install 'mmcv >= 2.0.0rc4'
-          mim install 'mmdet>=3.0.0'
+          pip install git+https://github.com/open-mmlab/[email protected]
+          pip install -r requirements/tests.txt
+      - name: Build and install
+        run: pip install -e .
+      - name: Run unittests and generate coverage report
+        run: |
+          coverage run --branch --source mmdet3d -m pytest tests/
+          coverage xml
+          coverage report -m
+
+  build_cu117:
+    runs-on: ubuntu-22.04
+    container:
+      image: pytorch/pytorch:2.0.0-cuda11.7-cudnn8-devel
+    strategy:
+      matrix:
+        python-version: [3.9]
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Upgrade pip
+        run: pip install pip --upgrade && pip install wheel
+      - name: Fetch GPG keys
+        run: |
+          apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/cuda/repos/ubuntu1804/x86_64/3bf863cc.pub
+          apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/machine-learning/repos/ubuntu1804/x86_64/7fa2af80.pub
+      - name: Install system dependencies
+        run: apt-get update && apt-get install -y ffmpeg libsm6 libxext6 git ninja-build libglib2.0-0 libsm6 libxrender-dev libxext6
+      - name: Install mmdet3d dependencies
+        run: |
+          pip install git+https://github.com/open-mmlab/mmengine.git@main
+          pip install -U openmim
+          mim install 'mmcv >= 2.0.0rc4'
+          pip install git+https://github.com/open-mmlab/[email protected]
           pip install -r requirements/tests.txt
       - name: Build and install
         run: pip install -e .
@@ -104,6 +140,11 @@ jobs:
         platform: [cpu, cu111]
         torch: [1.8.1]
         torchvision: [0.9.1]
+        include:
+          - python-version: 3.8
+            platform: cu117
+            torch: 2.0.0
+            torchvision: 0.15.1
     steps:
       - uses: actions/checkout@v3
       - name: Set up Python ${{ matrix.python-version }}
@@ -121,7 +162,7 @@ jobs:
           pip install git+https://github.com/open-mmlab/mmengine.git@main
           pip install -U openmim
           mim install 'mmcv >= 2.0.0rc4'
-          mim install 'mmdet>=3.0.0'
+          pip install git+https://github.com/open-mmlab/[email protected]
           pip install -r requirements/tests.txt
       - name: Build and install
         run: pip install -e .

diff --git a/.github/workflows/test_mim.yml b/.github/workflows/test_mim.yml
@@ -21,11 +21,11 @@ jobs:
     strategy:
       matrix:
         python-version: [3.7]
-        torch: [1.8.0]
+        torch: [1.8.1]
         include:
-          - torch: 1.8.0
+          - torch: 1.8.1
             torch_version: torch1.8
-            torchvision: 0.9.0
+            torchvision: 0.9.1
     steps:
       - uses: actions/checkout@v3
       - name: Set up Python ${{ matrix.python-version }}

diff --git a/.readthedocs.yml b/.readthedocs.yml
@@ -1,10 +1,14 @@
 version: 2
 
+build:
+  os: ubuntu-22.04
+  tools:
+    python: "3.8"
+
 formats:
   - epub
 
 python:
-  version: 3.7
   install:
     - requirements: requirements/docs.txt
     - requirements: requirements/readthedocs.txt