From 0a62b15f2492e69eb994d18697a528d212870f81 Mon Sep 17 00:00:00 2001 From: nijkah Date: Sun, 3 Apr 2022 19:25:19 +0900 Subject: [PATCH] fix typos and version issues --- docker/serve/Dockerfile | 8 +++++--- setup.cfg | 2 +- tools/deployment/mmrotate_handler.py | 3 ++- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/docker/serve/Dockerfile b/docker/serve/Dockerfile index a09dfc7c0..e8d202ea9 100644 --- a/docker/serve/Dockerfile +++ b/docker/serve/Dockerfile @@ -3,9 +3,10 @@ ARG CUDA="10.1" ARG CUDNN="7" FROM pytorch/pytorch:${PYTORCH}-cuda${CUDA}-cudnn${CUDNN}-devel -ARG MMCV="1.4.15" +ARG MMCV="1.4.5" ARG MMDET="2.19.0" -ARG MMROTATE="0.1.0" +ARG MMROTATE="0.1.1" +ARG TORCHSERVE="0.2.0" ENV PYTHONUNBUFFERED TRUE @@ -22,7 +23,8 @@ ENV PATH="/opt/conda/bin:$PATH" RUN export FORCE_CUDA=1 # TORCHSEVER -RUN pip install torchserve torch-model-archiver +# torchserve>0.2.0 is compatible with pytorch>=1.8.1 +RUN pip install torchserv==${TORCHSERVE}} torch-model-archiver # MMLAB ARG PYTORCH diff --git a/setup.cfg b/setup.cfg index ea404076c..d19be8543 100644 --- a/setup.cfg +++ b/setup.cfg @@ -3,7 +3,7 @@ line_length = 79 multi_line_output = 0 known_standard_library = setuptools known_first_party = mmrotate -known_third_party = PIL,cv2,e2cnn,matplotlib,mmcv,mmdet,numpy,pytest,pytorch_sphinx_theme,terminaltables,torch +known_third_party = PIL,cv2,e2cnn,matplotlib,mmcv,mmdet,numpy,pytest,pytorch_sphinx_theme,terminaltables,torch,ts no_lines_before = STDLIB,LOCALFOLDER default_section = THIRDPARTY diff --git a/tools/deployment/mmrotate_handler.py b/tools/deployment/mmrotate_handler.py index cc3192d53..c80076833 100644 --- a/tools/deployment/mmrotate_handler.py +++ b/tools/deployment/mmrotate_handler.py @@ -4,9 +4,10 @@ import mmcv import torch +from mmdet.apis import inference_detector, init_detector from ts.torch_handler.base_handler import BaseHandler -from mmrotatte.apis import inference_detector, init_detector +import mmrotate # noqa: F401 class MMrotateHandler(BaseHandler):