From 0b164130fb89c8aac7e448db5ea0a9a7fce53447 Mon Sep 17 00:00:00 2001
From: Yixiao Fang <36138628+fangyixiao18@users.noreply.github.com>
Date: Mon, 3 Apr 2023 16:26:03 +0800
Subject: [PATCH] [Fix] Fix registry import error of mmdet (#732)

* fix registry from mmdet

* update

* fix ut
---
 .circleci/test.yml                             | 2 +-
 .github/workflows/merge_stage_test.yml         | 3 +--
 .github/workflows/pr_stage_test.yml            | 7 +++----
 mmselfsup/models/utils/res_layer_extra_norm.py | 4 ++--
 mmselfsup/registry.py                          | 4 +---
 5 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/.circleci/test.yml b/.circleci/test.yml
index 570e9bc6..53aac69d 100644
--- a/.circleci/test.yml
+++ b/.circleci/test.yml
@@ -59,8 +59,8 @@ jobs:
       - run:
           name: Install MMSelfSup dependencies
           command: |
-            pip install git+https://github.com/open-mmlab/mmengine.git@main
             pip install -U openmim
+            mim install mmengine
             mim install 'mmcv>=2.0.0rc1'
             mim install 'mmdet>=3.0.0rc0'
             mim install 'mmsegmentation>=1.0.0rc0'
diff --git a/.github/workflows/merge_stage_test.yml b/.github/workflows/merge_stage_test.yml
index 397f4637..039e87d1 100644
--- a/.github/workflows/merge_stage_test.yml
+++ b/.github/workflows/merge_stage_test.yml
@@ -37,11 +37,10 @@ jobs:
         run: pip install pip --upgrade
       - name: Install PyTorch
         run: pip install torch==${{matrix.torch}}+cpu torchvision==${{matrix.torchvision}}+cpu -f https://download.pytorch.org/whl/torch_stable.html
-      - name: Install MMEngine
-        run: pip install git+https://github.com/open-mmlab/mmengine.git@main
       - name: Install MMSelfSup dependencies
         run: |
           pip install -U openmim
+          mim install mmengine
           mim install 'mmcv>=2.0.0rc1'
           mim install 'mmdet>=3.0.0rc0'
           mim install 'mmsegmentation>=1.0.0rc0'
diff --git a/.github/workflows/pr_stage_test.yml b/.github/workflows/pr_stage_test.yml
index 23f08f51..922bbcc5 100644
--- a/.github/workflows/pr_stage_test.yml
+++ b/.github/workflows/pr_stage_test.yml
@@ -34,11 +34,10 @@ jobs:
         run: pip install pip --upgrade
       - name: Install PyTorch
         run: pip install torch==${{matrix.torch}}+cpu torchvision==${{matrix.torchvision}}+cpu -f https://download.pytorch.org/whl/torch_stable.html
-      - name: Install MMEngine
-        run: pip install git+https://github.com/open-mmlab/mmengine.git@main
       - name: Install MMSelfSup dependencies
         run: |
           pip install -U openmim
+          mim install mmengine
           mim install 'mmcv>=2.0.0rc1'
           mim install 'mmdet>=3.0.0rc0'
           mim install 'mmsegmentation>=1.0.0rc0'
@@ -88,8 +87,8 @@ jobs:
           apt-get install -y ffmpeg libsm6 libxext6 git ninja-build libglib2.0-0 libxrender-dev
       - name: Install MMSelfSup dependencies
         run: |
-          pip install git+https://github.com/open-mmlab/mmengine.git@main
           pip install -U openmim
+          mim install mmengine
           mim install 'mmcv>=2.0.0rc1'
           mim install 'mmdet>=3.0.0rc0'
           mim install 'mmsegmentation>=1.0.0rc0'
@@ -172,8 +171,8 @@ jobs:
         run: pip install torch==1.8.1+${{matrix.platform}} torchvision==0.9.1+${{matrix.platform}} -f https://download.pytorch.org/whl/lts/1.8/torch_lts.html
       - name: Install MMSelfSup dependencies
         run: |
-          pip install git+https://github.com/open-mmlab/mmengine.git@main
           pip install -U openmim
+          mim install mmengine
           mim install 'mmcv>=2.0.0rc1'
           mim install 'mmdet>=3.0.0rc0'
           mim install 'mmsegmentation>=1.0.0rc0'
diff --git a/mmselfsup/models/utils/res_layer_extra_norm.py b/mmselfsup/models/utils/res_layer_extra_norm.py
index 2f553394..e67cac13 100644
--- a/mmselfsup/models/utils/res_layer_extra_norm.py
+++ b/mmselfsup/models/utils/res_layer_extra_norm.py
@@ -3,10 +3,10 @@ from mmcv.cnn import build_norm_layer
 
 try:
     from mmdet.models.backbones import ResNet
-    from mmdet.models.builder import SHARED_HEADS
     from mmdet.models.roi_heads.shared_heads.res_layer import ResLayer
+    from mmdet.registry import MODELS
 
-    @SHARED_HEADS.register_module()
+    @MODELS.register_module()
     class ResLayerExtraNorm(ResLayer):
         """Add extra norm to original ``ResLayer``."""
 
diff --git a/mmselfsup/registry.py b/mmselfsup/registry.py
index cf72c0ad..5b2b50b7 100644
--- a/mmselfsup/registry.py
+++ b/mmselfsup/registry.py
@@ -113,9 +113,7 @@ OPTIM_WRAPPER_CONSTRUCTORS = Registry(
     locations=['mmselfsup.engine.optimizers'])
 # manage all kinds of parameter schedulers like `MultiStepLR`
 PARAM_SCHEDULERS = Registry(
-    'parameter scheduler',
-    parent=MMENGINE_PARAM_SCHEDULERS,
-    locations=['mmselfsup.engine.schedulers'])
+    'parameter scheduler', parent=MMENGINE_PARAM_SCHEDULERS)
 
 # manage all kinds of metrics
 METRICS = Registry(