Merge branch 'dev-1.x' of github.com:open-mmlab/mmsegmentation into main

open-mmlab · Apr 6, 2023 · b600f7c · b600f7c
2 parents 0601f28 + 892f9e1
commit b600f7c
Show file tree

Hide file tree

Showing 23 changed files with 305 additions and 298 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -26,7 +26,7 @@ workflows:
             tools/.* lint_only false
             configs/.* lint_only false
             .circleci/.* 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
@@ -62,8 +62,8 @@ jobs:
             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/mmclassification@dev-1.x
-            pip install git+https://github.com/open-mmlab/mmdetection.git@dev-3.x
+            pip install mmcls==1.0.0rc6
+            pip install git+https://github.com/open-mmlab/mmdetection.git@main
             pip install -r requirements/tests.txt -r requirements/optional.txt
       - run:
           name: Build and install
@@ -96,7 +96,6 @@ jobs:
           name: Clone Repos
           command: |
             git clone -b main --depth 1 https://github.com/open-mmlab/mmengine.git /home/circleci/mmengine
-            git clone -b dev-1.x --depth 1 https://github.com/open-mmlab/mmclassification.git /home/circleci/mmclassification
             git clone -b dev-3.x --depth 1 https://github.com/open-mmlab/mmdetection.git /home/circleci/mmdetection
       - run:
           name: Build Docker image
@@ -109,7 +108,7 @@ jobs:
             docker exec mmseg pip install -e /mmengine
             docker exec mmseg pip install -U openmim
             docker exec mmseg mim install 'mmcv>=2.0.0rc4'
-            docker exec mmseg pip install -e /mmclassification
+            docker exec mmseg pip install mmcls==1.0.0rc6
             docker exec mmseg pip install -e /mmdetection
             docker exec mmseg pip install -r requirements/tests.txt -r requirements/optional.txt
       - run:
@@ -130,8 +129,7 @@ workflows:
             branches:
               ignore:
                 - dev-1.x
-                - 1.x
-                - master
+                - main
   pr_stage_test:
     when:
       not:
@@ -143,8 +141,7 @@ workflows:
             branches:
               ignore:
                 - dev-1.x
-                - 1.x
-                - master
+                - main
       - build_cpu:
           name: minimum_version_cpu
           torch: 1.6.0
@@ -187,4 +184,4 @@ workflows:
             branches:
               only:
                 - dev-1.x
-                - 1.x
+                - main
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -8,12 +8,12 @@ concurrency:
 
 jobs:
   build-n-publish:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     if: startsWith(github.event.ref, 'refs/tags')
     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: Build MMSegmentation

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -8,11 +8,11 @@ concurrency:
 
 jobs:
   lint:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.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

diff --git a/.github/workflows/merge_stage_test.yml b/.github/workflows/merge_stage_test.yml
@@ -19,7 +19,7 @@ concurrency:
 
 jobs:
   build_cpu_py:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
     strategy:
       matrix:
         python-version: [3.8, 3.9]
@@ -28,9 +28,9 @@ jobs:
           - torch: 1.8.1
             torchvision: 0.9.1
     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: Upgrade pip
@@ -45,8 +45,8 @@ jobs:
           pip install -U openmim
           pip install git+https://github.com/open-mmlab/mmengine.git
           mim install 'mmcv>=2.0.0rc4'
-          pip install git+https://github.com/open-mmlab/mmclassification.git@dev-1.x
-          pip install git+https://github.com/open-mmlab/mmdetection.git@dev-3.x
+          pip install mmcls==1.0.0rc6
+          pip install git+https://github.com/open-mmlab/mmdetection.git@main
       - name: Install unittest dependencies
         run: pip install -r requirements/tests.txt -r requirements/optional.txt
       - name: Build and install
@@ -58,7 +58,7 @@ jobs:
           coverage xml
           coverage report -m
   build_cpu_pt:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
     strategy:
       matrix:
         python-version: [3.7]
@@ -82,9 +82,9 @@ jobs:
           # - torch: 1.13.0
           #   torchvision: 0.14.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: Upgrade pip
@@ -101,8 +101,8 @@ jobs:
           pip install -U openmim
           pip install git+https://github.com/open-mmlab/mmengine.git
           mim install 'mmcv>=2.0.0rc4'
-          pip install git+https://github.com/open-mmlab/mmclassification.git@dev-1.x
-          pip install git+https://github.com/open-mmlab/mmdetection.git@dev-3.x
+          pip install mmcls==1.0.0rc6
+          pip install git+https://github.com/open-mmlab/mmdetection.git@main
       - name: Install unittest dependencies
         run: pip install -r requirements/tests.txt -r requirements/optional.txt
       - name: Build and install
@@ -131,93 +131,6 @@ jobs:
           env_vars: OS,PYTHON
           name: codecov-umbrella
           fail_ci_if_error: false
