From 7c18c60bc20dcf2006b9e546e3162bdc7e18823c Mon Sep 17 00:00:00 2001 From: Jian Chen Date: Thu, 26 Oct 2023 16:28:57 -0700 Subject: [PATCH] Change cuda image for tensorRT to the one with cudnn8 (#18102) ### Description copilot:summary ### Motivation and Context copliot::walkthrough --- .../c-api-noopenmp-packaging-pipelines.yml | 2 +- .../azure-pipelines/linux-gpu-ci-pipeline.yml | 4 +--- .../linux-gpu-tensorrt-ci-pipeline.yml | 1 - .../linux-gpu-tensorrt-packaging-pipeline.yml | 3 +-- .../azure-pipelines/templates/py-linux-gpu.yml | 3 +-- .../templates/py-packaging-linux-test-cuda.yml | 3 +-- .../linux/docker/Dockerfile.manylinux2_28_cuda | 14 ++------------ 7 files changed, 7 insertions(+), 23 deletions(-) diff --git a/tools/ci_build/github/azure-pipelines/c-api-noopenmp-packaging-pipelines.yml b/tools/ci_build/github/azure-pipelines/c-api-noopenmp-packaging-pipelines.yml index 3696c41c19..14a9bbedf0 100644 --- a/tools/ci_build/github/azure-pipelines/c-api-noopenmp-packaging-pipelines.yml +++ b/tools/ci_build/github/azure-pipelines/c-api-noopenmp-packaging-pipelines.yml @@ -490,7 +490,7 @@ stages: tools/ci_build/get_docker_image.py \ --dockerfile tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_cuda \ --context tools/ci_build/github/linux/docker \ - --docker-build-args "--network=host --build-arg BASEIMAGE=nvidia/cuda:11.8.0-devel-ubi8 --build-arg INSTALL_CUDNN=true --build-arg TRT_VERSION=8.6.1.6-1.cuda11.8 --build-arg BUILD_UID=$( id -u )" \ + --docker-build-args "--network=host --build-arg BASEIMAGE=nvidia/cuda:11.8.0-cudnn8-devel-ubi8 --build-arg TRT_VERSION=8.6.1.6-1.cuda11.8 --build-arg BUILD_UID=$( id -u )" \ --container-registry onnxruntimebuildcache \ --multiple_repos \ --repository onnxruntimecuda118xtrt86build diff --git a/tools/ci_build/github/azure-pipelines/linux-gpu-ci-pipeline.yml b/tools/ci_build/github/azure-pipelines/linux-gpu-ci-pipeline.yml index 1d4681d064..9e1fae343c 100644 --- a/tools/ci_build/github/azure-pipelines/linux-gpu-ci-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/linux-gpu-ci-pipeline.yml @@ -62,9 +62,8 @@ jobs: Context: tools/ci_build/github/linux/docker DockerBuildArgs: " --network=host - --build-arg BASEIMAGE=nvidia/cuda:11.8.0-devel-ubi8 + --build-arg BASEIMAGE=nvidia/cuda:11.8.0-cudnn8-devel-ubi8 --build-arg TRT_VERSION=8.6.1.6-1.cuda11.8 - --build-arg INSTALL_CUDNN=true --build-arg BUILD_UID=$( id -u ) " Repository: onnxruntimecuda11build @@ -166,7 +165,6 @@ jobs: --network=host --build-arg BASEIMAGE=nvidia/cuda:11.8.0-cudnn8-devel-ubi8 --build-arg TRT_VERSION=8.6.1.6-1.cuda11.8 - --build-arg INSTALL_CUDNN=true --build-arg BUILD_UID=$( id -u ) " Repository: onnxruntimecuda11build diff --git a/tools/ci_build/github/azure-pipelines/linux-gpu-tensorrt-ci-pipeline.yml b/tools/ci_build/github/azure-pipelines/linux-gpu-tensorrt-ci-pipeline.yml index 16d4457c45..517c8d638c 100644 --- a/tools/ci_build/github/azure-pipelines/linux-gpu-tensorrt-ci-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/linux-gpu-tensorrt-ci-pipeline.yml @@ -63,7 +63,6 @@ jobs: --network=host --build-arg BASEIMAGE=nvidia/cuda:11.8.0-cudnn8-devel-ubi8 --build-arg TRT_VERSION=8.6.1.6-1.cuda11.8 - --build-arg INSTALL_CUDNN=true --build-arg BUILD_UID=$( id -u ) " Repository: onnxruntimetensorrt86gpubuild diff --git a/tools/ci_build/github/azure-pipelines/templates/linux-gpu-tensorrt-packaging-pipeline.yml b/tools/ci_build/github/azure-pipelines/templates/linux-gpu-tensorrt-packaging-pipeline.yml index 0d58f6cee4..85562d7758 100644 --- a/tools/ci_build/github/azure-pipelines/templates/linux-gpu-tensorrt-packaging-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/templates/linux-gpu-tensorrt-packaging-pipeline.yml @@ -48,9 +48,8 @@ stages: Context: tools/ci_build/github/linux/docker DockerBuildArgs: " --network=host - --build-arg BASEIMAGE=nvidia/cuda:11.8.0-devel-ubi8 + --build-arg BASEIMAGE=nvidia/cuda:11.8.0-cudnn8-devel-ubi8 --build-arg TRT_VERSION=8.6.1.6-1.cuda11.8 - --build-arg INSTALL_CUDNN=true --build-arg BUILD_UID=$( id -u ) " Repository: onnxruntimecuda118xtrt86build diff --git a/tools/ci_build/github/azure-pipelines/templates/py-linux-gpu.yml b/tools/ci_build/github/azure-pipelines/templates/py-linux-gpu.yml index 33c82b5e89..f68847afff 100644 --- a/tools/ci_build/github/azure-pipelines/templates/py-linux-gpu.yml +++ b/tools/ci_build/github/azure-pipelines/templates/py-linux-gpu.yml @@ -40,9 +40,8 @@ jobs: Context: tools/ci_build/github/linux/docker DockerBuildArgs: " --network=host - --build-arg BASEIMAGE=nvidia/cuda:11.8.0-devel-ubi8 + --build-arg BASEIMAGE=nvidia/cuda:11.8.0-cudnn8-devel-ubi8 --build-arg TRT_VERSION=8.6.1.6-1.cuda11.8 - --build-arg INSTALL_CUDNN=true --build-arg BUILD_UID=$( id -u ) --build-arg PLATFORM=${{ parameters.arch }} " diff --git a/tools/ci_build/github/azure-pipelines/templates/py-packaging-linux-test-cuda.yml b/tools/ci_build/github/azure-pipelines/templates/py-packaging-linux-test-cuda.yml index a70e0c01e5..5dad3ad1f5 100644 --- a/tools/ci_build/github/azure-pipelines/templates/py-packaging-linux-test-cuda.yml +++ b/tools/ci_build/github/azure-pipelines/templates/py-packaging-linux-test-cuda.yml @@ -85,9 +85,8 @@ jobs: Context: tools/ci_build/github/linux/docker DockerBuildArgs: " --network=host - --build-arg BASEIMAGE=nvidia/cuda:11.8.0-devel-ubi8 + --build-arg BASEIMAGE=nvidia/cuda:11.8.0-cudnn8-devel-ubi8 --build-arg TRT_VERSION=8.6.1.6-1.cuda11.8 - --build-arg INSTALL_CUDNN=true --build-arg BUILD_UID=$( id -u ) --build-arg PLATFORM=${{ parameters.arch }} " diff --git a/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_cuda b/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_cuda index 7b2cada736..d4aa9b2690 100644 --- a/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_cuda +++ b/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_cuda @@ -1,14 +1,13 @@ -# The default ARGs are for cuda 12.2 with TRT v = 8.6.1.6-1.cuda12.0 +# The default ARGs are for cuda 11.8 with cudnn8,TensorRT is optional # Please overwirete BASEIMAGE, TRT_VERSION and other arguments with # --docker-build-args ' --build-arg BASEIMAGE=other_base_image --build-arg TRT_VERSION=other_trt_version etc...' # for other cuda version and TRT version ARG POLICY=manylinux_2_28 ARG PLATFORM=x86_64 -ARG BASEIMAGE=nvidia/cuda:12.2.0-devel-ubi8 +ARG BASEIMAGE=nvidia/cuda:11.8.0-cudnn8-devel-ubi8 ARG DEVTOOLSET_ROOTPATH=/usr ARG LD_LIBRARY_PATH_ARG=/usr/local/lib64 ARG PREPEND_PATH=/usr/local/cuda/binet -ARG INSTALL_CUDNN=false #Build manylinux docker image begin FROM $BASEIMAGE AS runtime_base @@ -154,15 +153,6 @@ CMD ["/bin/bash"] #Build manylinux docker image end - -#Install optinal Cudnn -RUN if [ "$INSTALL_CUDNN" = true ]; then \ - CUDA_VERSION=$(nvcc --version | sed -n 's/^.*release \([0-9]\+\.[0-9]\+\).*$/\1/p') && \ - dnf -y install \ - libcudnn8-devel-*cuda${CUDA_VERSION}* \ - libcudnn8-*cuda${CUDA_VERSION}* ; \ -fi - #Install TensorRT only if TRT_VERSION is not empty RUN if [ -n "$TRT_VERSION" ]; then \ echo "TRT_VERSION is $TRT_VERSION" && \