From a5acaa01d0cfc3002df74aa0c8a6944f86383b74 Mon Sep 17 00:00:00 2001 From: "xingjun.wxj" Date: Mon, 17 Mar 2025 11:46:07 +0800 Subject: [PATCH] adapte for py310 --- docker/Dockerfile.ubuntu | 3 ++- docker/Dockerfile.ubuntu_base | 10 +++++----- requirements/audio/audio_codec.txt | 4 ++-- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/docker/Dockerfile.ubuntu b/docker/Dockerfile.ubuntu index 147c216c..9d2319b4 100644 --- a/docker/Dockerfile.ubuntu +++ b/docker/Dockerfile.ubuntu @@ -25,7 +25,8 @@ 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.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 && \ pip install --no-cache-dir -r /var/modelscope/cv.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 4ce89be0..903c9930 100644 --- a/docker/Dockerfile.ubuntu_base +++ b/docker/Dockerfile.ubuntu_base @@ -204,11 +204,11 @@ ARG TENSORFLOW_VERSION={tf_version} fi # This limits the cuda121 version - #RUN if [ "$USE_GPU" = "True" ] ; then \ - # pip install --no-cache-dir --force tinycudann==1.7 -f https://modelscope.oss-cn-beijing.aliyuncs.com/releases/repo.html; \ - # else \ - # echo 'cpu not install tinycudann'; \ - # fi + RUN if [ "$USE_GPU" = "True" ] ; then \ + pip install --no-cache-dir --force tinycudann==1.7 -f https://modelscope.oss-cn-beijing.aliyuncs.com/releases/repo.html; \ + else \ + echo 'cpu not install tinycudann'; \ + fi RUN pip install --no-cache-dir fairseq diff --git a/requirements/audio/audio_codec.txt b/requirements/audio/audio_codec.txt index 80d23ce2..bb83158d 100644 --- a/requirements/audio/audio_codec.txt +++ b/requirements/audio/audio_codec.txt @@ -1,2 +1,2 @@ -#funcodec>=0.2.0 -ms-funcodec>=0.2.0 +funcodec>=0.2.0 +#ms-funcodec>=0.2.0