From 7f851f4e6185d75efe9cd652b977c6004c7fb161 Mon Sep 17 00:00:00 2001 From: Jian Chen Date: Tue, 27 Aug 2024 10:36:17 -0700 Subject: [PATCH] Removing docker_base_image parameter and variables (#21864) ### Description Removing `docker_base_image` parameter and variables. From the Cuda Packaging pipeline. ### Motivation and Context Since the docker image is hard coded in the `onnxruntime/tools/ci_build/github/linux/docker/inference/x86_64/default/cuda12/Dockerfile` and `onnxruntime/tools/ci_build/github/linux/docker/inference/x86_64/default/cuda11/Dockerfile` This parameter and variable is no longer needed. --- .../azure-pipelines/c-api-noopenmp-packaging-pipelines.yml | 1 - .../github/azure-pipelines/cuda-packaging-pipeline.yml | 6 ------ .../azure-pipelines/stages/nuget-combine-cuda-stage.yml | 4 ---- .../stages/nuget-linux-cuda-packaging-stage.yml | 4 +--- 4 files changed, 1 insertion(+), 14 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 6fdec323c2..24342ee977 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 @@ -122,7 +122,6 @@ stages: parameters: DoCompliance: ${{ parameters.DoCompliance }} CudaVersion: 11.8 - docker_base_image: 'nvidia/cuda:11.8.0-cudnn8-devel-ubi8' RunOnnxRuntimeTests: ${{ parameters.RunOnnxRuntimeTests }} UseIncreasedTimeoutForTests: ${{ parameters.UseIncreasedTimeoutForTests }} win_trt_home: ${{ variables.win_trt_home }} diff --git a/tools/ci_build/github/azure-pipelines/cuda-packaging-pipeline.yml b/tools/ci_build/github/azure-pipelines/cuda-packaging-pipeline.yml index ad5bfd3b2d..785dc901d6 100644 --- a/tools/ci_build/github/azure-pipelines/cuda-packaging-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/cuda-packaging-pipeline.yml @@ -61,11 +61,6 @@ parameters: variables: - name: ReleaseVersionSuffix value: '' - - name: docker_base_image - ${{ if eq(parameters.CudaVersion, '11.8') }}: - value: nvidia/cuda:11.8.0-cudnn8-devel-ubi8 - ${{ if eq(parameters.CudaVersion, '12.2') }}: - value: nvidia/cuda:12.2.2-cudnn8-devel-ubi8 - name: win_trt_home ${{ if eq(parameters.CudaVersion, '11.8') }}: value: $(Agent.TempDirectory)\TensorRT-10.3.0.26.Windows10.x86_64.cuda-11.8 @@ -114,7 +109,6 @@ stages: parameters: DoCompliance: ${{ parameters.DoCompliance }} CudaVersion: ${{ parameters.CudaVersion }} - docker_base_image: ${{ variables.docker_base_image }} RunOnnxRuntimeTests: ${{ parameters.RunOnnxRuntimeTests }} UseIncreasedTimeoutForTests: ${{ parameters.UseIncreasedTimeoutForTests }} win_trt_home: ${{ variables.win_trt_home }} diff --git a/tools/ci_build/github/azure-pipelines/stages/nuget-combine-cuda-stage.yml b/tools/ci_build/github/azure-pipelines/stages/nuget-combine-cuda-stage.yml index 0d5aa7387b..88ae30c1eb 100644 --- a/tools/ci_build/github/azure-pipelines/stages/nuget-combine-cuda-stage.yml +++ b/tools/ci_build/github/azure-pipelines/stages/nuget-combine-cuda-stage.yml @@ -11,9 +11,6 @@ parameters: - name: CudaVersion type: string -- name: docker_base_image - type: string - - name: win_trt_home type: string @@ -42,7 +39,6 @@ stages: - template: nuget-linux-cuda-packaging-stage.yml parameters: CudaVersion: ${{ parameters.CudaVersion }} - docker_base_image: ${{ parameters.docker_base_image }} buildJava: ${{ parameters.buildJava }} buildNodejs: ${{ parameters.buildNodejs }} diff --git a/tools/ci_build/github/azure-pipelines/stages/nuget-linux-cuda-packaging-stage.yml b/tools/ci_build/github/azure-pipelines/stages/nuget-linux-cuda-packaging-stage.yml index 1f84b7796d..dcde93e261 100644 --- a/tools/ci_build/github/azure-pipelines/stages/nuget-linux-cuda-packaging-stage.yml +++ b/tools/ci_build/github/azure-pipelines/stages/nuget-linux-cuda-packaging-stage.yml @@ -2,8 +2,6 @@ parameters: - name: CudaVersion type: string default: '11.8' -- name: docker_base_image - type: string - name: buildJava type: boolean - name: buildNodejs @@ -167,7 +165,7 @@ stages: ScriptName: $(Build.SourcesDirectory)/onnxruntime/tools/ci_build/get_docker_image.py Dockerfile: $(Build.SourcesDirectory)/onnxruntime/tools/ci_build/github/linux/docker/inference/x86_64/default/cuda${{ variables.CUDA_VERSION_MAJOR }}/Dockerfile Context: $(Build.SourcesDirectory)/onnxruntime/tools/ci_build/github/linux/docker/inference/x86_64/default/cuda${{ variables.CUDA_VERSION_MAJOR }} - DockerBuildArgs: "--build-arg BASEIMAGE=${{ variables.docker_base_image }} --build-arg TRT_VERSION=${{ variables.linux_trt_version }} --build-arg BUILD_UID=$( id -u )" + DockerBuildArgs: "--build-arg TRT_VERSION=${{ variables.linux_trt_version }} --build-arg BUILD_UID=$( id -u )" Repository: onnxruntimecuda${{ variables.CUDA_VERSION_MAJOR }}xtrt86build UpdateDepsTxt: false