From 6761f541303524bfd74de33e57f1ca75f608d1d2 Mon Sep 17 00:00:00 2001 From: Qunliang Xing Date: Sat, 10 Jun 2023 14:56:16 +0800 Subject: [PATCH 1/4] Fix requirements --- requirements/mminstall.txt | 2 +- requirements/runtime.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements/mminstall.txt b/requirements/mminstall.txt index d2b1d8d204..992f383c8b 100644 --- a/requirements/mminstall.txt +++ b/requirements/mminstall.txt @@ -1,2 +1,2 @@ -mmcv>=2.0.0 +mmcv>=2.0.0rc1 mmengine>=0.4.0 diff --git a/requirements/runtime.txt b/requirements/runtime.txt index 869d8277bb..7f940e80ac 100644 --- a/requirements/runtime.txt +++ b/requirements/runtime.txt @@ -1,5 +1,6 @@ av av==8.0.3; python_version < '3.7' +Click # required by mmagic/utils/io_utils.py controlnet_aux diffusers>=0.12.0 einops @@ -8,10 +9,9 @@ facexlib lmdb lpips mediapipe -mmcv>=2.0.0rc1 -mmengine numpy opencv-python!=4.5.5.62,!=4.5.5.64 +pandas # required by mmagic/models/editors/disco_diffusion/guider.py # MMCV depends opencv-python instead of headless, thus we install opencv-python # Due to a bug from upstream, we skip this two version # https://github.com/opencv/opencv-python/issues/602 From 09c3671ebc136cc330cc9632fad0d4697d4bdd34 Mon Sep 17 00:00:00 2001 From: Qunliang Xing <34084019+ryanxingql@users.noreply.github.com> Date: Sat, 10 Jun 2023 16:39:01 +0800 Subject: [PATCH 2/4] Polish --- requirements/runtime.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements/runtime.txt b/requirements/runtime.txt index 7f940e80ac..4debb18102 100644 --- a/requirements/runtime.txt +++ b/requirements/runtime.txt @@ -1,6 +1,6 @@ av av==8.0.3; python_version < '3.7' -Click # required by mmagic/utils/io_utils.py +click # required by mmagic/utils/io_utils.py controlnet_aux diffusers>=0.12.0 einops @@ -10,13 +10,13 @@ lmdb lpips mediapipe numpy -opencv-python!=4.5.5.62,!=4.5.5.64 -pandas # required by mmagic/models/editors/disco_diffusion/guider.py # MMCV depends opencv-python instead of headless, thus we install opencv-python # Due to a bug from upstream, we skip this two version # https://github.com/opencv/opencv-python/issues/602 # https://github.com/opencv/opencv/issues/21366 # It seems to be fixed in https://github.com/opencv/opencv/pull/21382 +opencv-python!=4.5.5.62,!=4.5.5.64 +pandas # required by mmagic/models/editors/disco_diffusion/guider.py Pillow resize_right tensorboard From 9b914ddd57cc79a4601d548c3d0a67a0b188299c Mon Sep 17 00:00:00 2001 From: Qunliang Xing Date: Mon, 12 Jun 2023 13:42:23 +0800 Subject: [PATCH 3/4] Update MMCV version --- requirements/mminstall.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/mminstall.txt b/requirements/mminstall.txt index 992f383c8b..d2b1d8d204 100644 --- a/requirements/mminstall.txt +++ b/requirements/mminstall.txt @@ -1,2 +1,2 @@ -mmcv>=2.0.0rc1 +mmcv>=2.0.0 mmengine>=0.4.0 From 2bf357f6e0469650bb11275748faaddb92424b22 Mon Sep 17 00:00:00 2001 From: Qunliang Xing Date: Mon, 12 Jun 2023 14:38:29 +0800 Subject: [PATCH 4/4] Change MMCV version --- mmagic/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mmagic/__init__.py b/mmagic/__init__.py index bf9af38140..9112799de2 100644 --- a/mmagic/__init__.py +++ b/mmagic/__init__.py @@ -20,7 +20,7 @@ def digit_version(version_str): return digit_ver -MMCV_MIN = '2.0.0rc1' +MMCV_MIN = '2.0.0' MMCV_MAX = '2.1.0' mmcv_min_version = digit_version(MMCV_MIN) mmcv_max_version = digit_version(MMCV_MAX)