From cd5cd60ee420cc8b05146419206477a2d983d35b Mon Sep 17 00:00:00 2001 From: Iman Tabrizian <10105175+Tabrizian@users.noreply.github.com> Date: Thu, 25 Dec 2025 05:09:55 -0800 Subject: [PATCH] [None][infra] Move install_boost from install_triton.sh to install_base.sh (#10055) Signed-off-by: Iman Tabrizian <10105175+tabrizian@users.noreply.github.com> Signed-off-by: Zhanrui Sun <184402041+ZhanruiSunCh@users.noreply.github.com> Co-authored-by: Zhanrui Sun <184402041+ZhanruiSunCh@users.noreply.github.com> --- docker/common/install_base.sh | 17 +++++++++++++++++ docker/common/install_triton.sh | 16 ---------------- jenkins/current_image_tags.properties | 8 ++++---- 3 files changed, 21 insertions(+), 20 deletions(-) diff --git a/docker/common/install_base.sh b/docker/common/install_base.sh index 99ec57e2e1..2d20657895 100644 --- a/docker/common/install_base.sh +++ b/docker/common/install_base.sh @@ -8,6 +8,21 @@ if [ -n "${GITHUB_MIRROR}" ]; then export PIP_INDEX_URL="https://urm.nvidia.com/artifactory/api/pypi/pypi-remote/simple" fi +if [ -n "${GITHUB_MIRROR}" ]; then + BOOST_URL="https://urm.nvidia.com/artifactory/sw-dl-triton-generic-local/triton/ci-cd/binaries/boost/1.80.0/boost_1_80_0.tar.gz" +else + BOOST_URL="https://archives.boost.io/release/1.80.0/source/boost_1_80_0.tar.gz" +fi + +install_boost() { + # Install boost version >= 1.78 for boost::span + # Current libboost-dev apt packages are < 1.78, so install from tar.gz + wget --no-verbose --retry-connrefused --timeout=180 --tries=10 --continue -O /tmp/boost.tar.gz ${BOOST_URL} \ + && tar xzf /tmp/boost.tar.gz -C /tmp \ + && mv /tmp/boost_1_80_0/boost /usr/include/boost \ + && rm -rf /tmp/boost_1_80_0 /tmp/boost.tar.gz +} + set_bash_env() { if [ ! -f ${BASH_ENV} ];then touch ${BASH_ENV} @@ -151,11 +166,13 @@ set_bash_env case "$ID" in ubuntu) init_ubuntu + install_boost ;; rocky) install_python_rockylinux $1 install_pyp_rockylinux install_gcctoolset_rockylinux + install_boost ;; *) echo "Unable to determine OS..." diff --git a/docker/common/install_triton.sh b/docker/common/install_triton.sh index 8207837d83..3fd9c15e46 100644 --- a/docker/common/install_triton.sh +++ b/docker/common/install_triton.sh @@ -4,21 +4,6 @@ set -ex CUDA_VER="13" -if [ -n "${GITHUB_MIRROR}" ]; then - BOOST_URL="https://urm.nvidia.com/artifactory/sw-dl-triton-generic-local/triton/ci-cd/binaries/boost/1.80.0/boost_1_80_0.tar.gz" -else - BOOST_URL="https://archives.boost.io/release/1.80.0/source/boost_1_80_0.tar.gz" -fi - -install_boost() { - # Install boost version >= 1.78 for boost::span - # Current libboost-dev apt packages are < 1.78, so install from tar.gz - wget --no-verbose --retry-connrefused --timeout=180 --tries=10 --continue -O /tmp/boost.tar.gz ${BOOST_URL} \ - && tar xzf /tmp/boost.tar.gz -C /tmp \ - && mv /tmp/boost_1_80_0/boost /usr/include/boost \ - && rm -rf /tmp/boost_1_80_0 /tmp/boost.tar.gz -} - install_triton_deps() { apt-get update \ && apt-get install -y --no-install-recommends \ @@ -30,7 +15,6 @@ install_triton_deps() { libb64-dev \ libarchive-dev \ datacenter-gpu-manager-4-cuda${CUDA_VER} \ - && install_boost \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* } diff --git a/jenkins/current_image_tags.properties b/jenkins/current_image_tags.properties index 2ee623bae1..32643c10d3 100644 --- a/jenkins/current_image_tags.properties +++ b/jenkins/current_image_tags.properties @@ -13,7 +13,7 @@ # images are adopted from PostMerge pipelines, the abbreviated commit hash is used instead. IMAGE_NAME=urm.nvidia.com/sw-tensorrt-docker/tensorrt-llm -LLM_DOCKER_IMAGE=urm.nvidia.com/sw-tensorrt-docker/tensorrt-llm:pytorch-25.10-py3-x86_64-ubuntu24.04-trt10.13.3.9-skip-tritondevel-202512151112-9977 -LLM_SBSA_DOCKER_IMAGE=urm.nvidia.com/sw-tensorrt-docker/tensorrt-llm:pytorch-25.10-py3-aarch64-ubuntu24.04-trt10.13.3.9-skip-tritondevel-202512151112-9977 -LLM_ROCKYLINUX8_PY310_DOCKER_IMAGE=urm.nvidia.com/sw-tensorrt-docker/tensorrt-llm:cuda-13.0.2-devel-rocky8-x86_64-rocky8-py310-trt10.13.3.9-skip-tritondevel-202512151112-9977 -LLM_ROCKYLINUX8_PY312_DOCKER_IMAGE=urm.nvidia.com/sw-tensorrt-docker/tensorrt-llm:cuda-13.0.2-devel-rocky8-x86_64-rocky8-py312-trt10.13.3.9-skip-tritondevel-202512151112-9977 +LLM_DOCKER_IMAGE=urm.nvidia.com/sw-tensorrt-docker/tensorrt-llm:pytorch-25.10-py3-x86_64-ubuntu24.04-trt10.13.3.9-skip-tritondevel-202512241744-10055 +LLM_SBSA_DOCKER_IMAGE=urm.nvidia.com/sw-tensorrt-docker/tensorrt-llm:pytorch-25.10-py3-aarch64-ubuntu24.04-trt10.13.3.9-skip-tritondevel-202512241744-10055 +LLM_ROCKYLINUX8_PY310_DOCKER_IMAGE=urm.nvidia.com/sw-tensorrt-docker/tensorrt-llm:cuda-13.0.2-devel-rocky8-x86_64-rocky8-py310-trt10.13.3.9-skip-tritondevel-202512241744-10055 +LLM_ROCKYLINUX8_PY312_DOCKER_IMAGE=urm.nvidia.com/sw-tensorrt-docker/tensorrt-llm:cuda-13.0.2-devel-rocky8-x86_64-rocky8-py312-trt10.13.3.9-skip-tritondevel-202512241744-10055