Skip to content

Commit 7c40d1c

Browse files
committed
Merge branch 'r25.10' of github.com:triton-inference-server/server into yinggeh/tri-49-request-for-openai-compatible-api-endpoints-for-triton
2 parents 876582b + 76eeeec commit 7c40d1c

26 files changed

Lines changed: 83 additions & 58 deletions

File tree

Dockerfile.sdk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#
3030

3131
# Base image on the minimum Triton container
32-
ARG BASE_IMAGE=nvcr.io/nvidia/tritonserver:25.09-py3-min
32+
ARG BASE_IMAGE=nvcr.io/nvidia/tritonserver:25.10-py3-min
3333

3434
ARG TRITON_CLIENT_REPO_SUBDIR=clientrepo
3535
ARG TRITON_REPO_ORGANIZATION=http://github.com/triton-inference-server

README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929

3030
>[!WARNING]
3131
>You are currently on the `main` branch which tracks under-development progress
32-
>towards the next release. The current release is version [2.61.0](https://github.com/triton-inference-server/server/releases/latest)
33-
>and corresponds to the 25.09 container release on NVIDIA GPU Cloud (NGC).
32+
>towards the next release. The current release is version [2.62.0](https://github.com/triton-inference-server/server/releases/latest)
33+
>and corresponds to the 25.10 container release on NVIDIA GPU Cloud (NGC).
3434
3535
# Triton Inference Server
3636

@@ -90,16 +90,16 @@ Inference Server with the
9090

9191
```bash
9292
# Step 1: Create the example model repository
93-
git clone -b r25.09 https://github.com/triton-inference-server/server.git
93+
git clone -b r25.10 https://github.com/triton-inference-server/server.git
9494
cd server/docs/examples
9595
./fetch_models.sh
9696

9797
# Step 2: Launch triton from the NGC Triton container
98-
docker run --gpus=1 --rm --net=host -v ${PWD}/model_repository:/models nvcr.io/nvidia/tritonserver:25.09-py3 tritonserver --model-repository=/models --model-control-mode explicit --load-model densenet_onnx
98+
docker run --gpus=1 --rm --net=host -v ${PWD}/model_repository:/models nvcr.io/nvidia/tritonserver:25.10-py3 tritonserver --model-repository=/models --model-control-mode explicit --load-model densenet_onnx
9999

100100
# Step 3: Sending an Inference Request
101101
# In a separate console, launch the image_client example from the NGC Triton SDK container
102-
docker run -it --rm --net=host nvcr.io/nvidia/tritonserver:25.09-py3-sdk /workspace/install/bin/image_client -m densenet_onnx -c 3 -s INCEPTION /workspace/images/mug.jpg
102+
docker run -it --rm --net=host nvcr.io/nvidia/tritonserver:25.10-py3-sdk /workspace/install/bin/image_client -m densenet_onnx -c 3 -s INCEPTION /workspace/images/mug.jpg
103103

104104
# Inference should return the following
105105
Image '/workspace/images/mug.jpg':

TRITON_VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.63.0dev
1+
2.62.0

build.py

Lines changed: 27 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -71,14 +71,14 @@
7171
#
7272

7373
DEFAULT_TRITON_VERSION_MAP = {
74-
"release_version": "2.63.0dev",
75-
"triton_container_version": "25.11dev",
76-
"upstream_container_version": "25.09",
74+
"release_version": "2.62.0",
75+
"triton_container_version": "25.10",
76+
"upstream_container_version": "25.10",
7777
"ort_version": "1.23.1",
7878
"ort_openvino_version": "2025.3.0",
7979
"standalone_openvino_version": "2025.3.0",
8080
"dcgm_version": "4.4.0-1",
81-
"vllm_version": "0.10.1.1",
81+
"vllm_version": "0.10.2",
8282
"rhel_py_version": "3.12.3",
8383
}
8484

@@ -660,6 +660,10 @@ def pytorch_cmake_args(images):
660660
cargs.append(
661661
cmake_backend_enable("pytorch", "TRITON_ENABLE_NVTX", FLAGS.enable_nvtx)
662662
)
663+
if target_platform() == "igpu":
664+
cargs.append(
665+
cmake_backend_enable("pytorch", "TRITON_PYTORCH_NVSHMEM", False)
666+
)
663667
return cargs
664668

665669

@@ -1278,11 +1282,6 @@ def create_dockerfile_linux(
12781282
pip3 install --no-cache-dir grpcio-tools==1.64.0 && \\
12791283
pip3 uninstall -y setuptools
12801284
ENV LD_LIBRARY_PATH=/usr/local/tensorrt/lib/:/opt/tritonserver/backends/tensorrtllm:$LD_LIBRARY_PATH
1281-
1282-
# There are some ucc issues when spawning mpi processes with ompi v4.1.7a1.
1283-
# Downgrade to ompi v4.1.5rc2 to avoid the issue.
1284-
RUN rm -fr /opt/hpcx/ompi
1285-
COPY --from=nvcr.io/nvidia/tritonserver:24.02-py3-min /opt/hpcx/ompi /opt/hpcx/ompi
12861285
"""
12871286
with open(os.path.join(ddir, dockerfile_name), "w") as dfile:
12881287
dfile.write(df)
@@ -1461,14 +1460,6 @@ def dockerfile_prepare_container_linux(argmap, backends, enable_gpu, target_mach
14611460
virtualenv \\
14621461
&& rm -rf /var/lib/apt/lists/*
14631462
"""
1464-
if "tensorrtllm" in backends:
1465-
df += """
1466-
# Updating the openssh-client to fix for the CVE-2024-6387. This can be removed when trtllm uses a later CUDA container(12.5 or later)
1467-
RUN apt-get update \\
1468-
&& apt-get install -y --no-install-recommends \\
1469-
openssh-client \\
1470-
&& rm -rf /var/lib/apt/lists/*
1471-
"""
14721463

14731464
if "vllm" in backends:
14741465
df += f"""
@@ -1514,6 +1505,25 @@ def dockerfile_prepare_container_linux(argmap, backends, enable_gpu, target_mach
15141505
ENV PYTHONPATH=/opt/tritonserver/backends/dali/wheel/dali:$PYTHONPATH
15151506
"""
15161507

1508+
if (
1509+
target_platform() not in ["igpu", "windows", "rhel"]
1510+
and "tensorrtllm" not in backends
1511+
):
1512+
repo_arch = "sbsa" if target_machine == "aarch64" else "x86_64"
1513+
df += f"""
1514+
RUN curl -o /tmp/cuda-keyring.deb \\
1515+
https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2404/{repo_arch}/cuda-keyring_1.1-1_all.deb \\
1516+
&& apt install /tmp/cuda-keyring.deb \\
1517+
&& rm /tmp/cuda-keyring.deb \\
1518+
&& apt update -qq \\
1519+
&& apt install --yes --no-install-recommends libnvshmem3-cuda-13 \\
1520+
&& rm -rf /var/lib/apt/lists/* \\
1521+
&& dpkg -L libnvshmem3-cuda-13 | grep libnvshmem_host.so | sed -e 's/libnvshmem_host.*//g' | sort -u > /etc/ld.so.conf.d/libnvshmem3-cuda-13.conf \\
1522+
&& ldconfig
1523+
""".format(
1524+
repo_arch=repo_arch
1525+
)
1526+
15171527
df += """
15181528
WORKDIR /opt/tritonserver
15191529
RUN rm -fr /opt/tritonserver/*

deploy/aws/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
replicaCount: 1
2828

2929
image:
30-
imageName: nvcr.io/nvidia/tritonserver:25.09-py3
30+
imageName: nvcr.io/nvidia/tritonserver:25.10-py3
3131
pullPolicy: IfNotPresent
3232
modelRepositoryPath: s3://triton-inference-server-repository/model_repository
3333
numGpus: 1

deploy/fleetcommand/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
apiVersion: v1
2828
# appVersion is the Triton version; update when changing release
29-
appVersion: 2.61.0"
29+
appVersion: 2.62.0"
3030
description: Triton Inference Server (Fleet Command)
3131
name: triton-inference-server
3232
# version is the Chart version; update when changing anything in the chart

deploy/fleetcommand/values.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
replicaCount: 1
2828

2929
image:
30-
imageName: nvcr.io/nvidia/tritonserver:25.09-py3
30+
imageName: nvcr.io/nvidia/tritonserver:25.10-py3
3131
pullPolicy: IfNotPresent
3232
numGpus: 1
3333
serverCommand: tritonserver
@@ -47,13 +47,13 @@ image:
4747
#
4848
# To set model control mode, uncomment and configure below
4949
# TODO: Fix the following url, it is invalid
50-
# See https://github.com/triton-inference-server/server/blob/r25.09/docs/user_guide/model_management.md
50+
# See https://github.com/triton-inference-server/server/blob/r25.10/docs/user_guide/model_management.md
5151
# for more details
5252
#- --model-control-mode=explicit|poll|none
5353
#
5454
# Additional server args
5555
#
56-
# see https://github.com/triton-inference-server/server/blob/r25.09/README.md
56+
# see https://github.com/triton-inference-server/server/blob/r25.10/README.md
5757
# for more details
5858

5959
service:

deploy/gcp/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
replicaCount: 1
2828

2929
image:
30-
imageName: nvcr.io/nvidia/tritonserver:25.09-py3
30+
imageName: nvcr.io/nvidia/tritonserver:25.10-py3
3131
pullPolicy: IfNotPresent
3232
modelRepositoryPath: gs://triton-inference-server-repository/model_repository
3333
numGpus: 1

deploy/gke-marketplace-app/benchmark/perf-analyzer-script/triton_client.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ metadata:
3333
namespace: default
3434
spec:
3535
containers:
36-
- image: nvcr.io/nvidia/tritonserver:25.09-py3-sdk
36+
- image: nvcr.io/nvidia/tritonserver:25.10-py3-sdk
3737
imagePullPolicy: Always
3838
name: nv-triton-client
3939
securityContext:

deploy/gke-marketplace-app/server-deployer/build_and_push.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@
2727

2828
export REGISTRY=gcr.io/$(gcloud config get-value project | tr ':' '/')
2929
export APP_NAME=tritonserver
30-
export MAJOR_VERSION=2.61
31-
export MINOR_VERSION=2.61.0
32-
export NGC_VERSION=25.09-py3
30+
export MAJOR_VERSION=2.62
31+
export MINOR_VERSION=2.62.0
32+
export NGC_VERSION=25.10-py3
3333

3434
docker pull nvcr.io/nvidia/$APP_NAME:$NGC_VERSION
3535

0 commit comments

Comments
 (0)