Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[TensorRT EP] support TensorRT 10.8-GA #23505

Closed
wants to merge 5 commits into from
Closed
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
trt10.8ga
yf711 committed Jan 27, 2025
commit 0ee4053835096f7d495e63fd33afb83b6de73f70
4 changes: 2 additions & 2 deletions onnxruntime/python/tools/tensorrt/perf/build/build_image.py
Original file line number Diff line number Diff line change
@@ -18,8 +18,8 @@
TRT_DOCKER_FILES = {
"8.6_cuda11.8_cudnn8": "tools/ci_build/github/linux/docker/Dockerfile.ubuntu_cuda11_8_tensorrt8_6",
"8.6_cuda12.3_cudnn9": "tools/ci_build/github/linux/docker/Dockerfile.ubuntu_cuda12_3_tensorrt8_6",
"10.7_cuda11.8_cudnn8": "tools/ci_build/github/linux/docker/Dockerfile.ubuntu_cuda11_tensorrt10",
"10.7_cuda12.5_cudnn9": "tools/ci_build/github/linux/docker/Dockerfile.ubuntu_cuda12_tensorrt10",
"10.8_cuda11.8_cudnn8": "tools/ci_build/github/linux/docker/Dockerfile.ubuntu_cuda11_tensorrt10",
"10.8_cuda12.5_cudnn9": "tools/ci_build/github/linux/docker/Dockerfile.ubuntu_cuda12_tensorrt10",
"BIN": "tools/ci_build/github/linux/docker/Dockerfile.ubuntu_tensorrt_bin",
}

Original file line number Diff line number Diff line change
@@ -8,12 +8,12 @@ parameters:
- name: TrtVersion
displayName: TensorRT Version
type: string
default: 10.7_cuda12.5_cudnn9
default: 10.8_cuda12.5_cudnn9
values:
- 8.6_cuda11.8_cudnn8
- 8.6_cuda12.3_cudnn9
- 10.7_cuda11.8_cudnn8
- 10.7_cuda12.5_cudnn9
- 10.8_cuda11.8_cudnn8
- 10.8_cuda12.5_cudnn9
- BIN

- name: UseTensorrtOssParser
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
variables:
common_trt_version: '10.7.0.23'
common_trt_version: '10.8.0.43'
# As for Debian installation, replace '-1.' by '-1+' when assigning trt version below
linux_trt_version_cuda11: ${{ variables.common_trt_version }}-1.cuda11.8
linux_trt_version_cuda12: ${{ variables.common_trt_version }}-1.cuda12.6
linux_trt_version_cuda12: ${{ variables.common_trt_version }}-1.cuda12.8
win_trt_folder_cuda11: TensorRT-${{ variables.common_trt_version }}.Windows10.x86_64.cuda-11.8
win_trt_folder_cuda12: TensorRT-${{ variables.common_trt_version }}.Windows10.x86_64.cuda-12.6
win_trt_folder_cuda12: TensorRT-${{ variables.common_trt_version }}.Windows10.x86_64.cuda-12.8
Original file line number Diff line number Diff line change
@@ -13,10 +13,10 @@ parameters:
- 12.2
- name: TrtVersion
type: string
default: '10.7.0.23'
default: '10.8.0.43'
values:
- 8.6.1.6
- 10.7.0.23
- 10.8.0.43

steps:
- ${{ if eq(parameters.DownloadCUDA, true) }}:
@@ -42,7 +42,7 @@ steps:
- powershell: |
Write-Host "##vso[task.setvariable variable=trtCudaVersion;]12.0"
displayName: Set trtCudaVersion
- ${{ if and(eq(parameters.CudaVersion, '12.2'), eq(parameters.TrtVersion, '10.7.0.23')) }}:
- ${{ if and(eq(parameters.CudaVersion, '12.2'), eq(parameters.TrtVersion, '10.8.0.43')) }}:
- powershell: |
Write-Host "##vso[task.setvariable variable=trtCudaVersion;]12.6"
displayName: Set trtCudaVersion
Original file line number Diff line number Diff line change
@@ -15,10 +15,10 @@ parameters:
default: '11.8'
- name: win_trt_folder_cuda11
type: string
default: 'TensorRT-10.7.0.23.Windows10.x86_64.cuda-11.8'
default: 'TensorRT-10.8.0.43.Windows10.x86_64.cuda-11.8'
- name: win_trt_folder_cuda12
type: string
default: 'TensorRT-10.7.0.23.Windows10.x86_64.cuda-12.6'
default: 'TensorRT-10.8.0.43.Windows10.x86_64.cuda-12.8'

steps:
- ${{ if eq(parameters.DownloadCUDA, 'true') }}:
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@

# Build base image with required system packages
ARG BASEIMAGE=nvidia/cuda:12.5.1-cudnn-devel-ubi8
ARG TRT_VERSION=10.7.0.23-1.cuda12.6
ARG TRT_VERSION=10.8.0.43-1.cuda12.8
FROM $BASEIMAGE AS base
ARG TRT_VERSION
ENV PATH=/opt/python/cp310-cp310/bin:/usr/local/nvidia/bin:/usr/local/cuda/bin:/usr/src/tensorrt/bin:${PATH}
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@

# Build base image with required system packages
ARG BASEIMAGE=nvidia/cuda:11.8.0-cudnn8-devel-ubi8
ARG TRT_VERSION=10.7.0.23-1.cuda11.8
ARG TRT_VERSION=10.8.0.43-1.cuda11.8
FROM $BASEIMAGE AS base
ARG TRT_VERSION
ENV PATH=/opt/python/cp310-cp310/bin:/usr/local/nvidia/bin:/usr/local/cuda/bin:/usr/src/tensorrt/bin:${PATH}
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@

