build: TPRD-1622 - Update version to CMake 4.0 or 3.31 ( 3.31.8 ) which has support for CUDA new layout (#8285)

Author: mc-nv

CMakeLists.txt

@@ -1,4 +1,4 @@
-# Copyright 2020-2024, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# Copyright 2020-2025, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -24,7 +24,7 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-cmake_minimum_required(VERSION 3.18)
+cmake_minimum_required(VERSION 3.31.8)
 
 project(tritonserver LANGUAGES C CXX)
 

Dockerfile.QA

@@ -66,13 +66,8 @@ RUN apt-get update && \
             software-properties-common && \
     rm -rf /var/lib/apt/lists/*
 
-RUN apt update -q=2 \
-    && apt install -y gpg wget \
-    && wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | gpg --dearmor - |  tee /usr/share/keyrings/kitware-archive-keyring.gpg >/dev/null \
-    && . /etc/os-release \
-    && echo "deb [signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ $UBUNTU_CODENAME main" | tee /etc/apt/sources.list.d/kitware.list >/dev/null \
-    && apt-get update -q=2 \
-    && apt-get install -y --no-install-recommends cmake=3.28.3* cmake-data=3.28.3*
+RUN pip3 install cmake==4.0.3
+ENV CMAKE_POLICY_VERSION_MINIMUM=3.5
 
 # Add densenet_onnx model to example repo
 # FIXME: This should be changed to using the fetch_models.sh script

Dockerfile.sdk

@@ -56,7 +56,7 @@ FROM ${BASE_IMAGE} AS sdk_build
 
 # Ensure apt-get won't prompt for selecting options
 ENV DEBIAN_FRONTEND=noninteractive
-ENV PIP_BREAK_SYSTEM_PACKAGES=1
+ENV PIP_BREAK_SYSTEM_PACKAGES=1 CMAKE_POLICY_VERSION_MINIMUM=3.5
 
 RUN apt-get update && \
     apt-get install -y --no-install-recommends \
@@ -86,18 +86,7 @@ RUN apt-get update && \
             python3-pdfkit \
             openjdk-11-jdk \
             maven && \
-    pip3 install --upgrade "grpcio-tools<1.68"
-
-# Client build requires recent version of CMake (FetchContent required)
-# Using CMAKE installation instruction from:: https://apt.kitware.com/
-RUN apt update -q=2 \
-    && apt install -y gpg wget \
-    && wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | gpg --dearmor - |  tee /usr/share/keyrings/kitware-archive-keyring.gpg >/dev/null \
-    && . /etc/os-release \
-    && echo "deb [signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ $UBUNTU_CODENAME main" | tee /etc/apt/sources.list.d/kitware.list >/dev/null \
-    && apt-get update -q=2 \
-    && apt-get install -y --no-install-recommends cmake=3.28.3* cmake-data=3.28.3* \
-    && cmake --version
+    pip3 install --upgrade "grpcio-tools<1.68" cmake==4.0.3
 
 # Build expects "python" executable (not python3).
 RUN rm -f /usr/bin/python && \

Dockerfile.win10.min

@@ -87,9 +87,11 @@ LABEL PYTHON_VERSION=${PYTHON_VERSION}
 #
 # Installing CMake
 #
-ARG CMAKE_VERSION=3.30.5
+ARG CMAKE_VERSION=4.0.3
 RUN pip install cmake==%CMAKE_VERSION%
 
+ENV CMAKE_POLICY_VERSION_MINIMUM=3.5
+
 ENV CMAKE_TOOLCHAIN_FILE /vcpkg/scripts/buildsystems/vcpkg.cmake
 ENV VCPKG_TARGET_TRIPLET x64-windows
 

build.py

@@ -917,7 +917,7 @@ def create_dockerfile_buildbase_rhel(ddir, dockerfile_name, argmap):
 
 ARG TRITON_VERSION
 ARG TRITON_CONTAINER_VERSION
-ENV PIP_BREAK_SYSTEM_PACKAGES=1
+ENV PIP_BREAK_SYSTEM_PACKAGES=1 CMAKE_POLICY_VERSION_MINIMUM=3.5
 """
     df += """
 # Install docker docker buildx
@@ -988,24 +988,15 @@ def create_dockerfile_buildbase_rhel(ddir, dockerfile_name, argmap):
           setuptools \\
           docker \\
           virtualenv \\
-          patchelf==0.17.2
+          patchelf==0.17.2 \\
+          cmake==4.0.3
 
 # Install boost version >= 1.78 for boost::span
 # Current libboost-dev apt packages are < 1.78, so install from tar.gz
 RUN wget -O /tmp/boost.tar.gz \\
           https://archives.boost.io/release/1.80.0/source/boost_1_80_0.tar.gz \\
       && (cd /tmp && tar xzf boost.tar.gz) \\
       && mv /tmp/boost_1_80_0/boost /usr/include/boost
-
-# Server build requires recent version of CMake (FetchContent required)
-# Might not need this if the installed version of cmake is high enough for our build.
-# RUN apt update -q=2 \\
-#       && apt install -y gpg wget \\
-#       && wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | gpg --dearmor - |  tee /usr/share/keyrings/kitware-archive-keyring.gpg >/dev/null \\
-#       && . /etc/os-release \\
-#       && echo "deb [signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ $UBUNTU_CODENAME main" | tee /etc/apt/sources.list.d/kitware.list >/dev/null \\
-#       && apt-get update -q=2 \\
-#       && apt-get install -y --no-install-recommends cmake=3.27.7* cmake-data=3.27.7*
 """
     if FLAGS.enable_gpu:
         df += install_dcgm_libraries(argmap["DCGM_VERSION"], target_machine())
@@ -1041,7 +1032,7 @@ def create_dockerfile_buildbase(ddir, dockerfile_name, argmap):
 
 ARG TRITON_VERSION
 ARG TRITON_CONTAINER_VERSION
-ENV PIP_BREAK_SYSTEM_PACKAGES=1
+ENV PIP_BREAK_SYSTEM_PACKAGES=1 CMAKE_POLICY_VERSION_MINIMUM=3.5
 """
     # Install the windows- or linux-specific buildbase dependencies
     if target_platform() == "windows":
@@ -1108,7 +1099,8 @@ def create_dockerfile_buildbase(ddir, dockerfile_name, argmap):
           build \\
           docker \\
           virtualenv \\
-          patchelf==0.17.2
+          patchelf==0.17.2 \\
+          cmake==4.0.3
 
 # Install boost version >= 1.78 for boost::span
 # Current libboost-dev apt packages are < 1.78, so install from tar.gz
@@ -1117,14 +1109,6 @@ def create_dockerfile_buildbase(ddir, dockerfile_name, argmap):
       && (cd /tmp && tar xzf boost.tar.gz) \\
       && mv /tmp/boost_1_80_0/boost /usr/include/boost
 
-# Server build requires recent version of CMake (FetchContent required)
-RUN apt update -q=2 \\
-      && apt install -y gpg wget \\
-      && wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | gpg --dearmor - |  tee /usr/share/keyrings/kitware-archive-keyring.gpg >/dev/null \\
-      && . /etc/os-release \\
-      && echo "deb [signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ $UBUNTU_CODENAME main" | tee /etc/apt/sources.list.d/kitware.list >/dev/null \\
-      && apt-get update -q=2 \\
-      && apt-get install -y --no-install-recommends cmake=3.28.3* cmake-data=3.28.3*
 """
 
         if FLAGS.enable_gpu:
@@ -1281,8 +1265,8 @@ def create_dockerfile_linux(
     rm -fr ${TRT_ROOT}/doc ${TRT_ROOT}/onnx_graphsurgeon ${TRT_ROOT}/python && \\
     rm -fr ${TRT_ROOT}/samples ${TRT_ROOT}/targets/${ARCH}-linux-gnu/samples && \\
     pip3 install --no-cache-dir transformers && \\
-    find /usr -name libtensorrt_llm.so -exec dirname {} \; > /etc/ld.so.conf.d/tensorrt-llm.conf && \\
-    find /opt/tritonserver -name libtritonserver.so -exec dirname {} \; > /etc/ld.so.conf.d/triton-tensorrtllm-worker.conf && \\
+    find /usr -name libtensorrt_llm.so -exec dirname {} \\; > /etc/ld.so.conf.d/tensorrt-llm.conf && \\
+    find /opt/tritonserver -name libtritonserver.so -exec dirname {} \\; > /etc/ld.so.conf.d/triton-tensorrtllm-worker.conf && \\
     pip3 install --no-cache-dir  grpcio-tools==1.64.0 && \\
     pip3 uninstall -y setuptools
 ENV LD_LIBRARY_PATH=/usr/local/tensorrt/lib/:/opt/tritonserver/backends/tensorrtllm:$LD_LIBRARY_PATH
@@ -1649,11 +1633,11 @@ def create_dockerfile_windows(
 ARG TRITON_VERSION
 ARG TRITON_CONTAINER_VERSION
 
-ENV TRITON_SERVER_VERSION ${{TRITON_VERSION}}
-ENV NVIDIA_TRITON_SERVER_VERSION ${{TRITON_CONTAINER_VERSION}}
+ENV TRITON_SERVER_VERSION=${{TRITON_VERSION}}
+ENV NVIDIA_TRITON_SERVER_VERSION=${{TRITON_CONTAINER_VERSION}}
 LABEL com.nvidia.tritonserver.version="${{TRITON_SERVER_VERSION}}"
 
-RUN setx path "%path%;C:\opt\tritonserver\bin"
+RUN setx path "%path%;C:\\opt\\tritonserver\\bin"
 
 """.format(
         argmap["TRITON_VERSION"],
@@ -1838,7 +1822,7 @@ def create_docker_build_script(script_name, container_install_dir, container_ci_
         if target_platform() == "windows":
             if FLAGS.container_memory:
                 runargs += ["--memory", FLAGS.container_memory]
-            runargs += ["-v", "\\\\.\pipe\docker_engine:\\\\.\pipe\docker_engine"]
+            runargs += ["-v", "\\\\.\\pipe\\docker_engine:\\\\.\\pipe\\docker_engine"]
         else:
             runargs += ["-v", "/var/run/docker.sock:/var/run/docker.sock"]
             if FLAGS.use_user_docker_config:

qa/L0_backend_bls/test.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2022-2024, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# Copyright 2022-2025, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -45,7 +45,7 @@ apt update -q=2 \
     && . /etc/os-release \
     && echo "deb [signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ $UBUNTU_CODENAME main" | tee /etc/apt/sources.list.d/kitware.list >/dev/null \
     && apt-get update -q=2 \
-    && apt-get install -y --no-install-recommends cmake=3.28.3* cmake-data=3.28.3* \
+    && apt-get install -y --no-install-recommends cmake=4.0.3* cmake-data=4.0.3* \
             rapidjson-dev
 cmake --version
 

qa/L0_backend_python/common.sh

@@ -51,7 +51,7 @@ install_build_deps_apt() {
     && . /etc/os-release \
     && echo "deb [signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ $UBUNTU_CODENAME main" | tee /etc/apt/sources.list.d/kitware.list >/dev/null \
     && apt-get update -q=2 \
-    && apt-get install -y --no-install-recommends cmake=3.28.3* cmake-data=3.28.3*
+    && apt-get install -y --no-install-recommends cmake=4.0.3* cmake-data=4.0.3*
 }
 
 install_build_deps_yum() {

qa/L0_backend_tutorial/test.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2022-2024, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# Copyright 2022-2025, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -48,7 +48,7 @@ apt update -q=2 \
     && . /etc/os-release \
     && echo "deb [signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ $UBUNTU_CODENAME main" | tee /etc/apt/sources.list.d/kitware.list >/dev/null \
     && apt-get update -q=2 \
-    && apt-get install -y --no-install-recommends cmake=3.28.3* cmake-data=3.28.3* \
+    && apt-get install -y --no-install-recommends cmake=4.0.3* cmake-data=4.0.3* \
             rapidjson-dev
 cmake --version
 

qa/L0_batch_custom/test.sh

@@ -68,7 +68,7 @@ apt update -q=2 \
     && . /etc/os-release \
     && echo "deb [signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ $UBUNTU_CODENAME main" | tee /etc/apt/sources.list.d/kitware.list >/dev/null \
     && apt-get update -q=2 \
-    && apt-get install -y --no-install-recommends cmake=3.28.3* cmake-data=3.28.3* rapidjson-dev
+    && apt-get install -y --no-install-recommends cmake=4.0.3* cmake-data=4.0.3* rapidjson-dev
 cmake --version
 
 # Set up repository

qa/L0_client_build_variants/test.sh

@@ -38,7 +38,7 @@ apt update -q=2 \
     && . /etc/os-release \
     && echo "deb [signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ $UBUNTU_CODENAME main" | tee /etc/apt/sources.list.d/kitware.list >/dev/null \
     && apt-get update -q=2 \
-    && apt-get install -y --no-install-recommends cmake=3.28.3* cmake-data=3.28.3*
+    && apt-get install -y --no-install-recommends cmake=4.0.3* cmake-data=4.0.3*
 cmake --version