diff --git a/.github/workflows/publish_job.yml b/.github/workflows/publish_job.yml index fc67b5faafa..2cb1b87d4d0 100644 --- a/.github/workflows/publish_job.yml +++ b/.github/workflows/publish_job.yml @@ -287,7 +287,7 @@ jobs: shell: bash env: docker_image: ccr-2vdh3abv-pub.cnc.bj.baidubce.com/paddlepaddle/paddleqa:fastdeploy-ciuse-cuda126-dailyupdate - fd_archive_url: ${FASTDEPLOY_ARCHIVE_URL} + fd_archive_url: ${{ env.FASTDEPLOY_ARCHIVE_URL }} run: | set -x FULL_REPO="${{ github.repository }}" diff --git a/dockerfiles/Dockerfile.gpu b/dockerfiles/Dockerfile.gpu index c897f651ae5..b73adffe25c 100644 --- a/dockerfiles/Dockerfile.gpu +++ b/dockerfiles/Dockerfile.gpu @@ -1,6 +1,6 @@ -FROM ccr-2vdh3abv-pub.cnc.bj.baidubce.com/paddlepaddle/fastdeploy-cuda-12.6:2.2.1 -ARG PADDLE_VERSION=3.2.0 -ARG FD_VERSION=2.2.1 +FROM ccr-2vdh3abv-pub.cnc.bj.baidubce.com/paddlepaddle/fastdeploy-cuda-12.6:tag-base +ARG PADDLE_VERSION=3.2.1 +ARG FD_VERSION=2.3.0-rc0 ENV DEBIAN_FRONTEND=noninteractive diff --git a/tools/dockerfile/Dockerfile.ci b/tools/dockerfile/Dockerfile.ci index 6d711889f0d..e985d3d39f6 100644 --- a/tools/dockerfile/Dockerfile.ci +++ b/tools/dockerfile/Dockerfile.ci @@ -1,9 +1,30 @@ FROM ccr-2vdh3abv-pub.cnc.bj.baidubce.com/paddlepaddle/paddleqa:cuda126-py310-cibase RUN apt update && apt install -y jq -RUN python -m pip install --no-cache-dir xgrammar==0.1.19 torch==2.6.0 -i https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple COPY ../../requirements.txt ./requirements.txt RUN python -m pip install --no-cache-dir -r requirements.txt -i https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple COPY ./unittest_requirement.txt ./unittest_requirement.txt RUN python -m pip install --no-cache-dir -r unittest_requirement.txt -i https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple COPY ./requirements_paddle_nv.txt ./requirements_paddle_nv.txt RUN python -m pip install --no-cache-dir -r requirements_paddle_nv.txt -i https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple + +RUN wget -q --no-proxy https://paddle-qa.bj.bcebos.com/FastDeploy/MLNX_OFED_LINUX-24.10-2.1.8.0-ubuntu22.04-x86_64.tgz \ + && tar xf MLNX_OFED_LINUX-24.10-2.1.8.0-ubuntu22.04-x86_64.tgz + +RUN rm -f /etc/apt/sources.list \ + && echo "deb http://archive.ubuntu.com/ubuntu jammy main restricted universe multiverse\ndeb http://archive.ubuntu.com/ubuntu jammy-updates main restricted universe multiverse\ndeb http://archive.ubuntu.com/ubuntu jammy-security main restricted universe multiverse" | tee /etc/apt/sources.list > /dev/null + +RUN cd MLNX_OFED_LINUX-24.10-2.1.8.0-ubuntu22.04-x86_64 \ + && apt clean \ + && apt update --fix-missing \ + && apt-get install -y librdmacm-dev libibverbs-dev \ + && apt install -y iproute2 \ + && ./mlnxofedinstall --user-space-only --skip-distro-check --without-fw-update --force --without-ucx-cuda + +RUN apt install -y build-essential tcl \ + && wget http://download.redis.io/releases/redis-7.2.0.tar.gz \ + && tar xzf redis-7.2.0.tar.gz && cd redis-7.2.0 \ + && make && make PREFIX=/usr/local/redis install + +RUN rm -rf MLNX_OFED_LINUX-24.10-2.1.8.0-ubuntu22.04-x86_64* redis* + +ENV PATH="/usr/local/redis/bin:${PATH}"