Mirrors/modelscope
1
0
Fork 0
mirror of https://github.com/modelscope/modelscope.git synced 2026-07-13 13:59:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

[to #51274424]fix: easycv extension and tinycudann conflict

Browse Source 
Link: https://code.alibaba-inc.com/Ali-MaaS/MaaS-lib/codereview/13471150
* fix easycv extension and tinycudann conflict
This commit is contained in:
mulin.lyh
2023-07-31 18:08:53 +08:00
committed by wenmeng.zwm
parent f856c04785
commit da2badaacd
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
.dev_scripts/build_image.sh
View File

@@ -106,7 +106,7 @@ if [ "$is_cpu" == "True" ]; then
base_tag=ubuntu20.04
export USE_GPU=False
else
base_tag=ubuntu20.04-$cuda_version
base_tag=ubuntu20.04-cuda$cuda_version
export USE_GPU=True
fi
@@ -158,6 +158,12 @@ else
docker_file_content="${docker_file_content} \nENV MODELSCOPE_CACHE=/mnt/workspace/.cache/modelscope"
# pre compile extension
docker_file_content="${docker_file_content} \nRUN python -c 'from modelscope.utils.pre_compile import pre_compile_all;pre_compile_all()'"
if [ "$is_cpu" == "True" ]; then
echo 'build cpu image'
else
# fix easycv extension and tinycudann conflict.
docker_file_content="${docker_file_content} \nRUN bash /tmp/install_tiny_cuda_nn.sh"
fi
fi
if [ "$is_ci_test" == "True" ]; then
echo "Building CI image, uninstall modelscope"

3
docker/Dockerfile.ubuntu
View File

@@ -43,3 +43,6 @@ COPY examples /modelscope/examples
ENV SETUPTOOLS_USE_DISTUTILS=stdlib
RUN CUDA_HOME=/usr/local/cuda TORCH_CUDA_ARCH_LIST="6.0 6.1 7.0 7.5 8.0 8.6" pip install --no-cache-dir 'git+https://github.com/facebookresearch/detectron2.git'
# add basicsr
RUN pip install --no-cache-dir basicsr