diff --git a/docker/Dockerfile.multi b/docker/Dockerfile.multi index 6d812be7b19..b6485c4cf55 100644 --- a/docker/Dockerfile.multi +++ b/docker/Dockerfile.multi @@ -30,20 +30,26 @@ FROM base AS devel # NB: PyTorch requires this to be < 1.0 ENV PYTORCH_CUDA_ALLOC_CONF="garbage_collection_threshold:0.99999" -COPY docker/common/install.sh install.sh +# Copy all installation scripts at once to reduce layers +COPY docker/common/install.sh \ + docker/common/install_base.sh \ + docker/common/install_cmake.sh \ + docker/common/install_ccache.sh \ + docker/common/install_cuda_toolkit.sh \ + docker/common/install_tensorrt.sh \ + docker/common/install_polygraphy.sh \ + docker/common/install_mpi4py.sh \ + docker/common/install_pytorch.sh \ + ./ -COPY docker/common/install_base.sh install_base.sh RUN GITHUB_MIRROR=${GITHUB_MIRROR} \ PYTHON_VERSION=${PYTHON_VERSION} \ bash ./install.sh --base && rm install_base.sh -COPY docker/common/install_cmake.sh install_cmake.sh RUN GITHUB_MIRROR=${GITHUB_MIRROR} bash ./install.sh --cmake && rm install_cmake.sh -COPY docker/common/install_ccache.sh install_ccache.sh RUN GITHUB_MIRROR=${GITHUB_MIRROR} bash ./install.sh --ccache && rm install_ccache.sh -COPY docker/common/install_cuda_toolkit.sh install_cuda_toolkit.sh RUN bash ./install.sh --cuda_toolkit && rm install_cuda_toolkit.sh ARG TRT_VER @@ -51,7 +57,6 @@ ARG CUDA_VER ARG CUDNN_VER ARG NCCL_VER ARG CUBLAS_VER -COPY docker/common/install_tensorrt.sh install_tensorrt.sh RUN TRT_VER=${TRT_VER} \ CUDA_VER=${CUDA_VER} \ CUDNN_VER=${CUDNN_VER} \ @@ -59,14 +64,11 @@ RUN TRT_VER=${TRT_VER} \ CUBLAS_VER=${CUBLAS_VER} \ bash ./install.sh --tensorrt && rm install_tensorrt.sh -COPY docker/common/install_polygraphy.sh install_polygraphy.sh RUN bash ./install.sh --polygraphy && rm install_polygraphy.sh -COPY docker/common/install_mpi4py.sh install_mpi4py.sh RUN GITHUB_MIRROR=${GITHUB_MIRROR} bash ./install.sh --mpi4py && rm install_mpi4py.sh ARG TORCH_INSTALL_TYPE="skip" -COPY docker/common/install_pytorch.sh install_pytorch.sh RUN TORCH_INSTALL_TYPE=${TORCH_INSTALL_TYPE} bash ./install.sh --pytorch && rm install_pytorch.sh RUN bash ./install.sh --opencv && bash ./install.sh --protobuf && rm install.sh @@ -99,26 +101,29 @@ COPY --from=triton /opt/tritonserver/lib /opt/tritonserver/lib COPY --from=triton /opt/tritonserver/include /opt/tritonserver/include COPY --from=triton /opt/tritonserver/bin /opt/tritonserver/bin COPY --from=triton /opt/tritonserver/caches /opt/tritonserver/caches -COPY docker/common/install_triton.sh install_triton.sh + +# Copy all installation scripts at once to reduce layers +COPY docker/common/install_triton.sh \ + docker/common/install_ucx.sh \ + docker/common/install_nixl.sh \ + docker/common/install_etcd.sh \ + ./ + RUN bash ./install_triton.sh && rm install_triton.sh # Install UCX first -COPY docker/common/install_ucx.sh install_ucx.sh RUN bash ./install_ucx.sh && rm install_ucx.sh # Install NIXL -COPY docker/common/install_nixl.sh install_nixl.sh RUN bash ./install_nixl.sh && rm install_nixl.sh # Install etcd -COPY docker/common/install_etcd.sh install_etcd.sh RUN bash ./install_etcd.sh && rm install_etcd.sh FROM ${DEVEL_IMAGE} AS wheel WORKDIR /src/tensorrt_llm COPY benchmarks benchmarks COPY cpp cpp -COPY benchmarks benchmarks COPY scripts scripts COPY tensorrt_llm tensorrt_llm COPY 3rdparty 3rdparty diff --git a/jenkins/current_image_tags.properties b/jenkins/current_image_tags.properties index f6d7b61ae7b..2198b6e20ac 100644 --- a/jenkins/current_image_tags.properties +++ b/jenkins/current_image_tags.properties @@ -17,7 +17,7 @@ LLM_DOCKER_IMAGE_12_9=urm.nvidia.com/sw-tensorrt-docker/tensorrt-llm:pytorch-25. LLM_SBSA_DOCKER_IMAGE_12_9=urm.nvidia.com/sw-tensorrt-docker/tensorrt-llm:pytorch-25.06-py3-aarch64-ubuntu24.04-trt10.11.0.33-skip-tritondevel-202509091430-7383 LLM_ROCKYLINUX8_PY310_DOCKER_IMAGE_12_9=urm.nvidia.com/sw-tensorrt-docker/tensorrt-llm:cuda-12.9.1-devel-rocky8-x86_64-rocky8-py310-trt10.11.0.33-skip-tritondevel-202509091430-7383 LLM_ROCKYLINUX8_PY312_DOCKER_IMAGE_12_9=urm.nvidia.com/sw-tensorrt-docker/tensorrt-llm:cuda-12.9.1-devel-rocky8-x86_64-rocky8-py312-trt10.11.0.33-skip-tritondevel-202509091430-7383 -LLM_DOCKER_IMAGE=urm.nvidia.com/sw-tensorrt-docker/tensorrt-llm:pytorch-25.08-py3-x86_64-ubuntu24.04-trt10.13.2.6-skip-tritondevel-202509112230-7568 -LLM_SBSA_DOCKER_IMAGE=urm.nvidia.com/sw-tensorrt-docker/tensorrt-llm:pytorch-25.08-py3-aarch64-ubuntu24.04-trt10.13.2.6-skip-tritondevel-202509112230-7568 -LLM_ROCKYLINUX8_PY310_DOCKER_IMAGE=urm.nvidia.com/sw-tensorrt-docker/tensorrt-llm:cuda-13.0.0-devel-rocky8-x86_64-rocky8-py310-trt10.13.2.6-skip-tritondevel-202509112230-7568 -LLM_ROCKYLINUX8_PY312_DOCKER_IMAGE=urm.nvidia.com/sw-tensorrt-docker/tensorrt-llm:cuda-13.0.0-devel-rocky8-x86_64-rocky8-py312-trt10.13.2.6-skip-tritondevel-202509112230-7568 +LLM_DOCKER_IMAGE=urm.nvidia.com/sw-tensorrt-docker/tensorrt-llm:pytorch-25.08-py3-x86_64-ubuntu24.04-trt10.13.2.6-skip-tritondevel-202510101558-8250 +LLM_SBSA_DOCKER_IMAGE=urm.nvidia.com/sw-tensorrt-docker/tensorrt-llm:pytorch-25.08-py3-aarch64-ubuntu24.04-trt10.13.2.6-skip-tritondevel-202510101558-8250 +LLM_ROCKYLINUX8_PY310_DOCKER_IMAGE=urm.nvidia.com/sw-tensorrt-docker/tensorrt-llm:cuda-13.0.0-devel-rocky8-x86_64-rocky8-py310-trt10.13.2.6-skip-tritondevel-202510101558-8250 +LLM_ROCKYLINUX8_PY312_DOCKER_IMAGE=urm.nvidia.com/sw-tensorrt-docker/tensorrt-llm:cuda-13.0.0-devel-rocky8-x86_64-rocky8-py312-trt10.13.2.6-skip-tritondevel-202510101558-8250