# Build base image with required system packages
ARG BASEIMAGE=nvidia/cuda:11.8.0-cudnn8-devel-ubuntu20.04
ARG TRT_VERSION=10.7.0.23-1+cuda11.8
ARG TRT_VERSION=10.8.0.43-1+cuda11.8
ARG LD_LIBRARY_PATH_ARG=/usr/local/lib64:/usr/local/cuda/lib64
FROM $BASEIMAGE AS base
ARG TRT_VERSION
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@

# Build base image with required system packages
ARG BASEIMAGE=nvidia/cuda:11.8.0-cudnn8-devel-ubuntu22.04
ARG TRT_VERSION=10.7.0.23-1+cuda11.8
ARG TRT_VERSION=10.8.0.43-1+cuda11.8
ARG LD_LIBRARY_PATH_ARG=/usr/local/lib64:/usr/local/cuda/lib64
FROM $BASEIMAGE AS base
ARG TRT_VERSION
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@

# Build base image with required system packages
ARG BASEIMAGE=nvidia/cuda:11.8.0-cudnn8-devel-ubuntu22.04
ARG TRT_VERSION=10.7.0.23-1+cuda11.8
ARG TRT_VERSION=10.8.0.43-1+cuda11.8
ARG LD_LIBRARY_PATH_ARG=/usr/local/lib64:/usr/local/cuda/lib64
FROM $BASEIMAGE AS base
ARG TRT_VERSION
Original file line number Diff line number Diff line change
@@ -31,7 +31,7 @@ RUN pip install --upgrade pip
RUN pip install psutil setuptools>=68.2.2

# Install TensorRT
RUN TRT_VERSION="10.7.0.23-1+cuda11.8" &&\
RUN TRT_VERSION="10.8.0.43-1+cuda11.8" &&\
apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64/7fa2af80.pub &&\
apt-get update &&\
apt-get install -y \
Original file line number Diff line number Diff line change
@@ -31,7 +31,7 @@ RUN pip install --upgrade pip
RUN pip install setuptools>=68.2.2 psutil

# Install TensorRT
RUN TRT_VERSION="10.7.0.23-1+cuda12.6" &&\
RUN TRT_VERSION="10.8.0.43-1+cuda12.8" &&\
apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64/7fa2af80.pub &&\
apt-get update &&\
apt-get install -y \
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@
ARG BASEIMAGE=nvidia/cuda:11.8.0-cudnn8-devel-ubi8

FROM $BASEIMAGE
ARG TRT_VERSION=10.7.0.23-1.cuda11.8
ARG TRT_VERSION=10.8.0.43-1.cuda11.8

#Install TensorRT only if TRT_VERSION is not empty
RUN if [ -n "${TRT_VERSION}" ]; then \
4 changes: 2 additions & 2 deletions tools/ci_build/github/windows/setup_env_gpu.bat
Original file line number Diff line number Diff line change
@@ -6,10 +6,10 @@ if exist PATH=%AGENT_TEMPDIRECTORY%\v12.2\ (
) else (
set PATH=C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v12.2\bin;C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v12.2\extras\CUPTI\lib64;%PATH%
)
set PATH=%AGENT_TEMPDIRECTORY%\TensorRT-10.7.0.23.Windows10.x86_64.cuda-12.6\lib;%PATH%
set PATH=%AGENT_TEMPDIRECTORY%\TensorRT-10.8.0.43.Windows10.x86_64.cuda-12.8\lib;%PATH%

@REM The default version is still cuda v12.2, because set cuda v11.8 after it
set PATH=%PATH%;%AGENT_TEMPDIRECTORY%\TensorRT-10.7.0.23.Windows10.x86_64.cuda-11.8\lib
set PATH=%PATH%;%AGENT_TEMPDIRECTORY%\TensorRT-10.8.0.43.Windows10.x86_64.cuda-11.8\lib
if exist PATH=%AGENT_TEMPDIRECTORY%\v11.8\ (
set PATH=%PATH%;%AGENT_TEMPDIRECTORY%\v11.8\bin;%AGENT_TEMPDIRECTORY%\v11.8\extras\CUPTI\lib64
) else (
2 changes: 1 addition & 1 deletion tools/ci_build/github/windows/setup_env_trt.bat
Original file line number Diff line number Diff line change
@@ -6,6 +6,6 @@ if exist PATH=%AGENT_TEMPDIRECTORY%\v12.2\ (
) else (
set PATH=%PATH%;C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v12.2\bin;C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v12.2\extras\CUPTI\lib64
)
set PATH=%AGENT_TEMPDIRECTORY%\TensorRT-10.7.0.23.Windows10.x86_64.cuda-12.6\lib;%PATH%
set PATH=%AGENT_TEMPDIRECTORY%\TensorRT-10.8.0.43.Windows10.x86_64.cuda-12.8\lib;%PATH%
set GRADLE_OPTS=-Dorg.gradle.daemon=false
set CUDA_MODULE_LOADING=LAZY

Unchanged files with check annotations Beta

}
private:
std::codecvt_utf8<wchar_t> converter_;

Check warning on line 224 in onnxruntime/core/providers/cpu/text/string_normalizer.cc

GitHub Actions / Vcpkg

'codecvt_utf8<wchar_t>' is deprecated [-Wdeprecated-declarations]

Check warning on line 224 in onnxruntime/core/providers/cpu/text/string_normalizer.cc

GitHub Actions / Vcpkg

'codecvt_utf8<wchar_t>' is deprecated [-Wdeprecated-declarations]
};
// We need to specialize for MS as there is