From 119265e9e76db7fbe8d41c6f43854fd8d783ec01 Mon Sep 17 00:00:00 2001 From: Rabin Adhikari Date: Thu, 9 May 2024 12:53:16 +0545 Subject: [PATCH 1/3] Make mmseg to be able to run on mmcv=2.2.0 1. Documentation says it is okay to run with mmcv >= 2.2.0 but mmseg incorrectly asserts. 2. Provide better error messages to pinpoint if the versions are higher or lower --- mmseg/__init__.py | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/mmseg/__init__.py b/mmseg/__init__.py index 5fcb84e8c4..bb90cad9e4 100644 --- a/mmseg/__init__.py +++ b/mmseg/__init__.py @@ -58,17 +58,23 @@ def digit_version(version_str: str, length: int = 4): mmcv_version = digit_version(mmcv.__version__) -assert (mmcv_min_version <= mmcv_version < mmcv_max_version), \ +assert (mmcv_version >= mmcv_min_version), \ f'MMCV=={mmcv.__version__} is used but incompatible. ' \ - f'Please install mmcv>=2.0.0rc4.' + f'Please install mmcv>={MMCV_MIN}.' + +assert (mmcv_version <= mmcv_max_version), \ + f'MMCV=={mmcv.__version__} is used but incompatible. ' \ + f'Please install mmcv<={MMCV_MAX}.' mmengine_min_version = digit_version(MMENGINE_MIN) mmengine_max_version = digit_version(MMENGINE_MAX) mmengine_version = digit_version(mmengine.__version__) -assert (mmengine_min_version <= mmengine_version < mmengine_max_version), \ +assert (mmengine_version >= mmengine_version), \ f'MMEngine=={mmengine.__version__} is used but incompatible. ' \ - f'Please install mmengine>={mmengine_min_version}, '\ - f'<{mmengine_max_version}.' + f'Please install mmengine>={MMENGINE_MIN}.' +assert (mmengine_version <= mmengine_max_version), \ + f'MMEngine=={mmengine.__version__} is used but incompatible. ' \ + f'Please install mmengine<={MMENGINE_MAX}.' __all__ = ['__version__', 'version_info', 'digit_version'] From e2e2b80d72d24262b66ecc537a985b78b9f53432 Mon Sep 17 00:00:00 2001 From: Rabin Adhikari Date: Thu, 9 May 2024 14:50:24 +0545 Subject: [PATCH 2/3] Bump the MMCV_MAX to 2.3.0 and avoid changing the comparision logic to pass the tests --- mmseg/__init__.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/mmseg/__init__.py b/mmseg/__init__.py index bb90cad9e4..d6473a082b 100644 --- a/mmseg/__init__.py +++ b/mmseg/__init__.py @@ -8,7 +8,7 @@ from .version import __version__, version_info MMCV_MIN = '2.0.0rc4' -MMCV_MAX = '2.2.0' +MMCV_MAX = '2.3.0' MMENGINE_MIN = '0.5.0' MMENGINE_MAX = '1.0.0' @@ -62,9 +62,9 @@ def digit_version(version_str: str, length: int = 4): f'MMCV=={mmcv.__version__} is used but incompatible. ' \ f'Please install mmcv>={MMCV_MIN}.' -assert (mmcv_version <= mmcv_max_version), \ +assert (mmcv_version < mmcv_max_version), \ f'MMCV=={mmcv.__version__} is used but incompatible. ' \ - f'Please install mmcv<={MMCV_MAX}.' + f'Please install mmcv<{MMCV_MAX}.' mmengine_min_version = digit_version(MMENGINE_MIN) mmengine_max_version = digit_version(MMENGINE_MAX) @@ -74,7 +74,7 @@ def digit_version(version_str: str, length: int = 4): f'MMEngine=={mmengine.__version__} is used but incompatible. ' \ f'Please install mmengine>={MMENGINE_MIN}.' -assert (mmengine_version <= mmengine_max_version), \ +assert (mmengine_version < mmengine_max_version), \ f'MMEngine=={mmengine.__version__} is used but incompatible. ' \ - f'Please install mmengine<={MMENGINE_MAX}.' + f'Please install mmengine<{MMENGINE_MAX}.' __all__ = ['__version__', 'version_info', 'digit_version'] From ccddc326a3a819581428bf04e9d18b734b211117 Mon Sep 17 00:00:00 2001 From: Rabin Adhikari Date: Sat, 8 Jun 2024 21:24:03 +0545 Subject: [PATCH 3/3] Keep the MMCV_MAX version the same but add equals operator on the assert statement --- mmseg/__init__.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mmseg/__init__.py b/mmseg/__init__.py index d6473a082b..56982cf156 100644 --- a/mmseg/__init__.py +++ b/mmseg/__init__.py @@ -8,7 +8,7 @@ from .version import __version__, version_info MMCV_MIN = '2.0.0rc4' -MMCV_MAX = '2.3.0' +MMCV_MAX = '2.2.0' MMENGINE_MIN = '0.5.0' MMENGINE_MAX = '1.0.0' @@ -62,7 +62,7 @@ def digit_version(version_str: str, length: int = 4): f'MMCV=={mmcv.__version__} is used but incompatible. ' \ f'Please install mmcv>={MMCV_MIN}.' -assert (mmcv_version < mmcv_max_version), \ +assert (mmcv_version <= mmcv_max_version), \ f'MMCV=={mmcv.__version__} is used but incompatible. ' \ f'Please install mmcv<{MMCV_MAX}.' @@ -70,7 +70,7 @@ def digit_version(version_str: str, length: int = 4): mmengine_max_version = digit_version(MMENGINE_MAX) mmengine_version = digit_version(mmengine.__version__) -assert (mmengine_version >= mmengine_version), \ +assert (mmengine_version >= mmengine_min_version), \ f'MMEngine=={mmengine.__version__} is used but incompatible. ' \ f'Please install mmengine>={MMENGINE_MIN}.'