Merge branch 'dtk24.04.1' into 'main'

fix url

See merge request aibear/controlnet_pytorch!2

README.md

@@ -52,6 +52,8 @@ zero convolution：初始权重为零的卷积层；
     cd BasicSR 
     BASICSR_EXT=True python setup.py develop
 
+    pip uninstall mmcv
+
 ### Dockerfile（方法二）
 
     # 需要在对应的目录下
@@ -62,6 +64,8 @@ zero convolution：初始权重为零的卷积层；
     cd BasicSR
     BASICSR_EXT=True python setup.py develop
 
+    pip uninstall mmcv
+
 ### Anaconda (方法三)
 1、关于本项目DCU显卡所需的特殊深度学习库可从光合开发者社区下载安装：
 https://developer.hpccube.com/tool/
@@ -77,6 +81,8 @@ Tips：以上dtk驱动、python、torch等DCU相关工具版本需要严格一
 
     pip install -r requirements.txt
 
+    pip uninstall mmcv
+
 3、其他
 
     cd BasicSR

annotator/uniformer/__init__.py

@@ -9,7 +9,7 @@ from annotator.uniformer.mmseg.core.evaluation import get_palette
 from annotator.util import annotator_ckpts_path
 
 
-checkpoint_file = "https://huggingface.co/lllyasviel/ControlNet/resolve/main/annotator/ckpts/upernet_global_small.pth"
+checkpoint_file = "https://hf-mirror.com/lllyasviel/ControlNet/resolve/main/annotator/ckpts/upernet_global_small.pth"
 
 
 class UniformerDetector: