From d1473e4a7fa8c5498149edd3e8128db00005dc76 Mon Sep 17 00:00:00 2001 From: Ma Zerun Date: Tue, 2 Nov 2021 18:08:30 +0800 Subject: [PATCH] [Dependency] Update mmcv dependency version (#509) * Update mmcv dependency version * Add code info in some metafiles --- configs/res2net/metafile.yml | 3 +++ configs/t2t_vit/metafile.yml | 3 +++ configs/vision_transformer/metafile.yml | 3 +++ docker/Dockerfile | 6 +++--- docker/serve/Dockerfile | 6 +++--- mmcls/__init__.py | 2 +- requirements/mminstall.txt | 2 +- requirements/readthedocs.txt | 2 +- 8 files changed, 18 insertions(+), 9 deletions(-) diff --git a/configs/res2net/metafile.yml b/configs/res2net/metafile.yml index dfcda732..d76f898b 100644 --- a/configs/res2net/metafile.yml +++ b/configs/res2net/metafile.yml @@ -15,6 +15,9 @@ Collections: Title: 'Res2Net: A New Multi-scale Backbone Architecture' URL: https://arxiv.org/pdf/1904.01169.pdf README: configs/res2net/README.md + Code: + URL: https://github.com/open-mmlab/mmclassification/blob/v0.17.0/mmcls/models/backbones/res2net.py + Version: v0.17.0 Models: - Name: res2net50-w14-s8_3rdparty_8xb32_in1k diff --git a/configs/t2t_vit/metafile.yml b/configs/t2t_vit/metafile.yml index 0abcfe06..319424fc 100644 --- a/configs/t2t_vit/metafile.yml +++ b/configs/t2t_vit/metafile.yml @@ -12,6 +12,9 @@ Collections: URL: https://arxiv.org/abs/2101.11986 Title: "Tokens-to-Token ViT: Training Vision Transformers from Scratch on ImageNet" README: configs/t2t_vit/README.md + Code: + URL: https://github.com/open-mmlab/mmclassification/blob/v0.17.0/mmcls/models/backbones/t2t_vit.py + Version: v0.17.0 Models: - Name: t2t-vit-t-14_3rdparty_8xb64_in1k diff --git a/configs/vision_transformer/metafile.yml b/configs/vision_transformer/metafile.yml index a497b17e..9ac80469 100644 --- a/configs/vision_transformer/metafile.yml +++ b/configs/vision_transformer/metafile.yml @@ -15,6 +15,9 @@ Collections: URL: https://arxiv.org/pdf/2010.11929.pdf Title: 'An Image is Worth 16x16 Words: Transformers for Image Recognition at Scale' README: configs/vision_transformer/README.md + Code: + URL: https://github.com/open-mmlab/mmclassification/blob/v0.17.0/mmcls/models/backbones/vision_transformer.py + Version: v0.17.0 Models: - Name: vit-base-p16_in21k-pre-3rdparty_ft-64xb64_in1k-384 diff --git a/docker/Dockerfile b/docker/Dockerfile index e4b62d32..6d05ad69 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,5 +1,5 @@ -ARG PYTORCH="1.6.0" -ARG CUDA="10.1" +ARG PYTORCH="1.8.1" +ARG CUDA="10.2" ARG CUDNN="7" FROM pytorch/pytorch:${PYTORCH}-cuda${CUDA}-cudnn${CUDNN}-devel @@ -13,7 +13,7 @@ RUN apt-get update && apt-get install -y ffmpeg libsm6 libxext6 git ninja-build && rm -rf /var/lib/apt/lists/* # Install MMCV -RUN pip install mmcv-full==1.3.8 -f https://download.openmmlab.com/mmcv/dist/cu101/torch1.6.0/index.html +RUN pip install mmcv-full==1.3.16 -f https://download.openmmlab.com/mmcv/dist/cu101/torch1.8.1/index.html # Install MMClassification RUN conda clean --all diff --git a/docker/serve/Dockerfile b/docker/serve/Dockerfile index a942d810..4f82219e 100644 --- a/docker/serve/Dockerfile +++ b/docker/serve/Dockerfile @@ -1,9 +1,9 @@ -ARG PYTORCH="1.6.0" -ARG CUDA="10.1" +ARG PYTORCH="1.8.1" +ARG CUDA="10.2" ARG CUDNN="7" FROM pytorch/pytorch:${PYTORCH}-cuda${CUDA}-cudnn${CUDNN}-devel -ARG MMCV="1.3.8" +ARG MMCV="1.3.16" ARG MMCLS="0.17.0" ENV PYTHONUNBUFFERED TRUE diff --git a/mmcls/__init__.py b/mmcls/__init__.py index 7ec26411..c05d4491 100644 --- a/mmcls/__init__.py +++ b/mmcls/__init__.py @@ -47,7 +47,7 @@ def digit_version(version_str: str, length: int = 4): return tuple(release) -mmcv_minimum_version = '1.3.8' +mmcv_minimum_version = '1.3.16' mmcv_maximum_version = '1.5.0' mmcv_version = digit_version(mmcv.__version__) diff --git a/requirements/mminstall.txt b/requirements/mminstall.txt index dc29efb4..904461aa 100644 --- a/requirements/mminstall.txt +++ b/requirements/mminstall.txt @@ -1 +1 @@ -mmcv-full>=1.3.8,<=1.5.0 +mmcv-full>=1.3.16,<=1.5.0 diff --git a/requirements/readthedocs.txt b/requirements/readthedocs.txt index cd16364f..65aa36bc 100644 --- a/requirements/readthedocs.txt +++ b/requirements/readthedocs.txt @@ -1,3 +1,3 @@ -mmcv>=1.3.8 +mmcv>=1.3.16 torch torchvision