Skip to content

Commit

Permalink
update all cp38 and cp39 to cp312 in tools dir
Browse files Browse the repository at this point in the history
  • Loading branch information
kailums committed Oct 24, 2024
1 parent 08cc261 commit d31985a
Show file tree
Hide file tree
Showing 16 changed files with 26 additions and 26 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ stages:
set -ex; \
env; \
ccache -s; \
/opt/python/cp38-cp38/bin/python3 /onnxruntime_src/tools/ci_build/build.py \
/opt/python/cp312-cp312/bin/python3 /onnxruntime_src/tools/ci_build/build.py \
--build_dir /build --cmake_generator Ninja \
--config Release --update --build \
--skip_submodule_sync \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ stages:
/bin/bash -c "
set -ex; \
ccache -s; \
/opt/python/cp38-cp38/bin/python3 /onnxruntime_src/tools/ci_build/build.py \
/opt/python/cp312-cp12/bin/python3 /onnxruntime_src/tools/ci_build/build.py \
--build_dir /build --cmake_generator 'Ninja' \
--config Release \
--skip_submodule_sync \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ jobs:
-e NIGHTLY_BUILD \
-e BUILD_BUILDNUMBER \
onnxruntimecpubuild \
/opt/python/cp38-cp38/bin/python3.8 /onnxruntime_src/tools/ci_build/build.py \
/opt/python/cp312-cp312/bin/python3.12 /onnxruntime_src/tools/ci_build/build.py \
--build_dir /build/2 --cmake_generator Ninja \
--config Debug \
--skip_submodule_sync \
Expand Down Expand Up @@ -210,7 +210,7 @@ jobs:
-e NIGHTLY_BUILD \
-e BUILD_BUILDNUMBER \
onnxruntimecpubuild \
/opt/python/cp38-cp38/bin/python3.8 /onnxruntime_src/tools/ci_build/build.py \
/opt/python/cp312-cp312/bin/python3.12 /onnxruntime_src/tools/ci_build/build.py \
--build_dir /build/5 --cmake_generator Ninja \
--config Debug \
--skip_submodule_sync \
Expand All @@ -231,7 +231,7 @@ jobs:
-e NIGHTLY_BUILD \
-e BUILD_BUILDNUMBER \
onnxruntimecpubuild \
/opt/python/cp38-cp38/bin/python3.8 /onnxruntime_src/tools/ci_build/build.py \
/opt/python/cp312-cp312/bin/python3.12 /onnxruntime_src/tools/ci_build/build.py \
--build_dir /build/6a \
--cmake_generator Ninja \
--config MinSizeRel \
Expand All @@ -258,7 +258,7 @@ jobs:
-e NIGHTLY_BUILD \
-e BUILD_BUILDNUMBER \
onnxruntimecpubuild \
/opt/python/cp38-cp38/bin/python3.8 /onnxruntime_src/tools/ci_build/build.py \
/opt/python/cp312-cp312/bin/python3.12 /onnxruntime_src/tools/ci_build/build.py \
--build_dir /build/6b \
--cmake_generator Ninja \
--config MinSizeRel \
Expand Down Expand Up @@ -287,7 +287,7 @@ jobs:
-e NIGHTLY_BUILD \
-e BUILD_BUILDNUMBER \
onnxruntimecpubuild \
/opt/python/cp38-cp38/bin/python3.8 /onnxruntime_src/tools/ci_build/build.py \
/opt/python/cp312-cp312/bin/python3.12 /onnxruntime_src/tools/ci_build/build.py \
--build_dir /build/6c \
--cmake_generator Ninja \
--config MinSizeRel \
Expand Down Expand Up @@ -317,7 +317,7 @@ jobs:
-e ALLOW_RELEASED_ONNX_OPSET_ONLY=1 \
-e NIGHTLY_BUILD \
onnxruntimecpubuild \
/opt/python/cp38-cp38/bin/python3.8 /onnxruntime_src/tools/ci_build/build.py \
/opt/python/cp312-cp312/bin/python3.12 /onnxruntime_src/tools/ci_build/build.py \
--build_dir /build/7 \
--cmake_generator Ninja \
--config MinSizeRel \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ jobs:
-e NIGHTLY_BUILD \
-e BUILD_BUILDNUMBER \
onnxruntimecpubuild \
/opt/python/cp38-cp38/bin/python3.8 /onnxruntime_src/tools/ci_build/build.py \
/opt/python/cp312-cp312/bin/python3.12 /onnxruntime_src/tools/ci_build/build.py \
--build_dir /build \
--config Debug Release \
--skip_submodule_sync \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ stages:
-e BUILD_REASON=$(Build.Reason) \
-e BUILD_BRANCH=$(Build.SourceBranch) \
onnxruntimecpubuild \
/opt/python/cp38-cp38/bin/python3 /onnxruntime_src/tools/ci_build/github/linux/ort_minimal/build_ort_and_check_binary_size.py \
/opt/python/cp312-cp312/bin/python3 /onnxruntime_src/tools/ci_build/github/linux/ort_minimal/build_ort_and_check_binary_size.py \
--build_dir /build/1a \
${BINARY_SIZE_THRESHOLD_ARGS} \
"/onnxruntime_src/${{ parameters.BuildConfigFile }}"
Expand Down Expand Up @@ -147,7 +147,7 @@ stages:
-e BUILD_REASON=$(Build.Reason) \
-e BUILD_BRANCH=$(Build.SourceBranch) \
onnxruntimecpubuild \
/opt/python/cp38-cp38/bin/python3 /onnxruntime_src/tools/ci_build/github/linux/ort_minimal/build_ort_and_check_binary_size.py \
/opt/python/cp312-cp312/bin/python3 /onnxruntime_src/tools/ci_build/github/linux/ort_minimal/build_ort_and_check_binary_size.py \
--build_dir /build/1b \
--with_debug_info \
"/onnxruntime_src/${{ parameters.BuildConfigFile }}"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ ARG BASEIMAGE=nvidia/cuda:12.5.1-cudnn-devel-ubi8
ARG TRT_VERSION=10.4.0.26-1.cuda12.6
FROM $BASEIMAGE AS base
ARG TRT_VERSION
ENV PATH /opt/python/cp38-cp38/bin:/usr/local/nvidia/bin:/usr/local/cuda/bin:/usr/src/tensorrt/bin:${PATH}
ENV PATH /opt/python/cp312-cp312/bin:/usr/local/nvidia/bin:/usr/local/cuda/bin:/usr/src/tensorrt/bin:${PATH}

