diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1b7f817e..1073d2b4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -56,9 +56,9 @@ jobs: - 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 MMCV - run: pip install mmcv-full==1.3.0 -f https://download.openmmlab.com/mmcv/dist/cpu/torch${{matrix.torch}}/index.html + run: pip install mmcv-full==1.3.1 -f https://download.openmmlab.com/mmcv/dist/cpu/torch${{matrix.torch}}/index.html - name: Install MMDet - run: pip install git+https://github.com/open-mmlab/mmdetection/ + run: pip install mmdet==2.11.0 - name: Install other dependencies run: pip install -r requirements.txt - name: Build and install @@ -139,7 +139,7 @@ jobs: - name: Install mmocr dependencies run: | pip install mmcv-full==latest+torch${{matrix.mmcv}} -f https://download.openmmlab.com/mmcv/dist/index.html --use-deprecated=legacy-resolver - pip install -q git+https://github.com/open-mmlab/mmdetection/ + pip install mmdet==2.11.0 pip install -r requirements.txt - name: Build and install run: | diff --git a/docker/Dockerfile b/docker/Dockerfile index 87a14ef3..9d4154b0 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -13,9 +13,9 @@ RUN apt-get update && apt-get install -y git ninja-build libglib2.0-0 libsm6 lib && rm -rf /var/lib/apt/lists/* RUN conda clean --all -RUN pip install mmcv-full==1.2.6+torch1.5.0+cu101 -f https://download.openmmlab.com/mmcv/dist/index.html +RUN pip install mmcv-full==1.3.1+torch1.5.0+cu101 -f https://download.openmmlab.com/mmcv/dist/index.html -RUN pip install mmdet==2.9.0 +RUN pip install mmdet==2.11.0 RUN git clone https://github.com/open-mmlab/mmocr.git /mmocr WORKDIR /mmocr diff --git a/docs/install.md b/docs/install.md index 4c5c636e..62c765b9 100644 --- a/docs/install.md +++ b/docs/install.md @@ -9,18 +9,20 @@ - CUDA 10.1 - NCCL 2 - GCC 5.4.0 or higher -- [mmcv](https://github.com/open-mmlab/mmcv) 1.2.6 +- [MMCV](https://mmcv.readthedocs.io/en/latest/#installation) 1.3.1 +- [MMDetection](https://mmdetection.readthedocs.io/en/latest/#installation) 2.11.0 We have tested the following versions of OS and softwares: - OS: Ubuntu 16.04 - CUDA: 10.1 - GCC(G++): 5.4.0 -- mmcv 1.2.6 +- MMCV 1.3.1 +- MMDetection 2.11.0 - PyTorch 1.5 - torchvision 0.6.0 -MMOCR depends on Pytorch and mmdetection v2.9.0. +MMOCR depends on Pytorch and mmdetection. ## Step-by-Step Installation Instructions @@ -58,19 +60,16 @@ See official [installation](https://github.com/open-mmlab/mmcv#installation) for **Important:** You need to run `pip uninstall mmcv` first if you have mmcv installed. If mmcv and mmcv-full are both installed, there will be `ModuleNotFoundError`. -d. Install [mmdet](https://github.com/open-mmlab/mmdetection.git), we recommend you to install `mmdet` with pip. -See [here](https://pypi.org/project/mmdet/2.9.0/) for different versions of `mmdet`. +d. Install [mmdet](https://github.com/open-mmlab/mmdetection.git), we recommend you to install the latest `mmdet` with pip. +See [here](https://pypi.org/project/mmdet/) for different versions of `mmdet`. ```shell -pip install mmdet==2.9.0 +pip install mmdet==2.11.0 ``` Optionally you can choose to install `mmdet` following the official [installation](https://github.com/open-mmlab/mmdetection/blob/master/docs/get_started.md). - -Note that we have tested mmdetection v2.9.0 only. Older versions might be incompatible. - e. Clone the mmocr repository. ```shell @@ -98,10 +97,10 @@ conda activate open-mmlab conda install pytorch==1.5.0 torchvision==0.6.0 cudatoolkit=10.1 -c pytorch # install the latest mmcv-full -pip install mmcv-full +pip install mmcv-full==1.3.1 # install mmdetection -pip install mmdet==2.9.0 +pip install mmdet==2.11.0 # install mmocr git clone https://github.com/open-mmlab/mmocr.git