From b1e1f66fadd3b937cf45fdefb22b55f4afc5d854 Mon Sep 17 00:00:00 2001 From: Jintao Date: Fri, 29 Nov 2024 13:44:36 +0800 Subject: [PATCH] Merge release 1.20 docker (#1109) --- docker/Dockerfile.ubuntu | 1 + docker/build_image.py | 5 ++--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docker/Dockerfile.ubuntu b/docker/Dockerfile.ubuntu index 3461e32e..0ec13d12 100644 --- a/docker/Dockerfile.ubuntu +++ b/docker/Dockerfile.ubuntu @@ -34,6 +34,7 @@ if [ "$INSTALL_MS_DEPS" = "True" ]; then \ pip install --no-cache-dir -r /var/modelscope/tests.txt -f https://modelscope.oss-cn-beijing.aliyuncs.com/releases/repo.html && \ pip install --no-cache-dir -r /var/modelscope/server.txt && \ pip install --no-cache-dir https://modelscope.oss-cn-beijing.aliyuncs.com/packages/imageio_ffmpeg-0.4.9-py3-none-any.whl --no-dependencies --force && \ + pip install adaseq pai-easycv && \ pip install --no-cache-dir 'scipy<1.13.0' && \ 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 && \ diff --git a/docker/build_image.py b/docker/build_image.py index e3fc930f..ddc67581 100644 --- a/docker/build_image.py +++ b/docker/build_image.py @@ -139,7 +139,7 @@ class CPUImageBuilder(Builder): base_image = ( f'{docker_registry}:ubuntu{self.args.ubuntu_version}-{self.args.python_tag}' f'-torch{self.args.torch_version}-base') - extra_content = """\nRUN pip install adaseq pai-easycv""" + extra_content = '' with open('docker/Dockerfile.ubuntu', 'r') as f: content = f.read() @@ -192,8 +192,7 @@ class GPUImageBuilder(Builder): def generate_dockerfile(self) -> str: meta_file = './docker/install.sh' extra_content = """ -RUN pip install adaseq pai-easycv && \ - pip install tf-keras==2.16.0 --no-dependencies && \ +RUN pip install tf-keras==2.16.0 --no-dependencies && \ pip install --no-cache-dir torchsde jupyterlab torchmetrics==0.11.4 basicsr pynvml shortuuid && \ CUDA_HOME=/usr/local/cuda TORCH_CUDA_ARCH_LIST="6.0 6.1 7.0 7.5 8.0 8.6 8.9 9.0" \ pip install --no-cache-dir 'git+https://github.com/facebookresearch/detectron2.git'