Merge branch 'release/1.11' of gitlab.alibaba-inc.com:Ali-MaaS/MaaS-l…

…ib into release/1.11
modelscope · Jan 8, 2024 · c9668af · c9668af
2 parents bf6e595 + 7fdb97e
commit c9668af
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/.dev_scripts/build_image.sh b/.dev_scripts/build_image.sh
@@ -177,6 +177,13 @@ else
     # pre compile extension
     docker_file_content="${docker_file_content} \nRUN pip uninstall -y tb-nightly && pip install --no-cache-dir -U tensorboard && TORCH_CUDA_ARCH_LIST='6.0 6.1 7.0 7.5 8.0 8.9 9.0 8.6+PTX' python -c 'from modelscope.utils.pre_compile import pre_compile_all;pre_compile_all()'"
 fi
+# install here for easycv extension conflict.
+docker_file_content="${docker_file_content} \nRUN if [ \"$USE_GPU\" = \"True\" ] ; then \
+        bash /tmp/install_tiny_cuda_nn.sh; \
+    else \
+     echo 'cpu unsupport tiny_cuda_nn'; \
+    fi"
+
 if [ "$is_ci_test" == "True" ]; then
     echo "Building CI image, uninstall modelscope"
     docker_file_content="${docker_file_content} \nRUN pip uninstall modelscope -y"

diff --git a/docker/Dockerfile.ubuntu_base b/docker/Dockerfile.ubuntu_base
@@ -117,7 +117,7 @@ RUN if [ "$USE_GPU" = "True" ] ; then \
     fi
 
 RUN if [ "$USE_GPU" = "True" ] ; then \
-        pip install --no-cache-dir https://modelscope.oss-cn-beijing.aliyuncs.com/packages/mmcv_full-1.7.0-cp310-cp310-linux_x86_64.whl; \
+        pip install --no-cache-dir mmcv-full==1.7.0+torch2.1.1cu121 -f https://modelscope.oss-cn-beijing.aliyuncs.com/releases/repo.html; \
     else \
         pip install --no-cache-dir mmcv_full==1.7.0+torch2.1cpu -f https://modelscope.oss-cn-beijing.aliyuncs.com/releases/repo.html; \
     fi