Merge remote-tracking branch 'origin/yinggeh-DLIS-8435-fix-dcgm-requirement' into mwittwer/explicit_model_load_parsing

Author: mattwittwer

Dockerfile.sdk

@@ -265,7 +265,9 @@ RUN if [ "$TRITON_ENABLE_GPU" = "ON" ]; then \
         curl -o /tmp/cuda-keyring.deb \
         https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2404/$arch/cuda-keyring_1.1-1_all.deb \
         && apt install /tmp/cuda-keyring.deb && rm /tmp/cuda-keyring.deb && \
-        apt update && apt install --yes datacenter-gpu-manager-4-dev=1:${DCGM_VERSION}; \
+        apt update && \
+        apt install --yes datacenter-gpu-manager-4-core=1:${DCGM_VERSION} && \
+        apt install --yes datacenter-gpu-manager-4-dev=1:${DCGM_VERSION}; \
     fi
 
 # Build expects "python" executable (not python3).

build.py

@@ -858,19 +858,21 @@ def install_dcgm_libraries(dcgm_version, target_machine):
 # Install DCGM. Steps from https://developer.nvidia.com/dcgm#Downloads
 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:{} \\
     && dnf install --assumeyes datacenter-gpu-manager-4-devel=1:{}
 """.format(
-                    dcgm_version, dcgm_version
+                    dcgm_version, dcgm_version, dcgm_version
                 )
             else:
                 return """
 ENV DCGM_VERSION {}
 # Install DCGM. Steps from https://developer.nvidia.com/dcgm#Downloads
 RUN dnf config-manager --add-repo https://developer.download.nvidia.com/compute/cuda/repos/rhel8/x86_64/cuda-rhel8.repo \\
     && dnf clean expire-cache \\
+    && dnf install --assumeyes datacenter-gpu-manager-4-core=1:{} \\
     && dnf install --assumeyes datacenter-gpu-manager-4-devel=1:{}
 """.format(
-                    dcgm_version, dcgm_version
+                    dcgm_version, dcgm_version, dcgm_version
                 )
         else:
             if target_machine == "aarch64":
@@ -882,9 +884,10 @@ def install_dcgm_libraries(dcgm_version, target_machine):
       && apt install /tmp/cuda-keyring.deb \\
       && rm /tmp/cuda-keyring.deb \\
       && apt update \\
+      && apt install --yes datacenter-gpu-manager-4-core=1:{} \\
       && apt install --yes datacenter-gpu-manager-4-dev=1:{}
 """.format(
-                    dcgm_version, dcgm_version
+                    dcgm_version, dcgm_version, dcgm_version
                 )
             else:
                 return """
@@ -895,9 +898,10 @@ def install_dcgm_libraries(dcgm_version, target_machine):
       && apt install /tmp/cuda-keyring.deb \\
       && rm /tmp/cuda-keyring.deb \\
       && apt update \\
+      && apt install --yes datacenter-gpu-manager-4-core=1:{} \\
       && apt install --yes datacenter-gpu-manager-4-dev=1:{}
 """.format(
-                    dcgm_version, dcgm_version
+                    dcgm_version, dcgm_version, dcgm_version
                 )