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

.circleci/test.yml

@@ -61,9 +61,9 @@ jobs:
           command: |
             pip install git+https://github.com/open-mmlab/mmengine.git@main
             pip install -U openmim
-            mim install 'mmcv>=2.0.0rc3'
+            mim install 'mmcv==2.0.0rc3'
             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
+            mim install 'mmdet==3.0.0rc5'
             pip install -r requirements/tests.txt -r requirements/optional.txt
       - run:
           name: Build and install
@@ -97,7 +97,6 @@ jobs:
           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
           command: |
@@ -108,9 +107,9 @@ jobs:
           command: |
             docker exec mmseg pip install -e /mmengine
             docker exec mmseg pip install -U openmim
-            docker exec mmseg mim install 'mmcv>=2.0.0rc3'
+            docker exec mmseg mim install 'mmcv==2.0.0rc3'
             docker exec mmseg pip install -e /mmclassification
-            docker exec mmseg pip install -e /mmdetection
+            docker exec mmseg mim install 'mmdet==3.0.0rc5'
             docker exec mmseg pip install -r requirements/tests.txt -r requirements/optional.txt
       - run:
           name: Build and install
@@ -149,13 +148,14 @@ workflows:
           name: minimum_version_cpu
           torch: 1.6.0
           torchvision: 0.7.0
-          python: 3.6.9  # The lowest python 3.6.x version available on CircleCI images
+          python: "3.7"
           requires:
             - lint
       - build_cpu:
           name: maximum_version_cpu
-          torch: 1.13.0
-          torchvision: 0.14.0
+          # TODO: Fix torch 1.13 forward crush
+          torch: 1.12.0
+          torchvision: 0.13.0
           python: 3.9.0
           requires:
             - minimum_version_cpu
@@ -187,4 +187,3 @@ workflows:
               only:
                 - dev-1.x
                 - 1.x
-                - master

.github/workflows/merge_stage_test.yml

@@ -22,7 +22,7 @@ jobs:
     runs-on: ubuntu-18.04
     strategy:
       matrix:
-        python-version: [3.6, 3.8, 3.9]
+        python-version: [3.8, 3.9]
         torch: [1.8.1]
         include:
           - torch: 1.8.1
@@ -44,9 +44,9 @@ jobs:
           python -V
           pip install -U openmim
           pip install git+https://github.com/open-mmlab/mmengine.git
-          mim install 'mmcv>=2.0.0rc3'
+          mim install 'mmcv==2.0.0rc3'
           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
+          mim install 'mmdet==3.0.0rc5'
       - name: Install unittest dependencies
         run: pip install -r requirements/tests.txt -r requirements/optional.txt
       - name: Build and install
@@ -100,9 +100,9 @@ jobs:
           python -V
           pip install -U openmim
           pip install git+https://github.com/open-mmlab/mmengine.git
-          mim install 'mmcv>=2.0.0rc3'
+          mim install 'mmcv==2.0.0rc3'
           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
+          mim install 'mmdet==3.0.0rc5'
       - name: Install unittest dependencies
         run: pip install -r requirements/tests.txt -r requirements/optional.txt
       - name: Build and install
@@ -166,9 +166,9 @@ jobs:
           python -V
           pip install -U openmim
           pip install git+https://github.com/open-mmlab/mmengine.git
-          mim install 'mmcv>=2.0.0rc3'
+          mim install 'mmcv==2.0.0rc3'
           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
+          mim install 'mmdet==3.0.0rc5'
       - name: Install unittest dependencies
         run: pip install -r requirements/tests.txt -r requirements/optional.txt
       - name: Build and install
@@ -209,9 +209,9 @@ jobs:
           python -V
           pip install -U openmim
           pip install git+https://github.com/open-mmlab/mmengine.git
-          mim install 'mmcv>=2.0.0rc3'
+          mim install 'mmcv==2.0.0rc3'
           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
+          mim install 'mmdet==3.0.0rc5'
       - name: Install unittest dependencies
         run: pip install -r requirements/tests.txt -r requirements/optional.txt
       - name: Build and install
@@ -244,9 +244,9 @@ jobs:
           python -V
           pip install -U openmim
           pip install git+https://github.com/open-mmlab/mmengine.git
-          mim install 'mmcv>=2.0.0rc3'
+          mim install 'mmcv==2.0.0rc3'
           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
+          mim install 'mmdet==3.0.0rc5'
       - name: Install unittest dependencies
         run: pip install -r requirements/tests.txt -r requirements/optional.txt
       - name: Build and install

.github/workflows/pr_stage_test.yml

@@ -44,9 +44,9 @@ jobs:
         run: |
           pip install -U openmim
           pip install git+https://github.com/open-mmlab/mmengine.git
-          mim install 'mmcv>=2.0.0rc3'
+          mim install 'mmcv==2.0.0rc3'
           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
+          mim install 'mmdet==3.0.0rc5'
       - name: Install unittest dependencies
         run: pip install -r requirements/tests.txt -r requirements/optional.txt
       - name: Build and install