-
-  build_cu102:
-    runs-on: ubuntu-18.04
-    container:
-      image: pytorch/pytorch:1.8.1-cuda10.2-cudnn7-devel
-    strategy:
-      matrix:
-        python-version: [3.7]
-        include:
-          - torch: 1.8.1
-            cuda: 10.2
-    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
-          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 Python-dev
-        run: apt-get update && apt-get install -y python${{matrix.python-version}}-dev
-      - 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 mmseg dependencies
-        run: |
-          python -V
-          pip install -U openmim
-          pip install git+https://github.com/open-mmlab/mmengine.git
-          mim install 'mmcv>=2.0.0rc4'
-          pip install git+https://github.com/open-mmlab/mmclassification.git@dev-1.x
-          pip install git+https://github.com/open-mmlab/mmdetection.git@dev-3.x
-      - name: Install unittest dependencies
-        run: pip install -r requirements/tests.txt -r requirements/optional.txt
-      - name: Build and install
-        run: |
-          python setup.py check -m -s
-          TORCH_CUDA_ARCH_LIST=7.0 pip install -e .
-  build_cu116:
-    runs-on: ubuntu-18.04
-    container:
-      image: pytorch/pytorch:1.13.0-cuda11.6-cudnn8-devel
-    strategy:
-      matrix:
-        python-version: [3.7]
-        include:
-          - torch: 1.13.0
-            cuda: 11.6
-    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
-          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 Python-dev
-        run: apt-get update && apt-get install -y python${{matrix.python-version}}-dev
-      - 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 mmseg dependencies
-        run: |
-          python -V
-          pip install -U openmim
-          pip install git+https://github.com/open-mmlab/mmengine.git
-          mim install 'mmcv>=2.0.0rc4'
-          pip install git+https://github.com/open-mmlab/mmclassification.git@dev-1.x
-          pip install git+https://github.com/open-mmlab/mmdetection.git@dev-3.x
-      - name: Install unittest dependencies
-        run: pip install -r requirements/tests.txt -r requirements/optional.txt
-      - name: Build and install
-        run: |
-          python setup.py check -m -s
-          TORCH_CUDA_ARCH_LIST=7.0 pip install -e .
   build_windows:
     runs-on: ${{ matrix.os }}
     strategy:
@@ -226,9 +139,9 @@ jobs:
         python: [3.7]
         platform: [cpu, cu111]
     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: Upgrade pip
@@ -245,8 +158,8 @@ jobs:
           pip install -U openmim
           pip install git+https://github.com/open-mmlab/mmengine.git
           mim install 'mmcv>=2.0.0rc4'
-          pip install git+https://github.com/open-mmlab/mmclassification.git@dev-1.x
-          pip install git+https://github.com/open-mmlab/mmdetection.git@dev-3.x
+          pip install mmcls==1.0.0rc6
+          pip install git+https://github.com/open-mmlab/mmdetection.git@main
       - name: Install unittest dependencies
         run: pip install -r requirements/tests.txt -r requirements/optional.txt
       - name: Build and install

diff --git a/.github/workflows/pr_stage_test.yml b/.github/workflows/pr_stage_test.yml
@@ -17,17 +17,17 @@ concurrency:
 
 jobs:
   build_cpu:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
     strategy:
       matrix:
         python-version: [3.7]
         include:
           - torch: 1.8.1
             torchvision: 0.9.1
     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: Upgrade pip
@@ -45,8 +45,8 @@ jobs:
           pip install -U openmim
           pip install git+https://github.com/open-mmlab/mmengine.git
           mim install 'mmcv>=2.0.0rc4'
-          pip install git+https://github.com/open-mmlab/mmclassification.git@dev-1.x
-          pip install git+https://github.com/open-mmlab/mmdetection.git@dev-3.x
+          pip install mmcls==1.0.0rc6
+          pip install git+https://github.com/open-mmlab/mmdetection.git@main
       - name: Install unittest dependencies
         run: pip install -r requirements/tests.txt -r requirements/optional.txt
       - name: Build and install
@@ -66,49 +66,6 @@ jobs:
           env_vars: OS,PYTHON
           name: codecov-umbrella
           fail_ci_if_error: false
-
-  build_cu102:
-    runs-on: ubuntu-18.04
-    container:
-      image: pytorch/pytorch:1.8.1-cuda10.2-cudnn7-devel
-    strategy:
-      matrix:
-        python-version: [3.7]
-    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
-          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 Python-dev
-        run: apt-get update && apt-get install -y python${{matrix.python-version}}-dev
-        if: ${{matrix.python-version != 3.9}}
-      - name: Install system dependencies
-        run: |
-          apt-get update
-          apt-get install -y ffmpeg libsm6 libxext6 git ninja-build libglib2.0-0 libxrender-dev
-      - name: Install mmseg dependencies
-        run: |
-          python -V
-          pip install -U openmim
-          pip install git+https://github.com/open-mmlab/mmengine.git
-          mim install 'mmcv>=2.0.0rc4'
-          pip install git+https://github.com/open-mmlab/mmclassification.git@dev-1.x
-          pip install git+https://github.com/open-mmlab/mmdetection.git@dev-3.x
-      - name: Install unittest dependencies
-        run: pip install -r requirements/tests.txt -r requirements/optional.txt
-      - name: Build and install
-        run: |
-          python setup.py check -m -s
-          TORCH_CUDA_ARCH_LIST=7.0 pip install -e .
   build_windows:
     runs-on: ${{ matrix.os }}
     strategy:
@@ -117,9 +74,9 @@ jobs:
         python: [3.7]
         platform: [cpu, cu111]
     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: Upgrade pip
@@ -136,8 +93,8 @@ jobs:
           pip install -U openmim
           pip install git+https://github.com/open-mmlab/mmengine.git
           mim install 'mmcv>=2.0.0rc4'
-          pip install git+https://github.com/open-mmlab/mmclassification.git@dev-1.x
-          pip install git+https://github.com/open-mmlab/mmdetection.git@dev-3.x
+          pip install mmcls==1.0.0rc6
+          pip install git+https://github.com/open-mmlab/mmdetection.git@main
       - name: Install unittest dependencies
         run: pip install -r requirements/tests.txt -r requirements/optional.txt
       - name: Build and install