[Fix] Fix registry import error of mmdet (#732)

* fix registry from mmdet

* update

* fix ut
1.x
Yixiao Fang 2023-04-03 16:26:03 +08:00 committed by GitHub
parent 25dab7c684
commit 0b164130fb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 12 deletions

View File

@ -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'

View File

@ -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'

View File

@ -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'

View File

@ -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``."""

View File

@ -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(