Skip to content

Commit

Permalink
[Enhance] Update mmdet, mmcv, and mmdet version in MMDetection (#8417)
Browse files Browse the repository at this point in the history
* Update dev-3.x circleci (#8396)

* update circleci

* update test config

* tmp delete github action

* update

* tmp reduce the coverage requirement

* update branch

* update branch

* [Fix] Fix metafile 3.x (#8404)

* update reppoints readme and metafile

* update openimages metafile

* update faster rcnn readme and metafile

* update convnext readme and metafile

* update guided_anchoring metafile

* update groie metafile and readme

* update reppoints readme and metafile

* update metafile

* update metafile

* release ld and mask_rcnn models

* update metafile

* update regnet metafile

* fix markdown format

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* update md format

* release lad

* rename

* rename

* update solov2 metafile

* update cascase rcnn metafile

* [Doc]: fix markdown version (#8408)

* [Enhance] Update mmdet, mmcv, and mmdet version in MMDetection

* Fix anchor_free load_from_state_dict

Co-authored-by: RangiLyu <lyuchqi@gmail.com>
Co-authored-by: Cedric Luo <luochunhua1996@outlook.com>
Co-authored-by: Wenwei Zhang <40779233+ZwwWayne@users.noreply.github.com>
  • Loading branch information
4 people committed Aug 1, 2022
1 parent ddb21d0 commit 4220022
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 19 deletions.
28 changes: 13 additions & 15 deletions mmdet/__init__.py
Original file line number Diff line number Diff line change
@@ -1,29 +1,27 @@
# Copyright (c) OpenMMLab. All rights reserved.
import mmcv
import mmengine
from mmengine.utils import digit_version

from .version import __version__, short_version


def digit_version(version_str):
digit_version = []
for x in version_str.split('.'):
if x.isdigit():
digit_version.append(int(x))
elif x.find('rc') != -1:
patch_version = x.split('rc')
digit_version.append(int(patch_version[0]) - 1)
digit_version.append(int(patch_version[1]))
return digit_version

from .version import __version__, version_info

mmcv_minimum_version = '2.0.0rc0'
mmcv_maximum_version = '2.0.0'
mmcv_version = digit_version(mmcv.__version__)

mmengine_minimum_version = '0.0.0'
mmengine_maximum_version = '0.2.0'
mmengine_version = digit_version(mmengine.__version__)

assert (mmcv_version >= digit_version(mmcv_minimum_version)
and mmcv_version <= digit_version(mmcv_maximum_version)), \
f'MMCV=={mmcv.__version__} is used but incompatible. ' \
f'Please install mmcv>={mmcv_minimum_version}, <={mmcv_maximum_version}.'

__all__ = ['__version__', 'short_version']
assert (mmengine_version >= digit_version(mmengine_minimum_version)
and mmengine_version <= digit_version(mmengine_maximum_version)), \
f'MMEngine=={mmengine.__version__} is used but incompatible. ' \
f'Please install mmengine>={mmengine_minimum_version}, ' \
f'<={mmengine_maximum_version}.'

__all__ = ['__version__', 'version_info', 'digit_version']
7 changes: 4 additions & 3 deletions mmdet/models/dense_heads/anchor_free_head.py
Original file line number Diff line number Diff line change
Expand Up @@ -184,15 +184,16 @@ def _load_from_state_dict(self, state_dict: dict, prefix: str,
for key in bbox_head_keys:
ori_predictor_keys.append(key)
key = key.split('.')
conv_name = None
if key[1].endswith('cls'):
if len(key) < 2:
conv_name = None
elif key[1].endswith('cls'):
conv_name = 'conv_cls'
elif key[1].endswith('reg'):
conv_name = 'conv_reg'
elif key[1].endswith('centerness'):
conv_name = 'conv_centerness'
else:
assert NotImplementedError
conv_name = None
if conv_name is not None:
key[1] = conv_name
new_predictor_keys.append('.'.join(key))
Expand Down
10 changes: 9 additions & 1 deletion mmdet/version.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,18 @@
# Copyright (c) OpenMMLab. All rights reserved.

__version__ = '2.25.0'
__version__ = '3.0.0rc0'
short_version = __version__


def parse_version_info(version_str):
"""Parse a version string into a tuple.
Args:
version_str (str): The version string.
Returns:
tuple[int | str]: The version info, e.g., "1.3.0" is parsed into
(1, 3, 0), and "2.0.0rc1" is parsed into (2, 0, 0, 'rc1').
"""
version_info = []
for x in version_str.split('.'):
if x.isdigit():
Expand Down

0 comments on commit 4220022

Please sign in to comment.