diff --git a/docker/Dockerfile.ubuntu b/docker/Dockerfile.ubuntu index b09a58a3..abbc27e7 100644 --- a/docker/Dockerfile.ubuntu +++ b/docker/Dockerfile.ubuntu @@ -20,12 +20,10 @@ ARG INSTALL_MS_DEPS={install_ms_deps} COPY requirements /var/modelscope RUN pip uninstall ms-swift modelscope -y && pip --no-cache-dir install pip==23.* -U && \ - pip install --no-cache-dir apex -f https://modelscope.oss-cn-beijing.aliyuncs.com/releases/repo.html && \ if [ "$INSTALL_MS_DEPS" = "True" ]; then \ pip --no-cache-dir install omegaconf==2.0.6 && \ pip install 'editdistance==0.8.1' && \ pip install --no-cache-dir 'cython<=0.29.36' versioneer 'numpy<2.0' -f https://modelscope.oss-cn-beijing.aliyuncs.com/releases/repo.html && \ - pip install --no-cache-dir kwsbp==0.1.0 -f https://modelscope.oss-cn-beijing.aliyuncs.com/releases/repo.html && \ # pip install --no-cache-dir kwsbp==0.0.6 -f https://modelscope.oss-cn-beijing.aliyuncs.com/releases/repo.html && \ pip install --no-cache-dir -r /var/modelscope/framework.txt -f https://modelscope.oss-cn-beijing.aliyuncs.com/releases/repo.html && \ pip install --no-cache-dir -r /var/modelscope/audio.txt -f https://modelscope.oss-cn-beijing.aliyuncs.com/releases/repo.html && \ @@ -41,6 +39,12 @@ if [ "$INSTALL_MS_DEPS" = "True" ]; then \ pip install --no-cache-dir funtextprocessing typeguard==2.13.3 scikit-learn -f https://modelscope.oss-cn-beijing.aliyuncs.com/releases/repo.html && \ pip install --no-cache-dir text2sql_lgesql==1.3.0 git+https://github.com/jin-s13/xtcocoapi.git@v1.14 git+https://github.com/gatagat/lap.git@v0.4.0 -f https://modelscope.oss-cn-beijing.aliyuncs.com/releases/repo.html --force --no-deps && \ pip install --no-cache-dir mmcls>=0.21.0 mmdet>=2.25.0 decord>=0.6.0 mpi4py paint_ldm ipykernel fasttext -f https://modelscope.oss-cn-beijing.aliyuncs.com/releases/repo.html && \ + pip uninstall ddpm_guided_diffusion -y && \ + pip install 'ddpm_guided_diffusion' -f https://modelscope.oss-cn-beijing.aliyuncs.com/releases/repo.html --no-index && \ + pip uninstall shotdetect_scenedetect_lgss -y && \ + pip install 'shotdetect_scenedetect_lgss' -f https://modelscope.oss-cn-beijing.aliyuncs.com/releases/repo.html --no-index && \ + pip uninstall MinDAEC -y && \ + pip install https://modelscope.oss-cn-beijing.aliyuncs.com/releases/dependencies/MinDAEC-0.0.2-py3-none-any.whl && \ pip cache purge; \ else \ pip install --no-cache-dir -r /var/modelscope/framework.txt -f https://modelscope.oss-cn-beijing.aliyuncs.com/releases/repo.html && \ diff --git a/docker/Dockerfile.ubuntu_base b/docker/Dockerfile.ubuntu_base index fae19cfb..07096766 100644 --- a/docker/Dockerfile.ubuntu_base +++ b/docker/Dockerfile.ubuntu_base @@ -189,6 +189,13 @@ RUN if [ "$USE_GPU" = "True" ] ; then \ echo 'cpu unsupport Pointnet2'; \ fi +# NVIDIA apex building +RUN if [ "$USE_GPU" = "True" ] ; then \ + bash /tmp/install_apex.sh; \ + else \ + echo 'cpu unsupport nvidia apex'; \ + fi + ARG TENSORFLOW_VERSION={tf_version} RUN if [ "$USE_GPU" = "True" ] ; then \ diff --git a/docker/build_image.py b/docker/build_image.py index 5f253eae..a2cfa83b 100644 --- a/docker/build_image.py +++ b/docker/build_image.py @@ -31,7 +31,7 @@ class Builder: if not args.cuda_version: args.cuda_version = '12.1.0' if not args.vllm_version: - args.vllm_version = '0.5.3' + args.vllm_version = '0.7.3' if not args.lmdeploy_version: args.lmdeploy_version = '0.6.2' if not args.autogptq_version: @@ -273,7 +273,7 @@ class LLMImageBuilder(Builder): if not args.cuda_version: args.cuda_version = '12.4.0' if not args.vllm_version: - args.vllm_version = '0.7.2' + args.vllm_version = '0.7.3' if not args.lmdeploy_version: args.lmdeploy_version = '0.7.0.post2' if not args.autogptq_version: