finish rebase

Author: mc-nv

Dockerfile.sdk

@@ -263,13 +263,7 @@ RUN pip3 install --upgrade "numpy<2" pillow attrdict && \
          "tritonclient-*linux*.whl" | xargs printf -- '%s[all]' | \
     xargs pip3 install --upgrade
 
-ARG DCGM_SOURCE_LIST
 # Install DCGM
-RUN if [ -n "${DCGM_SOURCE_LIST}" ]; then \
-        echo "deb [trusted=yes] $DCGM_SOURCE_LIST / " > /etc/apt/sources.list.d/dcgm-list.list && \
-        cat /etc/apt/sources.list.d/dcgm-list.list; \
-    fi
-
 RUN if [ "$TRITON_ENABLE_GPU" = "ON" ]; then \
         [ "$(uname -m)" != "x86_64" ] && arch="sbsa" || arch="x86_64" && \
         curl -o /tmp/cuda-keyring.deb \

build.py

@@ -74,11 +74,11 @@
     "release_version": "2.60.0dev",
     "triton_container_version": "25.08dev",
     "upstream_container_version": "25.07",
-    "ort_version": "1.22.0",
+    "ort_version": "1.23.0",
     "ort_openvino_version": "2025.2.0",
     "standalone_openvino_version": "2025.2.0",
     "dcgm_version": "4.2.3-2",
-    "vllm_version": "0.9.0.1",
+    "vllm_version": "0.9.2",
     "rhel_py_version": "3.12.3",
 }
 
@@ -841,15 +841,7 @@ def tensorrtllm_cmake_args(images):
     return cargs
 
 
-def install_dcgm_libraries(dcgm_version):
-    if os.getenv("DCGM_SOURCE_LIST"):
-        dcgm_source_list = """
-RUN echo "deb [trusted=yes] {} / " > /etc/apt/sources.list.d/dcgm-list.list \\
-    && cat /etc/apt/sources.list.d/dcgm-list.list""".format(
-            os.getenv("DCGM_SOURCE_LIST")
-        )
-    else:
-        dcgm_source_list = ""
+def install_dcgm_libraries(dcgm_version, target_machine):
     if dcgm_version == "":
         fail(
             "unable to determine default repo-tag, DCGM version not known for {}".format(
@@ -860,13 +852,11 @@ def install_dcgm_libraries(dcgm_version):
     else:
         # RHEL has the same install instructions for both aarch64 and x86
         if target_platform() == "rhel":
-            return (
-                dcgm_source_list
-                + """
+            if target_machine == "aarch64":
+                return """
 ENV DCGM_VERSION {}
 # Install DCGM. Steps from https://developer.nvidia.com/dcgm#Downloads
-RUN ARCH=$( [ $(uname -m) = "x86_64" ] && echo "$(uname -m)" || echo "sbsa" ) && \\
-    && dnf config-manager --add-repo https://developer.download.nvidia.com/compute/cuda/repos/rhel8/${{ARCH}}/cuda-rhel8.repo \\
+RUN dnf config-manager --add-repo https://developer.download.nvidia.com/compute/cuda/repos/rhel8/sbsa/cuda-rhel8.repo \\
     && dnf clean expire-cache \\
     && dnf install --assumeyes \\
                  datacenter-gpu-manager-4-core=1:{} \\
@@ -886,16 +876,13 @@ def install_dcgm_libraries(dcgm_version):
 """.format(
                     dcgm_version, dcgm_version, dcgm_version
                 )
-            )
         else:
-            return (
-                dcgm_source_list
-                + """
+            if target_machine == "aarch64":
+                return """
 ENV DCGM_VERSION {}
 # Install DCGM. Steps from https://developer.nvidia.com/dcgm#Downloads
-RUN ARCH=$( [ $(uname -m) = "x86_64" ] && echo "$(uname -m)" || echo "sbsa" ) \\
-      && curl -o /tmp/cuda-keyring.deb \\
-        https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2404/${{ARCH}}/cuda-keyring_1.1-1_all.deb \\
+RUN curl -o /tmp/cuda-keyring.deb \\
+        https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2404/sbsa/cuda-keyring_1.1-1_all.deb \\
       && apt install /tmp/cuda-keyring.deb \\
       && rm /tmp/cuda-keyring.deb \\
       && apt update \\
@@ -920,7 +907,6 @@ def install_dcgm_libraries(dcgm_version):
 """.format(
                     dcgm_version, dcgm_version, dcgm_version
                 )
-            )
 
 
 def create_dockerfile_buildbase_rhel(ddir, dockerfile_name, argmap):
@@ -1021,7 +1007,7 @@ def create_dockerfile_buildbase_rhel(ddir, dockerfile_name, argmap):
       && mv /tmp/boost_1_80_0/boost /usr/include/boost
 """
     if FLAGS.enable_gpu:
-        df += install_dcgm_libraries(argmap["DCGM_VERSION"])
+        df += install_dcgm_libraries(argmap["DCGM_VERSION"], target_machine())
     df += """
 ENV TRITON_SERVER_VERSION ${TRITON_VERSION}
 ENV NVIDIA_TRITON_SERVER_VERSION ${TRITON_CONTAINER_VERSION}
@@ -1134,7 +1120,7 @@ def create_dockerfile_buildbase(ddir, dockerfile_name, argmap):
 """
 
         if FLAGS.enable_gpu:
-            df += install_dcgm_libraries(argmap["DCGM_VERSION"])
+            df += install_dcgm_libraries(argmap["DCGM_VERSION"], target_machine())
 
     df += """
 ENV TRITON_SERVER_VERSION ${TRITON_VERSION}
@@ -1426,7 +1412,7 @@ def dockerfile_prepare_container_linux(argmap, backends, enable_gpu, target_mach
         df += fastertransformer_buildscript.create_postbuild(is_multistage_build=False)
 
     if enable_gpu:
-        df += install_dcgm_libraries(argmap["DCGM_VERSION"])
+        df += install_dcgm_libraries(argmap["DCGM_VERSION"], target_machine)
         # This segment will break the RHEL SBSA build. Need to determine whether
         # this is necessary to incorporate.
         if target_platform() != "rhel":