Skip to content

Commit 9567bbf

Browse files
authored
fix: remove outdated script, linter errors in build (#967)
1 parent f111d10 commit 9567bbf

File tree

2 files changed

+9
-21
lines changed

2 files changed

+9
-21
lines changed

Dockerfile

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2020-2023, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
1+
# Copyright 2020-2025, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
22
#
33
# Licensed under the Apache License, Version 2.0 (the "License");
44
# you may not use this file except in compliance with the License.
@@ -17,9 +17,9 @@ ARG TRITONSDK_BASE_IMAGE=nvcr.io/nvidia/tritonserver:24.12-py3-sdk
1717

1818
ARG MODEL_ANALYZER_VERSION=1.48.0dev
1919
ARG MODEL_ANALYZER_CONTAINER_VERSION=25.01dev
20-
FROM ${TRITONSDK_BASE_IMAGE} as sdk
20+
FROM ${TRITONSDK_BASE_IMAGE} AS sdk
2121

22-
FROM $BASE_IMAGE
22+
FROM ${BASE_IMAGE}
2323
ARG MODEL_ANALYZER_VERSION
2424
ARG MODEL_ANALYZER_CONTAINER_VERSION
2525
ARG BASE_IMAGE
@@ -85,8 +85,8 @@ RUN python3 -m pip install yapf==0.32.0
8585
RUN apt-get install -y wkhtmltopdf
8686

8787
ENTRYPOINT ["/opt/triton-model-analyzer/nvidia_entrypoint.sh"]
88-
ENV MODEL_ANALYZER_VERSION ${MODEL_ANALYZER_VERSION}
89-
ENV MODEL_ANALYZER_CONTAINER_VERSION ${MODEL_ANALYZER_CONTAINER_VERSION}
90-
ENV TRITON_SERVER_SDK_CONTAINER_IMAGE_NAME ${TRITONSDK_BASE_IMAGE}
91-
ENV TRITON_SERVER_CONTAINER_IMAGE_NAME ${BASE_IMAGE}
88+
ENV MODEL_ANALYZER_VERSION=${MODEL_ANALYZER_VERSION}
89+
ENV MODEL_ANALYZER_CONTAINER_VERSION=${MODEL_ANALYZER_CONTAINER_VERSION}
90+
ENV TRITON_SERVER_SDK_CONTAINER_IMAGE_NAME=${TRITONSDK_BASE_IMAGE}
91+
ENV TRITON_SERVER_CONTAINER_IMAGE_NAME=${BASE_IMAGE}
9292

nvidia_entrypoint.sh

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
#!/bin/bash
2-
# Copyright (c) 2021, NVIDIA CORPORATION. All rights reserved.
1+
#!/usr/bin/env bash
2+
# Copyright 2021-2025, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
33
#
44
# Licensed under the Apache License, Version 2.0 (the "License");
55
# you may not use this file except in compliance with the License.
@@ -14,17 +14,6 @@
1414
# limitations under the License.
1515

1616
set -e
17-
cat <<EOF
18-
=============================
19-
=== Triton Model Analyzer ===
20-
=============================
21-
NVIDIA Release ${MODEL_ANALYZER_CONTAINER_VERSION} (build ${NVIDIA_BUILD_ID})
22-
Copyright (c) 2020-2021, NVIDIA CORPORATION. All rights reserved.
23-
Various files include modifications (c) NVIDIA CORPORATION. All rights reserved.
24-
This container image and its contents are governed by the NVIDIA Deep Learning Container License.
25-
By pulling and using the container, you accept the terms and conditions of this license:
26-
https://developer.nvidia.com/ngc/nvidia-deep-learning-container-license
27-
EOF
2817

2918
if [[ "$(find -L /usr -name libcuda.so.1 | grep -v "compat") " == " " || "$(ls /dev/nvidiactl 2>/dev/null) " == " " ]]; then
3019
echo
@@ -34,7 +23,6 @@ if [[ "$(find -L /usr -name libcuda.so.1 | grep -v "compat") " == " " || "$(ls /
3423
ln -s `find / -name libnvidia-ml.so -print -quit` /opt/tritonserver/lib/libnvidia-ml.so.1
3524
export TRITON_SERVER_CPU_ONLY=1
3625
else
37-
( /usr/local/bin/checkSMVER.sh )
3826
DRIVER_VERSION=$(sed -n 's/^NVRM.*Kernel Module *\([0-9.]*\).*$/\1/p' /proc/driver/nvidia/version 2>/dev/null || true)
3927
if [[ ! "$DRIVER_VERSION" =~ ^[0-9]*.[0-9]*(.[0-9]*)?$ ]]; then
4028
echo "Failed to detect NVIDIA driver version."

0 commit comments

Comments
 (0)