Skip to content

Commit 3470f2f

Browse files
jchen351guschmue
authored andcommitted
Replace reference to python 3.8 with python 3.10 (#22692)
### Description This PR will set default python to 3.10 except tools/ci_build/github/azure-pipelines/bigmodels-ci-pipeline.yml. This is needed because we are no longer using python 3.8 This PR excludes changes for Big Models CI, because it will require additional changes. Which will be track in USER STORY 52729 ### Motivation and Context <!-- - Why is this change required? What problem does it solve? - If it fixes an open issue, please link to the issue here. -->
1 parent bce5e87 commit 3470f2f

File tree

11 files changed

+21
-26
lines changed

11 files changed

+21
-26
lines changed

tools/ci_build/github/azure-pipelines/linux-cpu-minimal-build-ci-pipeline.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ jobs:
128128
-e NIGHTLY_BUILD \
129129
-e BUILD_BUILDNUMBER \
130130
onnxruntimecpubuild \
131-
/opt/python/cp38-cp38/bin/python3.8 /onnxruntime_src/tools/ci_build/build.py \
131+
/opt/python/cp310-cp310/bin/python3.10 /onnxruntime_src/tools/ci_build/build.py \
132132
--build_dir /build/2 --cmake_generator Ninja \
133133
--config Debug \
134134
--skip_submodule_sync \
@@ -210,7 +210,7 @@ jobs:
210210
-e NIGHTLY_BUILD \
211211
-e BUILD_BUILDNUMBER \
212212
onnxruntimecpubuild \
213-
/opt/python/cp38-cp38/bin/python3.8 /onnxruntime_src/tools/ci_build/build.py \
213+
/opt/python/cp310-cp310/bin/python3.10 /onnxruntime_src/tools/ci_build/build.py \
214214
--build_dir /build/5 --cmake_generator Ninja \
215215
--config Debug \
216216
--skip_submodule_sync \
@@ -231,7 +231,7 @@ jobs:
231231
-e NIGHTLY_BUILD \
232232
-e BUILD_BUILDNUMBER \
233233
onnxruntimecpubuild \
234-
/opt/python/cp38-cp38/bin/python3.8 /onnxruntime_src/tools/ci_build/build.py \
234+
/opt/python/cp310-cp310/bin/python3.10 /onnxruntime_src/tools/ci_build/build.py \
235235
--build_dir /build/6a \
236236
--cmake_generator Ninja \
237237
--config MinSizeRel \
@@ -258,7 +258,7 @@ jobs:
258258
-e NIGHTLY_BUILD \
259259
-e BUILD_BUILDNUMBER \
260260
onnxruntimecpubuild \
261-
/opt/python/cp38-cp38/bin/python3.8 /onnxruntime_src/tools/ci_build/build.py \
261+
/opt/python/cp310-cp310/bin/python3.10 /onnxruntime_src/tools/ci_build/build.py \
262262
--build_dir /build/6b \
263263
--cmake_generator Ninja \
264264
--config MinSizeRel \
@@ -287,7 +287,7 @@ jobs:
287287
-e NIGHTLY_BUILD \
288288
-e BUILD_BUILDNUMBER \
289289
onnxruntimecpubuild \
290-
/opt/python/cp38-cp38/bin/python3.8 /onnxruntime_src/tools/ci_build/build.py \
290+
/opt/python/cp310-cp310/bin/python3.10 /onnxruntime_src/tools/ci_build/build.py \
291291
--build_dir /build/6c \
292292
--cmake_generator Ninja \
293293
--config MinSizeRel \
@@ -317,7 +317,7 @@ jobs:
317317
-e ALLOW_RELEASED_ONNX_OPSET_ONLY=1 \
318318
-e NIGHTLY_BUILD \
319319
onnxruntimecpubuild \
320-
/opt/python/cp38-cp38/bin/python3.8 /onnxruntime_src/tools/ci_build/build.py \
320+
/opt/python/cp310-cp310/bin/python3.10 /onnxruntime_src/tools/ci_build/build.py \
321321
--build_dir /build/7 \
322322
--cmake_generator Ninja \
323323
--config MinSizeRel \

tools/ci_build/github/azure-pipelines/templates/android-binary-size-check-stage.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ stages:
9191
-e BUILD_REASON=$(Build.Reason) \
9292
-e BUILD_BRANCH=$(Build.SourceBranch) \
9393
onnxruntimecpubuild \
94-
/opt/python/cp38-cp38/bin/python3 /onnxruntime_src/tools/ci_build/github/linux/ort_minimal/build_ort_and_check_binary_size.py \
94+
/opt/python/cp310-cp310/bin/python3 /onnxruntime_src/tools/ci_build/github/linux/ort_minimal/build_ort_and_check_binary_size.py \
9595
--build_dir /build/1a \
9696
${BINARY_SIZE_THRESHOLD_ARGS} \
9797
"/onnxruntime_src/${{ parameters.BuildConfigFile }}"
@@ -147,7 +147,7 @@ stages:
147147
-e BUILD_REASON=$(Build.Reason) \
148148
-e BUILD_BRANCH=$(Build.SourceBranch) \
149149
onnxruntimecpubuild \
150-
/opt/python/cp38-cp38/bin/python3 /onnxruntime_src/tools/ci_build/github/linux/ort_minimal/build_ort_and_check_binary_size.py \
150+
/opt/python/cp310-cp310/bin/python3 /onnxruntime_src/tools/ci_build/github/linux/ort_minimal/build_ort_and_check_binary_size.py \
151151
--build_dir /build/1b \
152152
--with_debug_info \
153153
"/onnxruntime_src/${{ parameters.BuildConfigFile }}"

tools/ci_build/github/azure-pipelines/templates/mac-cpu-packing-jobs.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,10 @@ jobs:
4545
submodules: none
4646

4747
- task: UsePythonVersion@0
48-
displayName: Use Python 3.11
48+
displayName: Use Python 3.10
4949
inputs:
50-
versionSpec: 3.11
50+
versionSpec: 3.10
51+
5152
- task: NodeTool@0
5253
inputs:
5354
versionSpec: '20.x'

tools/ci_build/github/linux/docker/Dockerfile.package_ubi8_cuda11_8_tensorrt8_6

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ RUN dnf install -y bash wget &&\
1616

1717
# Install python3
1818
RUN dnf install -y \
19-
python3.8 \
20-
python38-pip \
21-
python38-wheel &&\
19+
python3.10 \
20+
python310-pip \
21+
python310-wheel &&\
2222
cd /usr/local/bin &&\
23-
ln -s /usr/bin/python3 python3.8 &&\
24-
ln -s /usr/bin/pip3 pip3.8;
23+
ln -s /usr/bin/python3 python3.10 &&\
24+
ln -s /usr/bin/pip3 pip3.10;
2525

2626
RUN pip3 install --upgrade pip
2727
RUN pip3 install setuptools>=68.2.2

tools/ci_build/github/linux/docker/Dockerfile.package_ubi8_cuda_tensorrt10_0

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ARG BASEIMAGE=nvidia/cuda:12.5.1-cudnn-devel-ubi8
99
ARG TRT_VERSION=10.6.0.26-1.cuda12.6
1010
FROM $BASEIMAGE AS base
1111
ARG TRT_VERSION
12-
ENV PATH /opt/python/cp38-cp38/bin:/usr/local/nvidia/bin:/usr/local/cuda/bin:/usr/src/tensorrt/bin:${PATH}
12+
ENV PATH /opt/python/cp310-cp310/bin:/usr/local/nvidia/bin:/usr/local/cuda/bin:/usr/src/tensorrt/bin:${PATH}
1313

1414
RUN dnf install -y bash wget &&\
1515
dnf clean dbcache

tools/ci_build/github/linux/docker/inference/aarch64/python/cpu/scripts/install_centos.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ echo "installing for os major version : $os_major_version"
77
dnf install -y glibc-langpack-\*
88
yum install -y which redhat-lsb-core expat-devel tar unzip zlib-devel make bzip2 bzip2-devel perl-IPC-Cmd openssl-devel wget
99

10-
# export PATH=/opt/python/cp38-cp38/bin:$PATH
11-
1210
echo "installing rapidjson for AzureEP"
1311
wget https://github.com/Tencent/rapidjson/archive/refs/tags/v1.1.0.tar.gz
1412
tar zxvf v1.1.0.tar.gz

tools/ci_build/github/linux/docker/inference/x86_64/python/cpu/scripts/install_centos.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ echo "installing for os major version : $os_major_version"
77
dnf install -y glibc-langpack-\*
88
yum install -y which redhat-lsb-core expat-devel tar unzip zlib-devel make bzip2 bzip2-devel perl-IPC-Cmd openssl-devel wget
99

10-
# export PATH=/opt/python/cp38-cp38/bin:$PATH
11-
1210
echo "installing rapidjson for AzureEP"
1311
wget https://github.com/Tencent/rapidjson/archive/refs/tags/v1.1.0.tar.gz
1412
tar zxvf v1.1.0.tar.gz

tools/ci_build/github/linux/docker/inference/x86_64/python/cuda/scripts/install_centos.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ echo "installing for os major version : $os_major_version"
77
dnf install -y glibc-langpack-\*
88
yum install -y which redhat-lsb-core expat-devel tar unzip zlib-devel make bzip2 bzip2-devel perl-IPC-Cmd openssl-devel wget
99

10-
# export PATH=/opt/python/cp38-cp38/bin:$PATH
11-
1210
echo "installing rapidjson for AzureEP"
1311
wget https://github.com/Tencent/rapidjson/archive/refs/tags/v1.1.0.tar.gz
1412
tar zxvf v1.1.0.tar.gz

tools/ci_build/github/linux/ort_minimal/build_full_ort_and_create_ort_files.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
set -e
77
set -x
8-
export PATH=/opt/python/cp38-cp38/bin:$PATH
8+
export PATH=/opt/python/cp310-cp310/bin:$PATH
99

1010
BUILD_DIR=${1:?"usage: $0 <build directory>"}
1111

@@ -26,7 +26,7 @@ python3 /onnxruntime_src/tools/ci_build/build.py \
2626
--build_wheel \
2727
--skip_tests \
2828
--enable_training_ops \
29-
--enable_pybind --cmake_extra_defines PYTHON_INCLUDE_DIR=/opt/python/cp38-cp38/include/python3.8 PYTHON_LIBRARY=/usr/lib64/librt.so \
29+
--enable_pybind --cmake_extra_defines PYTHON_INCLUDE_DIR=/opt/python/cp310-cp310/include/python3.10 PYTHON_LIBRARY=/usr/lib64/librt.so \
3030
--use_nnapi \
3131
--use_coreml
3232

tools/ci_build/github/linux/ort_minimal/build_minimal_ort_and_run_tests.sh

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

88
set -e
99
set -x
10-
export PATH=/opt/python/cp38-cp38/bin:$PATH
10+
export PATH=/opt/python/cp310-cp310/bin:$PATH
1111
USAGE_TEXT="Usage:
1212
-b|--build-directory <build directory>
1313
Specifies the build directory. Required.

0 commit comments

Comments
 (0)