[Fix] Fix the requirement of mmcv and mmdet (#1537)

* Fix the requirement of mmcv and mmdet

* Adjust all the mmcv upper bound version to 1.6.0, remove the version requirement in the CI

* Fix windows CI

* Fix test_loading due to the update of required mmdet

.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: |
@@ -122,15 +122,15 @@ 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
       - 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 .

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.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 |

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.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 |

mmdet3d/__init__.py

@@ -28,7 +28,7 @@ assert (mmcv_version >= digit_version(mmcv_minimum_version)
     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)

requirements/mminstall.txt

-mmcv-full>=1.4.8,<=1.5.0
-mmdet>=2.19.0,<=3.0.0
+mmcv-full>=1.4.8,<=1.6.0
+mmdet>=2.24.0,<=3.0.0
 mmsegmentation>=0.20.0,<=1.0.0

requirements/readthedocs.txt

 mmcv>=1.4.8
-mmdet>=2.19.0
+mmdet>=2.24.0
 mmsegmentation>=0.20.1
 torch
 torchvision

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