Skip to content

Commit c7138a2

Browse files
snnnsnnn
authored
Update CMake (microsoft#22516)
This pull request upgrades the CMake version from v3.31.0-rc1 to v3.31.0-rc2 to include a bug fix for CUDA https://gitlab.kitware.com/cmake/cmake/-/merge_requests/9902 from Nvidia company. AB#51692
1 parent 3174e3d commit c7138a2

16 files changed

+20
-20
lines changed

Diff for: ‎tools/ci_build/github/azure-pipelines/bigmodels-ci-pipeline.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ parameters:
4242
variables:
4343
- template: templates/common-variables.yml
4444
- name: docker_base_image
45-
value: onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cuda11_x64_almalinux8_gcc11:20241015.1
45+
value: onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cuda11_x64_almalinux8_gcc11:20241020.1
4646
- name: linux_trt_version
4747
value: 10.3.0.26-1.cuda11.8
4848
- name: Repository

Diff for: ‎tools/ci_build/github/azure-pipelines/linux-gpu-ci-pipeline.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,9 @@ parameters:
4949
variables:
5050
- name: docker_base_image
5151
${{ if eq(parameters.CudaVersion, '11.8') }}:
52-
value: onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cuda11_x64_almalinux8_gcc11:20241015.1
52+
value: onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cuda11_x64_almalinux8_gcc11:20241020.1
5353
${{ if eq(parameters.CudaVersion, '12.2') }}:
54-
value: onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cuda12_x64_ubi8_gcc12:20241015.1
54+
value: onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cuda12_x64_ubi8_gcc12:20241020.1
5555

5656
- name: Repository
5757
${{ if eq(parameters.CudaVersion, '11.8') }}:

Diff for: ‎tools/ci_build/github/azure-pipelines/linux-gpu-tensorrt-ci-pipeline.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ parameters:
3939
variables:
4040
- name: docker_base_image
4141
${{ if eq(parameters.CudaVersion, '11.8') }}:
42-
value: onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cuda11_x64_almalinux8_gcc11:20241015.1
42+
value: onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cuda11_x64_almalinux8_gcc11:20241020.1
4343
${{ if eq(parameters.CudaVersion, '12.2') }}:
44-
value: onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cuda12_x64_ubi8_gcc12:20241015.1
44+
value: onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cuda12_x64_ubi8_gcc12:20241020.1
4545
- name: linux_trt_version
4646
${{ if eq(parameters.CudaVersion, '11.8') }}:
4747
value: 10.4.0.26-1.cuda11.8

Diff for: ‎tools/ci_build/github/azure-pipelines/py-cuda-package-test-pipeline.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ stages:
1818
machine_pool: 'Onnxruntime-Linux-GPU'
1919
python_wheel_suffix: '_gpu'
2020
timeout: 480
21-
docker_base_image: onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cuda12_x64_ubi8_gcc12:20241015.1
21+
docker_base_image: onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cuda12_x64_ubi8_gcc12:20241020.1
2222
trt_version: '10.4.0.26-1.cuda12.6'
2323
cuda_version: '12.2'
2424

Diff for: ‎tools/ci_build/github/azure-pipelines/py-package-test-pipeline.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ stages:
5454
machine_pool: 'Onnxruntime-Linux-GPU'
5555
python_wheel_suffix: '_gpu'
5656
timeout: 480
57-
docker_base_image: onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cuda11_x64_almalinux8_gcc11:20241015.1
57+
docker_base_image: onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cuda11_x64_almalinux8_gcc11:20241020.1
5858
trt_version: '10.4.0.26-1.cuda11.8'
5959
cuda_version: '11.8'
6060

Diff for: ‎tools/ci_build/github/azure-pipelines/stages/java-cuda-packaging-stage.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -148,9 +148,9 @@ stages:
148148
value: false
149149
- name: docker_base_image
150150
${{ if eq(parameters.CudaVersion, '11.8') }}:
151-
value: onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cuda11_x64_almalinux8_gcc11:20241015.1
151+
value: onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cuda11_x64_almalinux8_gcc11:20241020.1
152152
${{ if eq(parameters.CudaVersion, '12.2') }}:
153-
value: onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cuda12_x64_ubi8_gcc12:20241015.1
153+
value: onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cuda12_x64_ubi8_gcc12:20241020.1
154154
timeoutInMinutes: 60
155155

156156
steps:

Diff for: ‎tools/ci_build/github/azure-pipelines/stages/jobs/py-linux-cuda-package-test-job.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
${{ if eq(parameters.CudaVersion, '11.8') }}:
4747
value: nvidia/cuda:11.8.0-cudnn8-devel-ubi8
4848
${{ if eq(parameters.CudaVersion, '12.2') }}:
49-
value: onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cuda12_x64_ubi8_gcc12:20241015.1
49+
value: onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cuda12_x64_ubi8_gcc12:20241020.1
5050
- name: linux_trt_version
5151
${{ if eq(parameters.CudaVersion, '11.8') }}:
5252
value: 10.4.0.26-1.cuda11.8

Diff for: ‎tools/ci_build/github/azure-pipelines/stages/py-cuda-packaging-stage.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,8 @@ stages:
7777
cmake_build_type: ${{ parameters.cmake_build_type }}
7878
cuda_version: ${{ parameters.cuda_version }}
7979
${{ if eq(parameters.cuda_version, '11.8') }}:
80-
docker_base_image: onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cuda11_x64_almalinux8_gcc11:20241015.1
80+
docker_base_image: onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cuda11_x64_almalinux8_gcc11:20241020.1
8181
trt_version: 10.4.0.26-1.cuda11.8
8282
${{ if eq(parameters.cuda_version, '12.2') }}:
83-
docker_base_image: onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cuda12_x64_ubi8_gcc12:20241015.1
83+
docker_base_image: onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cuda12_x64_ubi8_gcc12:20241020.1
8484
trt_version: 10.4.0.26-1.cuda12.6

Diff for: ‎tools/ci_build/github/azure-pipelines/templates/py-packaging-stage.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -470,7 +470,7 @@ stages:
470470
parameters:
471471
arch: 'x86_64'
472472
machine_pool: 'onnxruntime-Ubuntu2204-AMD-CPU-Large'
473-
docker_base_image: onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cuda11_x64_almalinux8_gcc11:20241015.1
473+
docker_base_image: onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cuda11_x64_almalinux8_gcc11:20241020.1
474474
extra_build_arg: ${{ parameters.build_py_parameters }}
475475
cmake_build_type: ${{ parameters.cmake_build_type }}
476476
trt_version: '10.4.0.26-1.cuda11.8'

Diff for: ‎tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_cpu

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cpu_x64_ubi8_gcc12:20241015.1
1+
FROM onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cpu_x64_ubi8_gcc12:20241020.1
22

33
ENV JAVA_HOME=/usr/lib/jvm/msopenjdk-11
44

Diff for: ‎tools/ci_build/github/linux/docker/inference/aarch64/default/cpu/scripts/install_deps.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ cd /tmp/src
4040

4141
CPU_ARCH=$(uname -m)
4242
echo "Installing cmake"
43-
GetFile "https://github.com/Kitware/CMake/releases/download/v3.31.0-rc1/cmake-3.31.0-rc1-linux-$CPU_ARCH.tar.gz" "/tmp/src/cmake.tar.gz"
43+
GetFile "https://github.com/Kitware/CMake/releases/download/v3.31.0-rc2/cmake-3.31.0-rc2-linux-$CPU_ARCH.tar.gz" "/tmp/src/cmake.tar.gz"
4444
tar -zxf /tmp/src/cmake.tar.gz --strip=1 -C /usr
4545

4646
echo "Installing Ninja"

Diff for: ‎tools/ci_build/github/linux/docker/inference/aarch64/python/cpu/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cpu_aarch64_ubi8_gcc12:20241015.1
1+
FROM onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cpu_aarch64_ubi8_gcc12:20241020.1
22

33
ADD scripts /tmp/scripts
44
RUN cd /tmp/scripts && /tmp/scripts/install_centos.sh && /tmp/scripts/install_deps.sh && rm -rf /tmp/scripts

Diff for: ‎tools/ci_build/github/linux/docker/inference/x86_64/default/cpu/scripts/install_deps.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ mkdir -p /tmp/src
3939
cd /tmp/src
4040
CPU_ARCH=$(uname -m)
4141
echo "Installing cmake"
42-
GetFile "https://github.com/Kitware/CMake/releases/download/v3.31.0-rc1/cmake-3.31.0-rc1-linux-$CPU_ARCH.tar.gz" "/tmp/src/cmake.tar.gz"
42+
GetFile "https://github.com/Kitware/CMake/releases/download/v3.31.0-rc2/cmake-3.31.0-rc2-linux-$CPU_ARCH.tar.gz" "/tmp/src/cmake.tar.gz"
4343
tar -zxf /tmp/src/cmake.tar.gz --strip=1 -C /usr
4444

4545
echo "Installing Ninja"

Diff for: ‎tools/ci_build/github/linux/docker/inference/x86_64/default/cuda11/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Licensed under the MIT License.
33

44
# This file is used by Zip-Nuget Packaging NoContribOps Pipeline,Zip-Nuget-Java Packaging Pipeline
5-
FROM onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cuda11_x64_almalinux8_gcc11_dotnet:20241015.1
5+
FROM onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cuda11_x64_almalinux8_gcc11_dotnet:20241020.1
66

77
ARG TRT_VERSION
88
RUN rpm -Uvh https://packages.microsoft.com/config/centos/8/packages-microsoft-prod.rpm && dnf install -y msopenjdk-11

Diff for: ‎tools/ci_build/github/linux/docker/inference/x86_64/default/cuda12/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Licensed under the MIT License.
33

44
# This file is used by Zip-Nuget Packaging NoContribOps Pipeline,Zip-Nuget-Java Packaging Pipeline
5-
FROM onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cuda12_x64_ubi8_gcc12_dotnet:20241015.1
5+
FROM onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cuda12_x64_ubi8_gcc12_dotnet:20241020.1
66
ARG TRT_VERSION
77

88
#Install TensorRT only if TRT_VERSION is not empty

Diff for: ‎tools/ci_build/github/linux/docker/inference/x86_64/python/cpu/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cpu_x64_ubi8_gcc12:20241015.1
1+
FROM onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cpu_x64_ubi8_gcc12:20241020.1
22

33
ADD scripts /tmp/scripts
44
RUN cd /tmp/scripts && /tmp/scripts/install_centos.sh && rm -rf /tmp/scripts

0 commit comments

Comments
 (0)