diff --git a/Dockerfile_amd b/Dockerfile_amd index dc748f49..2ae990f7 100644 --- a/Dockerfile_amd +++ b/Dockerfile_amd @@ -18,7 +18,18 @@ RUN cargo chef prepare --recipe-path recipe.json FROM chef AS builder RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - python3.11-dev + python3.11-dev \ + ffmpeg \ + libavcodec-dev \ + libavfilter-dev \ + libavdevice-dev \ + libavformat-dev \ + libavutil-dev \ + libswscale-dev \ + pkg-config \ + libclang-dev \ + clang + RUN PROTOC_ZIP=protoc-21.12-linux-x86_64.zip && \ curl -OL https://github.com/protocolbuffers/protobuf/releases/download/v21.12/$PROTOC_ZIP && \ unzip -o $PROTOC_ZIP -d /usr/local bin/protoc && \ diff --git a/Dockerfile_intel b/Dockerfile_intel index 720d7bee..82e53179 100644 --- a/Dockerfile_intel +++ b/Dockerfile_intel @@ -19,7 +19,18 @@ RUN cargo chef prepare --recipe-path recipe.json FROM chef AS builder RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - python3.11-dev + python3.11-dev \ + ffmpeg \ + libavcodec-dev \ + libavfilter-dev \ + libavdevice-dev \ + libavformat-dev \ + libavutil-dev \ + libswscale-dev \ + pkg-config \ + libclang-dev \ + clang + RUN PROTOC_ZIP=protoc-21.12-linux-x86_64.zip && \ curl -OL https://github.com/protocolbuffers/protobuf/releases/download/v21.12/$PROTOC_ZIP && \ unzip -o $PROTOC_ZIP -d /usr/local bin/protoc && \ diff --git a/Dockerfile_trtllm b/Dockerfile_trtllm index b4523ea5..0bd271d8 100644 --- a/Dockerfile_trtllm +++ b/Dockerfile_trtllm @@ -1,5 +1,5 @@ ARG CUDA_ARCH_LIST="75-real;80-real;86-real;89-real;90-real" -ARG OMPI_VERSION="4.1.7rc1" +ARG OMPI_VERSION="4.1.6" # Build dependencies resolver stage FROM lukemathwalker/cargo-chef:latest AS chef @@ -10,7 +10,7 @@ COPY . . RUN cargo chef prepare --recipe-path recipe.json # CUDA dependent dependencies resolver stage -FROM nvidia/cuda:12.6.3-cudnn-devel-ubuntu24.04 AS cuda-builder +FROM nvidia/cuda:12.6.1-cudnn-devel-ubuntu22.04 AS cuda-builder RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \ --mount=type=cache,target=/var/lib/apt,sharing=locked \ @@ -18,21 +18,28 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \ build-essential \ cmake \ curl \ - gcc-14 \ - g++-14 \ + gcc \ + g++ \ git \ git-lfs \ libssl-dev \ - libucx-dev \ ninja-build \ pkg-config \ - pipx \ python3 \ python3-dev \ python3-setuptools \ tar \ - wget && \ - pipx ensurepath + wget \ + ffmpeg \ + libavcodec-dev \ + libavfilter-dev \ + libavdevice-dev \ + libavformat-dev \ + libavutil-dev \ + libswscale-dev \ + pkg-config \ + libclang-dev \ + clang ENV TGI_INSTALL_PREFIX=/usr/local/tgi ENV TENSORRT_INSTALL_PREFIX=/usr/local/tensorrt @@ -86,15 +93,13 @@ RUN mkdir $TGI_INSTALL_PREFIX && mkdir "$TGI_INSTALL_PREFIX/include" && mkdir "$ cd backends/trtllm && \ CMAKE_INSTALL_PREFIX=$TGI_INSTALL_PREFIX cargo build --release -FROM nvidia/cuda:12.6.3-cudnn-runtime-ubuntu24.04 AS runtime -RUN apt update && apt install -y libucx0 pipx python3-minimal python3-dev python3-pip python3-venv && \ +FROM nvidia/cuda:12.6.1-cudnn-runtime-ubuntu22.04 AS runtime +RUN apt update && apt install -y python3-minimal python3-dev python3-pip && \ rm -rf /var/lib/{apt,dpkg,cache,log}/ && \ - pipx ensurepath && \ - pipx install --include-deps transformers tokenizers + python3 -m pip install transformers tokenizers WORKDIR /usr/local/tgi/bin -ENV PATH=/root/.local/share/pipx/venvs/transformers/bin/:$PATH ENV LD_LIBRARY_PATH="/usr/local/tgi/lib:/usr/local/mpi/lib:/usr/local/tensorrt/lib:/usr/local/cuda/lib64/stubs:$LD_LIBRARY_PATH" ENV TOKENIZERS_PARALLELISM=false ENV OMPI_MCA_plm_rsh_agent=""