RUN dnf install -y bash wget &&\
dnf clean dbcache
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ ARG BASEIMAGE=nvidia/cuda:11.8.0-cudnn8-devel-ubi8
ARG TRT_VERSION=10.4.0.26-1.cuda11.8
FROM $BASEIMAGE AS base
ARG TRT_VERSION
ENV PATH /opt/python/cp38-cp38/bin:/usr/local/nvidia/bin:/usr/local/cuda/bin:/usr/src/tensorrt/bin:${PATH}
ENV PATH /opt/python/cp312-cp312/bin:/usr/local/nvidia/bin:/usr/local/cuda/bin:/usr/src/tensorrt/bin:${PATH}

RUN dnf install -y bash wget &&\
dnf clean dbcache
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ RUN apt-get install -y --no-install-recommends \
ln -s /usr/bin/python3 python &&\
ln -s /usr/bin/pip3 pip;

RUN pip install --upgrade pip
RUN pip install --upgrade pip
RUN pip install setuptools>=68.2.2

# Install TensorRT
Expand All @@ -44,7 +44,7 @@ COPY ${TRT_BINS_DIR}/TensorRT-${TAR_TRT_VERSION}.Linux.x86_64-gnu.cuda-${TAR_CUD
RUN tar -xzvf /TensorRT-${TAR_TRT_VERSION}.tar.gz

RUN cd /TensorRT-${TAR_TRT_VERSION}/python &&\
python3 -m pip install tensorrt*cp38*.whl
python3 -m pip install tensorrt*cp312*.whl

RUN cp -r /TensorRT-${TAR_TRT_VERSION}/lib/* /usr/lib/x86_64-linux-gnu/
RUN cp /TensorRT-${TAR_TRT_VERSION}/include/* /usr/local/include/
Expand Down Expand Up @@ -92,12 +92,12 @@ RUN if [ -z "$ONNXRUNTIME_COMMIT_ID" ] ; then echo "Building branch ${ONNXRUNTIM
git reset --hard ${ONNXRUNTIME_COMMIT_ID} && git submodule update --recursive ; fi

# Build ORT
ENV CUDA_MODULE_LOADING "LAZY"
ENV CUDA_MODULE_LOADING "LAZY"
ARG PARSER_CONFIG=""
RUN /bin/sh build.sh ${PARSER_CONFIG} --parallel --build_shared_lib --cuda_home /usr/local/cuda --cudnn_home /usr/lib/x86_64-linux-gnu/ --use_tensorrt --tensorrt_home /usr/lib/x86_64-linux-gnu/ --config Release --build_wheel --skip_tests --skip_submodule_sync --cmake_extra_defines '"CMAKE_CUDA_ARCHITECTURES='${CMAKE_CUDA_ARCHITECTURES}'"'

# Switch to root to continue following steps of CI
USER root

# Intall ORT wheel
RUN pip install ${ONNXRUNTIME_LOCAL_CODE_DIR}/onnxruntime/build/Linux/Release/dist/*.whl
RUN pip install ${ONNXRUNTIME_LOCAL_CODE_DIR}/onnxruntime/build/Linux/Release/dist/*.whl
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ echo "installing for os major version : $os_major_version"
dnf install -y glibc-langpack-\*
yum install -y which redhat-lsb-core expat-devel tar unzip zlib-devel make bzip2 bzip2-devel perl-IPC-Cmd openssl-devel wget

# export PATH=/opt/python/cp38-cp38/bin:$PATH
# export PATH=/opt/python/cp312-cp312/bin:$PATH

echo "installing rapidjson for AzureEP"
wget https://github.com/Tencent/rapidjson/archive/refs/tags/v1.1.0.tar.gz
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ echo "installing for os major version : $os_major_version"
dnf install -y glibc-langpack-\*
yum install -y which redhat-lsb-core expat-devel tar unzip zlib-devel make bzip2 bzip2-devel perl-IPC-Cmd openssl-devel wget

# export PATH=/opt/python/cp38-cp38/bin:$PATH
# export PATH=/opt/python/cp312-cp312/bin:$PATH

echo "installing rapidjson for AzureEP"
wget https://github.com/Tencent/rapidjson/archive/refs/tags/v1.1.0.tar.gz
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ echo "installing for os major version : $os_major_version"
dnf install -y glibc-langpack-\*
yum install -y which redhat-lsb-core expat-devel tar unzip zlib-devel make bzip2 bzip2-devel perl-IPC-Cmd openssl-devel wget

# export PATH=/opt/python/cp38-cp38/bin:$PATH
# export PATH=/opt/python/cp312-cp312/bin:$PATH

echo "installing rapidjson for AzureEP"
wget https://github.com/Tencent/rapidjson/archive/refs/tags/v1.1.0.tar.gz
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ PARENT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." &> /dev/null && pwd)"
source "$PARENT_DIR/install_dotnet.sh"

if [ ! -d "/opt/conda/bin" ]; then
PYTHON_EXES=("/opt/python/cp38-cp38/bin/python3.8" "/opt/python/cp39-cp39/bin/python3.9" "/opt/python/cp310-cp310/bin/python3.10" "/opt/python/cp311-cp311/bin/python3.11" "/opt/python/cp312-cp312/bin/python3.12")
PYTHON_EXES=("/opt/python/cp310-cp310/bin/python3.10" "/opt/python/cp311-cp311/bin/python3.11" "/opt/python/cp312-cp312/bin/python3.12")
else
PYTHON_EXES=("/opt/conda/bin/python")
fi
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

set -e
set -x
export PATH=/opt/python/cp38-cp38/bin:$PATH
export PATH=/opt/python/cp312-cp312/bin:$PATH

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

Expand All @@ -26,7 +26,7 @@ python3 /onnxruntime_src/tools/ci_build/build.py \
--build_wheel \
--skip_tests \
--enable_training_ops \
--enable_pybind --cmake_extra_defines PYTHON_INCLUDE_DIR=/opt/python/cp38-cp38/include/python3.8 PYTHON_LIBRARY=/usr/lib64/librt.so \
--enable_pybind --cmake_extra_defines PYTHON_INCLUDE_DIR=/opt/python/cp312-cp312/include/python3.12 PYTHON_LIBRARY=/usr/lib64/librt.so \
--use_nnapi \
--use_coreml

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

set -e
set -x
export PATH=/opt/python/cp38-cp38/bin:$PATH
export PATH=/opt/python/cp312-cp312/bin:$PATH
USAGE_TEXT="Usage:
-b|--build-directory <build directory>
Specifies the build directory. Required.
Expand Down
2 changes: 1 addition & 1 deletion tools/scripts/python_test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ export build_dir=$2
export config=$3

# it's for manylinux image
export PATH=/opt/python/cp38-cp38/bin:$PATH
export PATH=/opt/python/cp312-cp312/bin:$PATH

echo Install Python Deps
cp $src_dir/tools/ci_build/github/linux/docker/scripts/manylinux/requirements.txt $build_dir/requirements.txt

Check warning on line 13 in tools/scripts/python_test.sh

View workflow job for this annotation

GitHub Actions / Optional Lint

[shellcheck] reported by reviewdog 🐶 Double quote to prevent globbing and word splitting. Raw Output: ./tools/scripts/python_test.sh:13:4: info: Double quote to prevent globbing and word splitting. (ShellCheck.SC2086)

Check warning on line 13 in tools/scripts/python_test.sh

View workflow job for this annotation

GitHub Actions / Optional Lint

[shellcheck] reported by reviewdog 🐶 Double quote to prevent globbing and word splitting. Raw Output: ./tools/scripts/python_test.sh:13:83: info: Double quote to prevent globbing and word splitting. (ShellCheck.SC2086)
Expand Down
2 changes: 1 addition & 1 deletion tools/scripts/symbolic_shape_infer_test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ set -ex
export build_dir=$1

# it's for manylinux image
export PATH=/opt/python/cp38-cp38/bin:$PATH
export PATH=/opt/python/cp312-cp312/bin:$PATH

echo Run symbolic shape infer test
pushd $build_dir/Release/

Check warning on line 11 in tools/scripts/symbolic_shape_infer_test.sh

View workflow job for this annotation

GitHub Actions / Optional Lint

[shellcheck] reported by reviewdog 🐶 Double quote to prevent globbing and word splitting. Raw Output: ./tools/scripts/symbolic_shape_infer_test.sh:11:7: info: Double quote to prevent globbing and word splitting. (ShellCheck.SC2086)
Expand Down

0 comments on commit d31985a

Please sign in to comment.