@@ -100,9 +100,9 @@ jobs:
           python -V
           pip install -U openmim
           pip install git+https://github.com/open-mmlab/mmengine.git
-          mim install 'mmcv>=2.0.0rc3'
+          mim install 'mmcv==2.0.0rc3'
           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
+          mim install 'mmdet==3.0.0rc5'
       - name: Install unittest dependencies
         run: pip install -r requirements/tests.txt -r requirements/optional.txt
       - name: Build and install
@@ -135,9 +135,9 @@ jobs:
           python -V
           pip install -U openmim
           pip install git+https://github.com/open-mmlab/mmengine.git
-          mim install 'mmcv>=2.0.0rc3'
+          mim install 'mmcv==2.0.0rc3'
           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
+          mim install 'mmdet==3.0.0rc5'
       - name: Install unittest dependencies
         run: pip install -r requirements/tests.txt -r requirements/optional.txt
       - name: Build and install

.pre-commit-config.yaml

@@ -3,8 +3,8 @@ repos:
     rev: 5.0.4
     hooks:
       - id: flake8
-  - repo: https://github.com/PyCQA/isort
-    rev: 5.10.1
+  - repo: https://github.com/zhouzaida/isort
+    rev: 5.12.1
     hooks:
       - id: isort
   - repo: https://github.com/pre-commit/mirrors-yapf

README.md

@@ -62,11 +62,11 @@ The 1.x branch works with **PyTorch 1.6+**.
 
 ## What's New
 
-v1.0.0rc3 was released in 31/12/2022.
+v1.0.0rc4 was released on 30/01/2023.
 Please refer to [changelog.md](docs/en/notes/changelog.md) for details and release history.
 
-- Support test time augmentation ([#2184](https://github.com/open-mmlab/mmsegmentation/pull/2184))
-- Add 'Projects/' folder and the first example project ([#2412](https://github.com/open-mmlab/mmsegmentation/pull/2412))
+- Support ISNet (ICCV'2021) in projects ([#2400](https://github.com/open-mmlab/mmsegmentation/pull/2400))
+- Support HSSN (CVPR'2022) in projects ([#2444](https://github.com/open-mmlab/mmsegmentation/pull/2444))
 
 ## Installation
 

README_zh-CN.md

@@ -61,7 +61,7 @@ MMSegmentation 是一个基于 PyTorch 的语义分割开源工具箱。它是 O
 
 ## 更新日志
 
-最新版本 v1.0.0rc3 在 2022.12.31 发布。
+最新版本 v1.0.0rc4 在 2023.01.30 发布。
 如果想了解更多版本更新细节和历史信息，请阅读[更新日志](docs/en/notes/changelog.md)。
 
 ## 安装

configs/_base_/datasets/synapse.py

@@ -0,0 +1,41 @@
+dataset_type = 'SynapseDataset'
+data_root = 'data/synapse/'
+img_scale = (224, 224)
+train_pipeline = [
+    dict(type='LoadImageFromFile'),
+    dict(type='LoadAnnotations'),
+    dict(type='Resize', scale=img_scale, keep_ratio=True),
+    dict(type='RandomRotFlip', rotate_prob=0.5, flip_prob=0.5, degree=20),
+    dict(type='PackSegInputs')
+]
+test_pipeline = [
+    dict(type='LoadImageFromFile'),
+    dict(type='Resize', scale=img_scale, keep_ratio=True),
+    dict(type='LoadAnnotations'),
+    dict(type='PackSegInputs')
+]
+train_dataloader = dict(
+    batch_size=6,
+    num_workers=2,
+    persistent_workers=True,
+    sampler=dict(type='InfiniteSampler', shuffle=True),
+    dataset=dict(
+        type=dataset_type,
+        data_root=data_root,
+        data_prefix=dict(
+            img_path='img_dir/train', seg_map_path='ann_dir/train'),
+        pipeline=train_pipeline))
+val_dataloader = dict(
+    batch_size=1,
+    num_workers=4,
+    persistent_workers=True,
+    sampler=dict(type='DefaultSampler', shuffle=False),
+    dataset=dict(
+        type=dataset_type,
+        data_root=data_root,
+        data_prefix=dict(img_path='img_dir/val', seg_map_path='ann_dir/val'),
+        pipeline=test_pipeline))
+test_dataloader = val_dataloader
+
+val_evaluator = dict(type='IoUMetric', iou_metrics=['mDice'])
+test_evaluator = val_evaluator

docker/serve/Dockerfile

@@ -4,7 +4,7 @@ ARG CUDNN="8"
 FROM pytorch/pytorch:${PYTORCH}-cuda${CUDA}-cudnn${CUDNN}-devel
 
 ARG MMCV="2.0.0rc3"
-ARG MMSEG="1.0.0rc3"
+ARG MMSEG="1.0.0rc4"
 
 ENV PYTHONUNBUFFERED TRUE