Skip to content

Commit 7574c4c

Browse files
authored
fix: update dependency versions (#969)
1 parent d01bfa2 commit 7574c4c

File tree

2 files changed

+19
-18
lines changed

2 files changed

+19
-18
lines changed

Dockerfile

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
ARG BASE_IMAGE=nvcr.io/nvidia/tritonserver:24.12-py3
16-
ARG TRITONSDK_BASE_IMAGE=nvcr.io/nvidia/tritonserver:24.12-py3-sdk
15+
ARG BASE_IMAGE=nvcr.io/nvidia/tritonserver:25.10-py3
16+
ARG TRITONSDK_BASE_IMAGE=nvcr.io/nvidia/tritonserver:25.10-py3-sdk
1717

1818
ARG MODEL_ANALYZER_VERSION=1.48.0dev
19-
ARG MODEL_ANALYZER_CONTAINER_VERSION=25.01dev
19+
ARG MODEL_ANALYZER_CONTAINER_VERSION=25.11dev
2020
FROM ${TRITONSDK_BASE_IMAGE} AS sdk
2121

2222
FROM ${BASE_IMAGE}
@@ -25,9 +25,6 @@ ARG MODEL_ANALYZER_CONTAINER_VERSION
2525
ARG BASE_IMAGE
2626
ARG TRITONSDK_BASE_IMAGE
2727

28-
# DCGM version to install for Model Analyzer
29-
ENV DCGM_VERSION=3.3.6
30-
3128
# Ensure apt-get won't prompt for selecting options
3229
ENV DEBIAN_FRONTEND=noninteractive
3330

@@ -37,16 +34,20 @@ RUN apt-get update && \
3734
RUN mkdir -p /opt/triton-model-analyzer
3835

3936
# Install architecture-specific components
40-
# Install DCGM
4137

42-
RUN [ "$(uname -m)" != "x86_64" ] && arch="sbsa" || arch="x86_64" && \
43-
curl -o /tmp/cuda-keyring.deb \
44-
https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2404/$arch/cuda-keyring_1.1-1_all.deb && \
45-
apt-get install /tmp/cuda-keyring.deb && rm /tmp/cuda-keyring.deb && \
46-
apt-get update && apt-get install -y --no-install-recommends software-properties-common && \
47-
apt-get install -y datacenter-gpu-manager=1:${DCGM_VERSION};
38+
# Install DCGM version 4.x. Steps from https://developer.nvidia.com/dcgm#Downloads
39+
# Remove any old DCGM installations
40+
RUN dpkg --list datacenter-gpu-manager &> /dev/null && \
41+
apt purge --yes datacenter-gpu-manager || true && \
42+
dpkg --list datacenter-gpu-manager-config &> /dev/null && \
43+
apt purge --yes datacenter-gpu-manager-config || true
44+
45+
RUN apt-get update && \
46+
apt-get install --yes \
47+
--install-recommends \
48+
datacenter-gpu-manager-4-cuda13
4849

49-
# Install Docker
50+
# Install Docker
5051
RUN curl -fsSL https://download.docker.com/linux/ubuntu/gpg -o /etc/apt/keyrings/docker.asc && \
5152
echo \
5253
"deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/ubuntu \
@@ -72,7 +73,7 @@ RUN chmod +x build_wheel.sh && \
7273
rm -f perf_analyzer
7374
RUN python3 -m pip install nvidia-pyindex && \
7475
python3 -m pip install wheels/triton_model_analyzer-*-manylinux*.whl
75-
#Other pip packages
76+
# Install other pip packages
7677
RUN python3 -m pip install coverage
7778
RUN python3 -m pip install mypy
7879
RUN python3 -m pip install types-PyYAML

model_analyzer/monitor/dcgm/dcgm_structs.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -655,15 +655,15 @@ def _LoadDcgmLibrary(libDcgmPath=None):
655655
)
656656
else:
657657
if libDcgmPath:
658-
lib_file = os.path.join(libDcgmPath, "libdcgm.so.3")
658+
lib_file = os.path.join(libDcgmPath, "libdcgm.so.4")
659659
else:
660660
# Try Debian-based distros
661-
lib_file = "/usr/lib/{}-linux-gnu/libdcgm.so.3".format(
661+
lib_file = "/usr/lib/{}-linux-gnu/libdcgm.so.4".format(
662662
platform.machine()
663663
)
664664
if not os.path.isfile(lib_file):
665665
# Presume Redhat-based distros
666-
lib_file = "/usr/lib64/libdcgm.so.3"
666+
lib_file = "/usr/lib64/libdcgm.so.4"
667667

668668
dcgmLib = CDLL(lib_file)
669669

0 commit comments

Comments
 (0)