Merge remote-tracking branch 'origin/main' into dev

open-mmlab · Jan 4, 2024 · 9ac4b31 · 9ac4b31
2 parents 3022f9a + e95d9ac
commit 9ac4b31
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/docker/serve/Dockerfile b/docker/serve/Dockerfile
@@ -3,7 +3,7 @@ ARG CUDA="11.7"
 ARG CUDNN="8"
 FROM pytorch/torchserve:latest-gpu
 
-ARG MMPRE="1.1.0"
+ARG MMPRE="1.1.1"
 
 ENV PYTHONUNBUFFERED TRUE
 

diff --git a/docs/en/notes/faq.md b/docs/en/notes/faq.md
@@ -16,7 +16,7 @@ and make sure you fill in all required information in the template.
 
   | MMPretrain version | MMEngine version  |   MMCV version   |
   | :----------------: | :---------------: | :--------------: |
-  |    1.1.0 (main)    | mmengine >= 0.8.3 |  mmcv >= 2.0.0   |
+  |    1.1.1 (main)    | mmengine >= 0.8.3 |  mmcv >= 2.0.0   |
   |       1.0.0        | mmengine >= 0.8.0 |  mmcv >= 2.0.0   |
   |      1.0.0rc8      | mmengine >= 0.7.1 | mmcv >= 2.0.0rc4 |
   |      1.0.0rc7      | mmengine >= 0.5.0 | mmcv >= 2.0.0rc4 |

diff --git a/docs/zh_CN/notes/faq.md b/docs/zh_CN/notes/faq.md
@@ -13,7 +13,7 @@
 
   | MMPretrain 版本 |   MMEngine 版本   |    MMCV 版本     |
   | :-------------: | :---------------: | :--------------: |
-  |  1.1.0 (main)   | mmengine >= 0.8.3 |  mmcv >= 2.0.0   |
+  |  1.1.1 (main)   | mmengine >= 0.8.3 |  mmcv >= 2.0.0   |
   |      1.0.0      | mmengine >= 0.8.0 |  mmcv >= 2.0.0   |
   |    1.0.0rc8     | mmengine >= 0.7.1 | mmcv >= 2.0.0rc4 |
   |    1.0.0rc7     | mmengine >= 0.5.0 | mmcv >= 2.0.0rc4 |

diff --git a/mmpretrain/version.py b/mmpretrain/version.py
@@ -1,6 +1,6 @@
 # Copyright (c) OpenMMLab. All rights reserved
 
-__version__ = '1.1.0'
+__version__ = '1.1.1'
 
 
 def parse_version_info(version_str):

diff --git a/requirements/mminstall.txt b/requirements/mminstall.txt
@@ -1,2 +1,2 @@
-mmcv>=2.0.0,<2.1.0
+mmcv>=2.0.0,<2.3.0
 mmengine>=0.8.3,<1.0.0