From 0a24d4d6e3f7f4206f0b6f8ead3308986bc565b5 Mon Sep 17 00:00:00 2001 From: Tai-Wang Date: Tue, 7 Jun 2022 12:17:25 +0800 Subject: [PATCH 1/4] Fix the requirement of mmcv and mmdet --- docs/en/getting_started.md | 4 ++-- docs/zh_cn/getting_started.md | 4 ++-- requirements/mminstall.txt | 4 ++-- requirements/readthedocs.txt | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/en/getting_started.md b/docs/en/getting_started.md index 6cc237545a..6656272f5c 100644 --- a/docs/en/getting_started.md +++ b/docs/en/getting_started.md @@ -11,8 +11,8 @@ The required versions of MMCV, MMDetection and MMSegmentation for different vers | MMDetection3D version | MMDetection version | MMSegmentation version | MMCV version | | :-------------------: | :----------------------: | :---------------------: | :-------------------------: | -| master | mmdet>=2.19.0, \<=3.0.0 | mmseg>=0.20.0, \<=1.0.0 | mmcv-full>=1.4.8, \<=1.7.0 | -| v1.0.0rc2 | mmdet>=2.19.0, \<=3.0.0 | mmseg>=0.20.0, \<=1.0.0 | mmcv-full>=1.4.8, \<=1.7.0 | +| master | mmdet>=2.24.0, \<=3.0.0 | mmseg>=0.20.0, \<=1.0.0 | mmcv-full>=1.4.8, \<=1.7.0 | +| v1.0.0rc2 | mmdet>=2.24.0, \<=3.0.0 | mmseg>=0.20.0, \<=1.0.0 | mmcv-full>=1.4.8, \<=1.7.0 | | v1.0.0rc1 | mmdet>=2.19.0, \<=3.0.0 | mmseg>=0.20.0, \<=1.0.0 | mmcv-full>=1.4.8, \<=1.5.0 | | v1.0.0rc0 | mmdet>=2.19.0, \<=3.0.0 | mmseg>=0.20.0, \<=1.0.0 | mmcv-full>=1.3.17, \<=1.5.0 | | 0.18.1 | mmdet>=2.19.0, \<=3.0.0 | mmseg>=0.20.0, \<=1.0.0 | mmcv-full>=1.3.17, \<=1.5.0 | diff --git a/docs/zh_cn/getting_started.md b/docs/zh_cn/getting_started.md index f41a435429..8205af6ba1 100644 --- a/docs/zh_cn/getting_started.md +++ b/docs/zh_cn/getting_started.md @@ -9,8 +9,8 @@ | MMDetection3D 版本 | MMDetection 版本 | MMSegmentation 版本 | MMCV 版本 | | :--------------: | :----------------------: | :---------------------: | :-------------------------: | -| master | mmdet>=2.19.0, \<=3.0.0 | mmseg>=0.20.0, \<=1.0.0 | mmcv-full>=1.4.8, \<=1.7.0 | -| v1.0.0rc2 | mmdet>=2.19.0, \<=3.0.0 | mmseg>=0.20.0, \<=1.0.0 | mmcv-full>=1.4.8, \<=1.7.0 | +| master | mmdet>=2.24.0, \<=3.0.0 | mmseg>=0.20.0, \<=1.0.0 | mmcv-full>=1.4.8, \<=1.7.0 | +| v1.0.0rc2 | mmdet>=2.24.0, \<=3.0.0 | mmseg>=0.20.0, \<=1.0.0 | mmcv-full>=1.4.8, \<=1.7.0 | | v1.0.0rc1 | mmdet>=2.19.0, \<=3.0.0 | mmseg>=0.20.0, \<=1.0.0 | mmcv-full>=1.4.8, \<=1.5.0 | | v1.0.0rc0 | mmdet>=2.19.0, \<=3.0.0 | mmseg>=0.20.0, \<=1.0.0 | mmcv-full>=1.3.17, \<=1.5.0 | | 0.18.1 | mmdet>=2.19.0, \<=3.0.0 | mmseg>=0.20.0, \<=1.0.0 | mmcv-full>=1.3.17, \<=1.5.0 | diff --git a/requirements/mminstall.txt b/requirements/mminstall.txt index 07b3411341..f7dabfb49e 100644 --- a/requirements/mminstall.txt +++ b/requirements/mminstall.txt @@ -1,3 +1,3 @@ -mmcv-full>=1.4.8,<=1.5.0 -mmdet>=2.19.0,<=3.0.0 +mmcv-full>=1.4.8,<=1.7.0 +mmdet>=2.24.0,<=3.0.0 mmsegmentation>=0.20.0,<=1.0.0 diff --git a/requirements/readthedocs.txt b/requirements/readthedocs.txt index 1eb8231c13..3ffe9e47c8 100644 --- a/requirements/readthedocs.txt +++ b/requirements/readthedocs.txt @@ -1,5 +1,5 @@ mmcv>=1.4.8 -mmdet>=2.19.0 +mmdet>=2.24.0 mmsegmentation>=0.20.1 torch torchvision From 219a6e39405188283ad7f15930ea32f1fad16aed Mon Sep 17 00:00:00 2001 From: Tai-Wang Date: Tue, 7 Jun 2022 16:37:35 +0800 Subject: [PATCH 2/4] Adjust all the mmcv upper bound version to 1.6.0, remove the version requirement in the CI --- .github/workflows/build.yml | 8 ++++---- docs/en/getting_started.md | 4 ++-- docs/zh_cn/getting_started.md | 4 ++-- mmdet3d/__init__.py | 2 +- requirements/mminstall.txt | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e2b07be4fa..5d2b52bd84 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -84,8 +84,8 @@ jobs: - name: Install mmdet3d dependencies run: | python -m pip install mmcv-full -f https://download.openmmlab.com/mmcv/dist/cu101/${{matrix.torch_version}}/index.html - python -m pip install mmdet==2.19.0 - python -m pip install mmsegmentation==0.20.0 + python -m pip install mmdet + python -m pip install mmsegmentation python -m pip install -r requirements.txt - name: Build and install run: | @@ -129,8 +129,8 @@ jobs: - name: Install mmdet3d dependencies run: | pip install mmcv-full -f https://download.openmmlab.com/mmcv/dist/cpu/torch1.8/index.html --only-binary mmcv-full - python -m pip install mmdet==2.19.0 - python -m pip install mmsegmentation==0.20.0 + python -m pip install mmdet + python -m pip install mmsegmentation python -m pip install -r requirements/build.txt -r requirements/runtime.txt -r requirements/tests.txt - name: Build and install run: pip install -e . diff --git a/docs/en/getting_started.md b/docs/en/getting_started.md index 6656272f5c..4d47b84a58 100644 --- a/docs/en/getting_started.md +++ b/docs/en/getting_started.md @@ -11,8 +11,8 @@ The required versions of MMCV, MMDetection and MMSegmentation for different vers | MMDetection3D version | MMDetection version | MMSegmentation version | MMCV version | | :-------------------: | :----------------------: | :---------------------: | :-------------------------: | -| master | mmdet>=2.24.0, \<=3.0.0 | mmseg>=0.20.0, \<=1.0.0 | mmcv-full>=1.4.8, \<=1.7.0 | -| v1.0.0rc2 | mmdet>=2.24.0, \<=3.0.0 | mmseg>=0.20.0, \<=1.0.0 | mmcv-full>=1.4.8, \<=1.7.0 | +| master | mmdet>=2.24.0, \<=3.0.0 | mmseg>=0.20.0, \<=1.0.0 | mmcv-full>=1.4.8, \<=1.6.0 | +| v1.0.0rc2 | mmdet>=2.24.0, \<=3.0.0 | mmseg>=0.20.0, \<=1.0.0 | mmcv-full>=1.4.8, \<=1.6.0 | | v1.0.0rc1 | mmdet>=2.19.0, \<=3.0.0 | mmseg>=0.20.0, \<=1.0.0 | mmcv-full>=1.4.8, \<=1.5.0 | | v1.0.0rc0 | mmdet>=2.19.0, \<=3.0.0 | mmseg>=0.20.0, \<=1.0.0 | mmcv-full>=1.3.17, \<=1.5.0 | | 0.18.1 | mmdet>=2.19.0, \<=3.0.0 | mmseg>=0.20.0, \<=1.0.0 | mmcv-full>=1.3.17, \<=1.5.0 | diff --git a/docs/zh_cn/getting_started.md b/docs/zh_cn/getting_started.md index 8205af6ba1..c84444a10b 100644 --- a/docs/zh_cn/getting_started.md +++ b/docs/zh_cn/getting_started.md @@ -9,8 +9,8 @@ | MMDetection3D 版本 | MMDetection 版本 | MMSegmentation 版本 | MMCV 版本 | | :--------------: | :----------------------: | :---------------------: | :-------------------------: | -| master | mmdet>=2.24.0, \<=3.0.0 | mmseg>=0.20.0, \<=1.0.0 | mmcv-full>=1.4.8, \<=1.7.0 | -| v1.0.0rc2 | mmdet>=2.24.0, \<=3.0.0 | mmseg>=0.20.0, \<=1.0.0 | mmcv-full>=1.4.8, \<=1.7.0 | +| master | mmdet>=2.24.0, \<=3.0.0 | mmseg>=0.20.0, \<=1.0.0 | mmcv-full>=1.4.8, \<=1.6.0 | +| v1.0.0rc2 | mmdet>=2.24.0, \<=3.0.0 | mmseg>=0.20.0, \<=1.0.0 | mmcv-full>=1.4.8, \<=1.6.0 | | v1.0.0rc1 | mmdet>=2.19.0, \<=3.0.0 | mmseg>=0.20.0, \<=1.0.0 | mmcv-full>=1.4.8, \<=1.5.0 | | v1.0.0rc0 | mmdet>=2.19.0, \<=3.0.0 | mmseg>=0.20.0, \<=1.0.0 | mmcv-full>=1.3.17, \<=1.5.0 | | 0.18.1 | mmdet>=2.19.0, \<=3.0.0 | mmseg>=0.20.0, \<=1.0.0 | mmcv-full>=1.3.17, \<=1.5.0 | diff --git a/mmdet3d/__init__.py b/mmdet3d/__init__.py index a5d0b292d8..312e9b45d8 100644 --- a/mmdet3d/__init__.py +++ b/mmdet3d/__init__.py @@ -28,7 +28,7 @@ def digit_version(version_str): f'MMCV=={mmcv.__version__} is used but incompatible. ' \ f'Please install mmcv>={mmcv_minimum_version}, <={mmcv_maximum_version}.' -mmdet_minimum_version = '2.19.0' +mmdet_minimum_version = '2.24.0' mmdet_maximum_version = '3.0.0' mmdet_version = digit_version(mmdet.__version__) assert (mmdet_version >= digit_version(mmdet_minimum_version) diff --git a/requirements/mminstall.txt b/requirements/mminstall.txt index f7dabfb49e..16a8d8b790 100644 --- a/requirements/mminstall.txt +++ b/requirements/mminstall.txt @@ -1,3 +1,3 @@ -mmcv-full>=1.4.8,<=1.7.0 +mmcv-full>=1.4.8,<=1.6.0 mmdet>=2.24.0,<=3.0.0 mmsegmentation>=0.20.0,<=1.0.0 From 6cdc44270a6f61e27e1da0643e246fa41d7dbeea Mon Sep 17 00:00:00 2001 From: Tai-Wang Date: Tue, 7 Jun 2022 19:58:32 +0800 Subject: [PATCH 3/4] Fix windows CI --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5d2b52bd84..a1772cb50d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -122,7 +122,7 @@ jobs: with: python-version: ${{ matrix.python }} - name: Upgrade pip - run: pip install pip --upgrade --user + run: python -m pip install pip --upgrade --user - name: Install PyTorch # As a complement to Linux CI, we test on PyTorch LTS version run: pip install torch==1.8.2+${{ matrix.platform }} torchvision==0.9.2+${{ matrix.platform }} -f https://download.pytorch.org/whl/lts/1.8/torch_lts.html From 966de84b183734d945102226d643dfa560578e7d Mon Sep 17 00:00:00 2001 From: Tai-Wang Date: Tue, 7 Jun 2022 20:21:19 +0800 Subject: [PATCH 4/4] Fix test_loading due to the update of required mmdet --- tests/test_data/test_pipelines/test_loadings/test_loading.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/test_data/test_pipelines/test_loadings/test_loading.py b/tests/test_data/test_pipelines/test_loadings/test_loading.py index ef0fc9ae8e..396c1df617 100644 --- a/tests/test_data/test_pipelines/test_loadings/test_loading.py +++ b/tests/test_data/test_pipelines/test_loadings/test_loading.py @@ -310,7 +310,8 @@ def test_load_image_from_file_mono_3d(): repr_str = repr(load_image_from_file_mono_3d) expected_repr_str = 'LoadImageFromFileMono3D(to_float32=False, ' \ - "color_type='color', file_client_args={'backend': 'disk'})" + "color_type='color', channel_order='bgr', " \ + "file_client_args={'backend': 'disk'})" assert repr_str == expected_repr_str