diff --git a/dockerfiles/Dockerfile.gpu b/dockerfiles/Dockerfile.gpu index 6f76282111..057f30228b 100644 --- a/dockerfiles/Dockerfile.gpu +++ b/dockerfiles/Dockerfile.gpu @@ -1,10 +1,10 @@ FROM ccr-2vdh3abv-pub.cnc.bj.baidubce.com/paddlepaddle/fastdeploy-cuda-12.6:2.0.0 +ARG PADDLE_VERSION=3.1.0 +ARG FD_VERSION=2.0.0 ENV DEBIAN_FRONTEND=noninteractive WORKDIR /workspace -RUN rm -rf /workspace/FastDeploy -COPY . /workspace/FastDeploy RUN echo "ulimit -u unlimited" >> /root/.bashrc RUN echo "ulimit -n 65536" >> /root/.bashrc @@ -13,10 +13,10 @@ RUN echo "ulimit -n 65536" >> /root/.bashrc RUN python -m pip uninstall paddlepaddle-gpu fastdeploy-gpu -y # install paddlepaddle -RUN python -m pip install paddlepaddle-gpu==3.1.0 -i https://www.paddlepaddle.org.cn/packages/stable/cu126/ +RUN python -m pip install --no-cache-dir paddlepaddle-gpu==${PADDLE_VERSION} -i https://www.paddlepaddle.org.cn/packages/stable/cu126/ # build and install FastDeploy -RUN cd FastDeploy && bash build.sh 1 python false [80,90] && python -m pip install --no-cache-dir dist/* && rm -rf /workspace/FastDeploy +RUN python -m pip install --no-cache-dir fastdeploy-gpu==${FD_VERSION} -i https://www.paddlepaddle.org.cn/packages/stable/fastdeploy-gpu-80_90/ --extra-index-url https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple ENV http_proxy="" ENV https_proxy="" diff --git a/dockerfiles/Dockerfile.xpu b/dockerfiles/Dockerfile.xpu index 66971690f2..a063cb84e3 100644 --- a/dockerfiles/Dockerfile.xpu +++ b/dockerfiles/Dockerfile.xpu @@ -1,4 +1,6 @@ FROM ccr-2vdh3abv-pub.cnc.bj.baidubce.com/paddlepaddle/paddlenlp:llm-base-gcc12.3-xpu-xft20250402-v1.1 +ARG PADDLE_VERSION=3.1.0 +ARG FD_VERSION=2.0.0 WORKDIR /workspace @@ -15,22 +17,9 @@ RUN apt-get update && apt-get install -y libibverbs-dev librdmacm-dev cmake pybi # uninstall existing package RUN python -m pip uninstall paddlepaddle-gpu paddlepaddle-xpu -y # install paddlepaddle -RUN python -m pip install --no-cache-dir --progress-bar off paddlepaddle-xpu==3.1.0 -i https://www.paddlepaddle.org.cn/packages/stable/xpu-p800/ +RUN python -m pip install --no-cache-dir --progress-bar off paddlepaddle-xpu==${PADDLE_VERSION} -i https://www.paddlepaddle.org.cn/packages/stable/xpu-p800/ -COPY . /workspace/FastDeploy - -# get xtdk and xvllm and xre -RUN mkdir -p /workspace/deps && cd /workspace/deps && \ - wget https://klx-sdk-release-public.su.bcebos.com/xre/kl3-release/5.0.21.21/xre-Linux-x86_64-5.0.21.21.tar.gz && \ - tar -zxf xre-Linux-x86_64-5.0.21.21.tar.gz && mv xre-Linux-x86_64-5.0.21.21 xre && \ - cd /workspace/FastDeploy && bash custom_ops/xpu_ops/src/download_dependencies.sh stable - -ENV PATH=/workspace/deps/xre/bin:$PATH -ENV CLANG_PATH=/workspace/FastDeploy/custom_ops/xpu_ops/src/third_party/xtdk -ENV XVLLM_PATH=/workspace/FastDeploy/custom_ops/xpu_ops/src/third_party/xvllm - -# build and install FastDeploy -RUN cd /workspace/FastDeploy && bash build.sh && python -m pip install --no-cache-dir dist/* && rm -rf /workspace/FastDeploy +RUN python -m pip install --no-cache-dir fastdeploy-xpu==${FD_VERSION} -i https://www.paddlepaddle.org.cn/packages/stable/fastdeploy-xpu-p800/ --extra-index-url https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple ENV http_proxy="" ENV https_proxy=""