From 3b283e51d59176e0196d706dbcda3529b4e179f4 Mon Sep 17 00:00:00 2001 From: Jian Chen Date: Wed, 13 Dec 2023 17:41:18 -0500 Subject: [PATCH 01/16] Adding python 3.12 support --- setup.py | 1 + .../orttraining-py-packaging-pipeline-cpu.yml | 2 ++ .../stages/py-cuda-packaging-stage.yml | 8 ++++++ .../templates/py-package-smoking-test.yml | 2 ++ .../templates/py-packaging-stage.yml | 28 +++++++++++++++++++ .../py-packaging-training-cuda-stage.yml | 6 ++++ .../set-python-manylinux-variables-step.yml | 4 +++ .../linux/docker/Dockerfile.manylinux2_28_cpu | 6 ++++ .../docker/Dockerfile.manylinux2_28_cuda | 5 ++++ .../docker/Dockerfile.manylinux2_28_rocm | 5 ++++ ...Dockerfile.manylinux2_28_training_cuda11_8 | 5 ++++ ...Dockerfile.manylinux2_28_training_cuda12_2 | 5 ++++ .../python/cpu/Dockerfile.manylinux2_28_cpu | 5 ++++ .../docker/scripts/install_python_deps.sh | 2 ++ 14 files changed, 84 insertions(+) diff --git a/setup.py b/setup.py index 44c97937ebe2a..a83a3292bab92 100644 --- a/setup.py +++ b/setup.py @@ -451,6 +451,7 @@ def finalize_options(self): "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3.12", "Operating System :: Microsoft :: Windows", "Operating System :: MacOS", ] diff --git a/tools/ci_build/github/azure-pipelines/orttraining-py-packaging-pipeline-cpu.yml b/tools/ci_build/github/azure-pipelines/orttraining-py-packaging-pipeline-cpu.yml index 9755e1f0771ba..d6831e291911a 100644 --- a/tools/ci_build/github/azure-pipelines/orttraining-py-packaging-pipeline-cpu.yml +++ b/tools/ci_build/github/azure-pipelines/orttraining-py-packaging-pipeline-cpu.yml @@ -28,6 +28,8 @@ stages: PythonVersion: '3.10' Python311: PythonVersion: '3.11' + Python312: + PythonVersion: '3.12' steps: - checkout: self diff --git a/tools/ci_build/github/azure-pipelines/stages/py-cuda-packaging-stage.yml b/tools/ci_build/github/azure-pipelines/stages/py-cuda-packaging-stage.yml index f3d68957d649c..e6d8ee35e75e3 100644 --- a/tools/ci_build/github/azure-pipelines/stages/py-cuda-packaging-stage.yml +++ b/tools/ci_build/github/azure-pipelines/stages/py-cuda-packaging-stage.yml @@ -92,6 +92,14 @@ stages: EP_NAME: gpu CudaVersion: ${{ parameters.cuda_version }} + - template: ../templates/py-win-gpu.yml + parameters: + MACHINE_POOL: 'onnxruntime-Win2022-GPU-T4' + PYTHON_VERSION: '3.12' + EP_BUILD_FLAGS: --use_tensorrt --tensorrt_home=${{ variables.win_trt_home }} --cuda_home=${{ variables.win_cuda_home }} --cmake_extra_defines "CMAKE_CUDA_ARCHITECTURES=52;60;61;70;75;80" + EP_NAME: gpu + CudaVersion: ${{ parameters.cuda_version }} + - ${{ if eq(parameters.enable_linux_gpu, true) }}: - template: ../templates/py-linux-gpu.yml diff --git a/tools/ci_build/github/azure-pipelines/templates/py-package-smoking-test.yml b/tools/ci_build/github/azure-pipelines/templates/py-package-smoking-test.yml index 8d5ca19a73535..0cb438c71066e 100644 --- a/tools/ci_build/github/azure-pipelines/templates/py-package-smoking-test.yml +++ b/tools/ci_build/github/azure-pipelines/templates/py-package-smoking-test.yml @@ -30,6 +30,8 @@ jobs: PythonVersion: '3.10' Python311: PythonVersion: '3.11' + Python312: + PythonVersion: '3.12' steps: - checkout: none diff --git a/tools/ci_build/github/azure-pipelines/templates/py-packaging-stage.yml b/tools/ci_build/github/azure-pipelines/templates/py-packaging-stage.yml index f2b91bbaacb89..0b4ad89ce6fcf 100644 --- a/tools/ci_build/github/azure-pipelines/templates/py-packaging-stage.yml +++ b/tools/ci_build/github/azure-pipelines/templates/py-packaging-stage.yml @@ -77,6 +77,10 @@ stages: PythonVersion: '3.11' MsbuildPlatform: x64 buildArch: x64 + Python312_x64: + PythonVersion: '3.12' + MsbuildPlatform: x64 + buildArch: x64 # Training build cannot support Win32 for now because one or more of its python # dependencies does not support Win32. So, don't build a training package for Win32 ${{ if not(contains(parameters.build_py_parameters, '--enable_training')) }}: @@ -96,6 +100,10 @@ stages: PythonVersion: '3.11' MsbuildPlatform: Win32 buildArch: x86 + Python312_x86: + PythonVersion: '3.12' + MsbuildPlatform: Win32 + buildArch: x86 variables: OnnxRuntimeBuildDirectory: '$(Build.BinariesDirectory)' EnvSetupScript: setup_env.bat @@ -295,6 +303,14 @@ stages: ENV_SETUP_SCRIPT: setup_env_gpu.bat EP_NAME: gpu + - template: py-win-gpu.yml + parameters: + MACHINE_POOL: 'onnxruntime-Win2022-GPU-T4' + PYTHON_VERSION: '3.12' + EP_BUILD_FLAGS: --use_tensorrt --tensorrt_home="C:\local\TensorRT-8.6.1.6.Windows10.x86_64.cuda-11.8" --cuda_home="$(Agent.TempDirectory)\v11.8" --cmake_extra_defines "CMAKE_CUDA_ARCHITECTURES=52;60;61;70;75;80" + ENV_SETUP_SCRIPT: setup_env_gpu.bat + EP_NAME: gpu + - template: py-win-gpu.yml parameters: MACHINE_POOL: 'onnxruntime-Win2022-GPU-dml-A10' @@ -327,6 +343,14 @@ stages: ENV_SETUP_SCRIPT: setup_env.bat EP_NAME: directml + - template: py-win-gpu.yml + parameters: + MACHINE_POOL: 'onnxruntime-Win2022-GPU-dml-A10' + PYTHON_VERSION: '3.12' + EP_BUILD_FLAGS: --use_dml --cmake_extra_defines CMAKE_SYSTEM_VERSION=10.0.18362.0 --enable_wcos + ENV_SETUP_SCRIPT: setup_env.bat + EP_NAME: directml + - ${{ if eq(parameters.enable_mac_cpu, true) }}: - job: MacOS_py_Wheels timeoutInMinutes: 120 @@ -346,6 +370,8 @@ stages: PythonVersion: '3.10' Python311: PythonVersion: '3.11' + Python312: + PythonVersion: '3.12' steps: - checkout: self clean: true @@ -411,6 +437,8 @@ stages: PythonVersion: '3.10' Python311: PythonVersion: '3.11' + Python312: + PythonVersion: '3.12' steps: - checkout: self clean: true diff --git a/tools/ci_build/github/azure-pipelines/templates/py-packaging-training-cuda-stage.yml b/tools/ci_build/github/azure-pipelines/templates/py-packaging-training-cuda-stage.yml index 7fdd7e54e752d..e7b935712ac6c 100644 --- a/tools/ci_build/github/azure-pipelines/templates/py-packaging-training-cuda-stage.yml +++ b/tools/ci_build/github/azure-pipelines/templates/py-packaging-training-cuda-stage.yml @@ -98,6 +98,12 @@ stages: OpsetVersion: ${{ parameters.opset_version }} CudaVersion: ${{ parameters.cuda_version }} UploadWheel: ${{ parameters.upload_wheel }} + Python312: + PythonVersion: '3.12' + TorchVersion: ${{ parameters.torch_version }} + OpsetVersion: ${{ parameters.opset_version }} + CudaVersion: ${{ parameters.cuda_version }} + UploadWheel: ${{ parameters.upload_wheel }} steps: - task: CmdLine@2 diff --git a/tools/ci_build/github/azure-pipelines/templates/set-python-manylinux-variables-step.yml b/tools/ci_build/github/azure-pipelines/templates/set-python-manylinux-variables-step.yml index 110eaff46f460..1fe58a7239369 100644 --- a/tools/ci_build/github/azure-pipelines/templates/set-python-manylinux-variables-step.yml +++ b/tools/ci_build/github/azure-pipelines/templates/set-python-manylinux-variables-step.yml @@ -30,6 +30,10 @@ steps: variables = { "PythonManylinuxDir": "/opt/python/cp311-cp311" } + elif version == "3.12": + variables = { + "PythonManylinuxDir": "/opt/python/cp312-cp312" + } else: raise ValueError("Unsupported Python version: '{}'".format(version)) diff --git a/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_cpu b/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_cpu index af87852561e0a..546fca69201a1 100644 --- a/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_cpu +++ b/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_cpu @@ -116,6 +116,10 @@ FROM build_cpython AS build_cpython311 COPY build_scripts/cpython-pubkey-310-311.txt /build_scripts/cpython-pubkeys.txt RUN manylinux-entrypoint /build_scripts/build-cpython.sh 3.11.2 +FROM build_cpython AS build_cpython312 +COPY build_scripts/cpython-pubkey-312-313.txt /build_scripts/cpython-pubkeys.txt +RUN manylinux-entrypoint /build_scripts/build-cpython.sh 3.12.1 + FROM build_cpython AS all_python COPY build_scripts/install-pypy.sh \ build_scripts/pypy.sha256 \ @@ -127,6 +131,7 @@ COPY --from=build_cpython38 /opt/_internal /opt/_internal/ COPY --from=build_cpython39 /opt/_internal /opt/_internal/ COPY --from=build_cpython310 /opt/_internal /opt/_internal/ COPY --from=build_cpython311 /opt/_internal /opt/_internal/ +COPY --from=build_cpython312 /opt/_internal /opt/_internal/ RUN manylinux-entrypoint /build_scripts/finalize-python.sh @@ -140,6 +145,7 @@ COPY build_scripts/finalize.sh \ build_scripts/requirements3.9.txt \ build_scripts/requirements3.10.txt \ build_scripts/requirements3.11.txt \ + build_scripts/requirements3.12.txt \ build_scripts/requirements-base-tools.txt \ /build_scripts/ COPY build_scripts/requirements-tools/* /build_scripts/requirements-tools/ 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 8f265b208cd47..807b9769146e7 100644 --- a/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_cuda +++ b/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_cuda @@ -119,6 +119,10 @@ FROM build_cpython AS build_cpython311 COPY build_scripts/cpython-pubkey-310-311.txt /build_scripts/cpython-pubkeys.txt RUN manylinux-entrypoint /build_scripts/build-cpython.sh 3.11.2 +FROM build_cpython AS build_cpython312 +COPY build_scripts/cpython-pubkey-312-313.txt /build_scripts/cpython-pubkeys.txt +RUN manylinux-entrypoint /build_scripts/build-cpython.sh 3.12.1 + FROM build_cpython AS all_python COPY build_scripts/install-pypy.sh \ build_scripts/pypy.sha256 \ @@ -143,6 +147,7 @@ COPY build_scripts/finalize.sh \ build_scripts/requirements3.9.txt \ build_scripts/requirements3.10.txt \ build_scripts/requirements3.11.txt \ + build_scripts/requirements3.12.txt \ build_scripts/requirements-base-tools.txt \ /build_scripts/ COPY build_scripts/requirements-tools/* /build_scripts/requirements-tools/ diff --git a/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_rocm b/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_rocm index 9e12fe8c75451..913b2b92e81e8 100644 --- a/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_rocm +++ b/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_rocm @@ -135,6 +135,10 @@ FROM build_cpython AS build_cpython311 COPY build_scripts/cpython-pubkey-310-311.txt /build_scripts/cpython-pubkeys.txt RUN manylinux-entrypoint /build_scripts/build-cpython.sh 3.11.2 +FROM build_cpython AS build_cpython312 +COPY build_scripts/cpython-pubkey-312-313.txt /build_scripts/cpython-pubkeys.txt +RUN manylinux-entrypoint /build_scripts/build-cpython.sh 3.12.1 + FROM build_cpython AS all_python COPY build_scripts/install-pypy.sh \ @@ -160,6 +164,7 @@ COPY build_scripts/finalize.sh \ build_scripts/requirements3.9.txt \ build_scripts/requirements3.10.txt \ build_scripts/requirements3.11.txt \ + build_scripts/requirements3.12.txt \ build_scripts/requirements-base-tools.txt \ /build_scripts/ COPY build_scripts/requirements-tools/* /build_scripts/requirements-tools/ diff --git a/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_training_cuda11_8 b/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_training_cuda11_8 index 09ab7951552a0..b194302760aaf 100644 --- a/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_training_cuda11_8 +++ b/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_training_cuda11_8 @@ -119,6 +119,10 @@ FROM build_cpython AS build_cpython311 COPY build_scripts/cpython-pubkey-310-311.txt /build_scripts/cpython-pubkeys.txt RUN manylinux-entrypoint /build_scripts/build-cpython.sh 3.11.2 +FROM build_cpython AS build_cpython312 +COPY build_scripts/cpython-pubkey-312-313.txt /build_scripts/cpython-pubkeys.txt +RUN manylinux-entrypoint /build_scripts/build-cpython.sh 3.12.1 + FROM build_cpython AS all_python COPY build_scripts/install-pypy.sh \ build_scripts/pypy.sha256 \ @@ -143,6 +147,7 @@ COPY build_scripts/finalize.sh \ build_scripts/requirements3.9.txt \ build_scripts/requirements3.10.txt \ build_scripts/requirements3.11.txt \ + build_scripts/requirements3.12.txt \ build_scripts/requirements-base-tools.txt \ /build_scripts/ COPY build_scripts/requirements-tools/* /build_scripts/requirements-tools/ diff --git a/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_training_cuda12_2 b/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_training_cuda12_2 index a36f60b87768d..fec9cd0517965 100644 --- a/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_training_cuda12_2 +++ b/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_training_cuda12_2 @@ -119,6 +119,10 @@ FROM build_cpython AS build_cpython311 COPY build_scripts/cpython-pubkey-310-311.txt /build_scripts/cpython-pubkeys.txt RUN manylinux-entrypoint /build_scripts/build-cpython.sh 3.11.2 +FROM build_cpython AS build_cpython312 +COPY build_scripts/cpython-pubkey-312-313.txt /build_scripts/cpython-pubkeys.txt +RUN manylinux-entrypoint /build_scripts/build-cpython.sh 3.12.1 + FROM build_cpython AS all_python COPY build_scripts/install-pypy.sh \ build_scripts/pypy.sha256 \ @@ -143,6 +147,7 @@ COPY build_scripts/finalize.sh \ build_scripts/requirements3.9.txt \ build_scripts/requirements3.10.txt \ build_scripts/requirements3.11.txt \ + build_scripts/requirements3.12.txt \ build_scripts/requirements-base-tools.txt \ /build_scripts/ COPY build_scripts/requirements-tools/* /build_scripts/requirements-tools/ diff --git a/tools/ci_build/github/linux/docker/inference/x64/python/cpu/Dockerfile.manylinux2_28_cpu b/tools/ci_build/github/linux/docker/inference/x64/python/cpu/Dockerfile.manylinux2_28_cpu index 06e75ee1a39f6..2e691b006deda 100644 --- a/tools/ci_build/github/linux/docker/inference/x64/python/cpu/Dockerfile.manylinux2_28_cpu +++ b/tools/ci_build/github/linux/docker/inference/x64/python/cpu/Dockerfile.manylinux2_28_cpu @@ -114,6 +114,10 @@ FROM build_cpython AS build_cpython311 COPY build_scripts/cpython-pubkey-310-311.txt /build_scripts/cpython-pubkeys.txt RUN manylinux-entrypoint /build_scripts/build-cpython.sh 3.11.2 +FROM build_cpython AS build_cpython312 +COPY build_scripts/cpython-pubkey-312-313.txt /build_scripts/cpython-pubkeys.txt +RUN manylinux-entrypoint /build_scripts/build-cpython.sh 3.12.1 + FROM build_cpython AS all_python COPY build_scripts/finalize-python.sh \ /build_scripts/ @@ -135,6 +139,7 @@ COPY build_scripts/finalize.sh \ build_scripts/requirements3.9.txt \ build_scripts/requirements3.10.txt \ build_scripts/requirements3.11.txt \ + build_scripts/requirements3.12.txt \ build_scripts/requirements-base-tools.txt \ /build_scripts/ COPY build_scripts/requirements-tools/* /build_scripts/requirements-tools/ diff --git a/tools/ci_build/github/linux/docker/scripts/install_python_deps.sh b/tools/ci_build/github/linux/docker/scripts/install_python_deps.sh index 86585b75d43fe..1ac1d226deec6 100755 --- a/tools/ci_build/github/linux/docker/scripts/install_python_deps.sh +++ b/tools/ci_build/github/linux/docker/scripts/install_python_deps.sh @@ -46,6 +46,8 @@ elif [[ "$PYTHON_VER" = "3.10" && -d "/opt/python/cp310-cp310" ]]; then PYTHON_EXE="/opt/python/cp310-cp310/bin/python3.10" elif [[ "$PYTHON_VER" = "3.11" && -d "/opt/python/cp311-cp311" ]]; then PYTHON_EXE="/opt/python/cp311-cp311/bin/python3.11" +elif [[ "$PYTHON_VER" = "3.12" && -d "/opt/python/cp312-cp312" ]]; then + PYTHON_EXE="/opt/python/cp312-cp312/bin/python3.12" else PYTHON_EXE="/usr/bin/python${PYTHON_VER}" fi From 9974d4fce4b177f509e0be657ed849bdeb02c1cd Mon Sep 17 00:00:00 2001 From: Jian Chen Date: Wed, 13 Dec 2023 17:49:17 -0500 Subject: [PATCH 02/16] update python312 to shell files --- tools/ci_build/github/linux/build_linux_python_package.sh | 2 +- .../docker/inference/x64/python/cpu/scripts/install_deps.sh | 2 +- .../github/linux/docker/scripts/manylinux/install_deps.sh | 2 +- .../github/linux/docker/scripts/manylinux/install_deps_aten.sh | 2 +- .../github/linux/docker/scripts/manylinux/install_deps_eager.sh | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/ci_build/github/linux/build_linux_python_package.sh b/tools/ci_build/github/linux/build_linux_python_package.sh index 3c1c65c9a6862..9a4240c2a414c 100755 --- a/tools/ci_build/github/linux/build_linux_python_package.sh +++ b/tools/ci_build/github/linux/build_linux_python_package.sh @@ -9,7 +9,7 @@ EXTRA_ARG="" # Put 3.8 at the last because Ubuntu 20.04 use python 3.8 and we will upload the intermediate build files of this # config to Azure DevOps Artifacts and download them to a Ubuntu 20.04 machine to run the tests. -PYTHON_EXES=("/opt/python/cp39-cp39/bin/python3.9" "/opt/python/cp310-cp310/bin/python3.10" "/opt/python/cp311-cp311/bin/python3.11" "/opt/python/cp38-cp38/bin/python3.8") +PYTHON_EXES=("/opt/python/cp39-cp39/bin/python3.9" "/opt/python/cp310-cp310/bin/python3.10" "/opt/python/cp311-cp311/bin/python3.11" "/opt/python/cp38-cp38/bin/python3.8" "/opt/python/cp312-cp312/bin/python3.12") while getopts "d:p:x:c:" parameter_Option do case "${parameter_Option}" in diff --git a/tools/ci_build/github/linux/docker/inference/x64/python/cpu/scripts/install_deps.sh b/tools/ci_build/github/linux/docker/inference/x64/python/cpu/scripts/install_deps.sh index 7bf031ee78485..f576b867da73b 100755 --- a/tools/ci_build/github/linux/docker/inference/x64/python/cpu/scripts/install_deps.sh +++ b/tools/ci_build/github/linux/docker/inference/x64/python/cpu/scripts/install_deps.sh @@ -1,7 +1,7 @@ #!/bin/bash set -e -x pushd . -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") +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") CURRENT_DIR=$(pwd) if ! [ -x "$(command -v protoc)" ]; then $CURRENT_DIR/install_protobuf.sh diff --git a/tools/ci_build/github/linux/docker/scripts/manylinux/install_deps.sh b/tools/ci_build/github/linux/docker/scripts/manylinux/install_deps.sh index 8c79918120d8d..5b181a484a607 100755 --- a/tools/ci_build/github/linux/docker/scripts/manylinux/install_deps.sh +++ b/tools/ci_build/github/linux/docker/scripts/manylinux/install_deps.sh @@ -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") + 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") else PYTHON_EXES=("/opt/conda/bin/python") fi diff --git a/tools/ci_build/github/linux/docker/scripts/manylinux/install_deps_aten.sh b/tools/ci_build/github/linux/docker/scripts/manylinux/install_deps_aten.sh index 1f85f72aef423..8d13b86a2b73b 100755 --- a/tools/ci_build/github/linux/docker/scripts/manylinux/install_deps_aten.sh +++ b/tools/ci_build/github/linux/docker/scripts/manylinux/install_deps_aten.sh @@ -6,7 +6,7 @@ yum -y install \ graphviz 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") + 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") else PYTHON_EXES=("/opt/conda/bin/python") fi diff --git a/tools/ci_build/github/linux/docker/scripts/manylinux/install_deps_eager.sh b/tools/ci_build/github/linux/docker/scripts/manylinux/install_deps_eager.sh index ad3366b0bb3b6..d8d2fbc06a00b 100755 --- a/tools/ci_build/github/linux/docker/scripts/manylinux/install_deps_eager.sh +++ b/tools/ci_build/github/linux/docker/scripts/manylinux/install_deps_eager.sh @@ -6,7 +6,7 @@ yum -y install \ graphviz 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") + 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") else PYTHON_EXES=("/opt/conda/bin/python") fi From 5e87a2d39bebe64a30e2c28aa22e4fa545a850e4 Mon Sep 17 00:00:00 2001 From: Jian Chen Date: Sat, 16 Dec 2023 13:06:21 -0500 Subject: [PATCH 03/16] Update numpy version --- .../docker/inference/x64/python/cpu/scripts/requirements.txt | 3 ++- .../github/linux/docker/scripts/manylinux/requirements.txt | 3 ++- tools/ci_build/github/linux/docker/scripts/requirements.txt | 3 ++- .../ortmodule/stage1/requirements_rocm/requirements.txt | 3 ++- .../docker/scripts/training/ortmodule/stage2/requirements.txt | 3 ++- tools/ci_build/requirements.txt | 2 +- 6 files changed, 11 insertions(+), 6 deletions(-) diff --git a/tools/ci_build/github/linux/docker/inference/x64/python/cpu/scripts/requirements.txt b/tools/ci_build/github/linux/docker/inference/x64/python/cpu/scripts/requirements.txt index aa0ad05b42dbf..7249fd2331321 100644 --- a/tools/ci_build/github/linux/docker/inference/x64/python/cpu/scripts/requirements.txt +++ b/tools/ci_build/github/linux/docker/inference/x64/python/cpu/scripts/requirements.txt @@ -1,5 +1,6 @@ numpy==1.21.6 ; python_version < '3.11' -numpy==1.24.2 ; python_version >= '3.11' +numpy==1.24.2 ; python_version == '3.11' +numpy==1.26.0 ; python_version >= '3.12' mypy pytest setuptools>=68.2.2 diff --git a/tools/ci_build/github/linux/docker/scripts/manylinux/requirements.txt b/tools/ci_build/github/linux/docker/scripts/manylinux/requirements.txt index d6912bfb05efe..94f52f476579b 100644 --- a/tools/ci_build/github/linux/docker/scripts/manylinux/requirements.txt +++ b/tools/ci_build/github/linux/docker/scripts/manylinux/requirements.txt @@ -1,5 +1,6 @@ numpy==1.21.6 ; python_version < '3.11' -numpy==1.24.2 ; python_version >= '3.11' +numpy==1.24.2 ; python_version == '3.11' +numpy==1.26.0 ; python_version >= '3.12' mypy pytest setuptools>=68.2.2 diff --git a/tools/ci_build/github/linux/docker/scripts/requirements.txt b/tools/ci_build/github/linux/docker/scripts/requirements.txt index a6452721a2b7d..c0eb010252bb4 100644 --- a/tools/ci_build/github/linux/docker/scripts/requirements.txt +++ b/tools/ci_build/github/linux/docker/scripts/requirements.txt @@ -1,6 +1,7 @@ cerberus numpy==1.21.6 ; python_version < '3.11' -numpy==1.24.2 ; python_version >= '3.11' +numpy==1.24.2 ; python_version == '3.11' +numpy==1.26.0 ; python_version >= '3.12' mypy pytest setuptools>=68.2.2 diff --git a/tools/ci_build/github/linux/docker/scripts/training/ortmodule/stage1/requirements_rocm/requirements.txt b/tools/ci_build/github/linux/docker/scripts/training/ortmodule/stage1/requirements_rocm/requirements.txt index 9c52aff960d6e..57331d6df97d9 100644 --- a/tools/ci_build/github/linux/docker/scripts/training/ortmodule/stage1/requirements_rocm/requirements.txt +++ b/tools/ci_build/github/linux/docker/scripts/training/ortmodule/stage1/requirements_rocm/requirements.txt @@ -1,2 +1,3 @@ numpy==1.21.6 ; python_version < '3.11' -numpy==1.24.2 ; python_version >= '3.11' \ No newline at end of file +numpy==1.24.2 ; python_version == '3.11' +numpy==1.26.0 ; python_version >= '3.12' \ No newline at end of file diff --git a/tools/ci_build/github/linux/docker/scripts/training/ortmodule/stage2/requirements.txt b/tools/ci_build/github/linux/docker/scripts/training/ortmodule/stage2/requirements.txt index b4b265f65b69f..8ce1b968986e4 100644 --- a/tools/ci_build/github/linux/docker/scripts/training/ortmodule/stage2/requirements.txt +++ b/tools/ci_build/github/linux/docker/scripts/training/ortmodule/stage2/requirements.txt @@ -1,7 +1,8 @@ pandas scikit-learn numpy==1.21.6 ; python_version < '3.11' -numpy==1.24.2 ; python_version >= '3.11' +numpy==1.24.2 ; python_version == '3.11' +numpy==1.26.0 ; python_version >= '3.12' transformers==v4.30.0 accelerate rsa==4.9 diff --git a/tools/ci_build/requirements.txt b/tools/ci_build/requirements.txt index 96659d70af81f..8aed658d72bd2 100644 --- a/tools/ci_build/requirements.txt +++ b/tools/ci_build/requirements.txt @@ -1,7 +1,7 @@ # packages used by transformers python unittest (only enabled in Linux CPU CI Pipeline) packaging protobuf==3.20.2 -numpy==1.24.0 +numpy==1.26.0 coloredlogs==15.0 transformers==4.30.0 psutil From 7863e17989612b2c5fd4268aa5a01d67db5743e7 Mon Sep 17 00:00:00 2001 From: Jian Chen Date: Sat, 16 Dec 2023 13:47:30 -0500 Subject: [PATCH 04/16] Update commitHash --- cgmanifests/cgmanifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cgmanifests/cgmanifest.json b/cgmanifests/cgmanifest.json index e8dbc9cf9eff6..284cbb26788a6 100644 --- a/cgmanifests/cgmanifest.json +++ b/cgmanifests/cgmanifest.json @@ -5,7 +5,7 @@ "component": { "type": "git", "git": { - "commitHash": "215105818dfde3174fe799600bb0f3cae233d0bf", + "commitHash": "93d8a750f5f3de6c941719427f1fee23995092bb", "repositoryUrl": "https://github.com/abseil/abseil-cpp.git" } } From 3e65bae127612c57d5efb4bcf1c0232d467aeb3b Mon Sep 17 00:00:00 2001 From: Jian Chen Date: Sat, 16 Dec 2023 13:55:41 -0500 Subject: [PATCH 05/16] Update commitHash --- cgmanifests/cgmanifest.json | 4 ++-- .../github/azure-pipelines/binary-size-checks-pipeline.yml | 2 +- .../azure-pipelines/build-perf-test-binaries-pipeline.yml | 2 +- .../azure-pipelines/c-api-noopenmp-packaging-pipelines.yml | 2 +- .../github/azure-pipelines/cuda-packaging-pipeline.yml | 2 +- tools/ci_build/github/azure-pipelines/linux-ci-pipeline.yml | 2 +- .../github/azure-pipelines/linux-cpu-aten-pipeline.yml | 2 +- .../github/azure-pipelines/linux-cpu-eager-pipeline.yml | 2 +- .../azure-pipelines/linux-cpu-minimal-build-ci-pipeline.yml | 2 +- .../github/azure-pipelines/linux-dnnl-ci-pipeline.yml | 2 +- .../ci_build/github/azure-pipelines/linux-gpu-ci-pipeline.yml | 2 +- .../github/azure-pipelines/linux-gpu-tensorrt-ci-pipeline.yml | 2 +- .../github/azure-pipelines/mac-react-native-ci-pipeline.yml | 2 +- .../github/azure-pipelines/npm-packaging-pipeline.yml | 2 +- .../github/azure-pipelines/orttraining-linux-ci-pipeline.yml | 2 +- .../github/azure-pipelines/orttraining-pai-ci-pipeline.yml | 2 +- .../azure-pipelines/orttraining-py-packaging-pipeline-cpu.yml | 2 +- .../orttraining-py-packaging-pipeline-cuda.yml | 2 +- .../orttraining-py-packaging-pipeline-cuda12.yml | 2 +- .../orttraining-py-packaging-pipeline-rocm.yml | 2 +- .../github/azure-pipelines/py-cuda-packaging-pipeline.yml | 2 +- .../github/azure-pipelines/py-package-build-pipeline.yml | 2 +- .../github/azure-pipelines/py-package-test-pipeline.yml | 2 +- .../ci_build/github/azure-pipelines/py-packaging-pipeline.yml | 2 +- 24 files changed, 25 insertions(+), 25 deletions(-) diff --git a/cgmanifests/cgmanifest.json b/cgmanifests/cgmanifest.json index 284cbb26788a6..8cc24da7cad03 100644 --- a/cgmanifests/cgmanifest.json +++ b/cgmanifests/cgmanifest.json @@ -5,7 +5,7 @@ "component": { "type": "git", "git": { - "commitHash": "93d8a750f5f3de6c941719427f1fee23995092bb", + "commitHash": "215105818dfde3174fe799600bb0f3cae233d0bf", "repositoryUrl": "https://github.com/abseil/abseil-cpp.git" } } @@ -398,7 +398,7 @@ "component": { "type": "git", "git": { - "commitHash": "aead4d751c2101e23336aa73f2380df83e7a13f3", + "commitHash": "93d8a750f5f3de6c941719427f1fee23995092bb", "repositoryUrl": "https://github.com/pypa/manylinux" }, "comments": "For building our CI build docker image" diff --git a/tools/ci_build/github/azure-pipelines/binary-size-checks-pipeline.yml b/tools/ci_build/github/azure-pipelines/binary-size-checks-pipeline.yml index e9762bc312455..3fa1c9c824c0e 100644 --- a/tools/ci_build/github/azure-pipelines/binary-size-checks-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/binary-size-checks-pipeline.yml @@ -10,7 +10,7 @@ resources: type: Github endpoint: Microsoft name: pypa/manylinux - ref: 5eda9aded5462201e6310105728d33016e637ea7 + ref: 39159767b951fead9cb36a36c40d920638796138 stages: diff --git a/tools/ci_build/github/azure-pipelines/build-perf-test-binaries-pipeline.yml b/tools/ci_build/github/azure-pipelines/build-perf-test-binaries-pipeline.yml index 08330764ff5f7..25337a2c749a7 100644 --- a/tools/ci_build/github/azure-pipelines/build-perf-test-binaries-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/build-perf-test-binaries-pipeline.yml @@ -12,7 +12,7 @@ resources: type: Github endpoint: Microsoft name: pypa/manylinux - ref: 5eda9aded5462201e6310105728d33016e637ea7 + ref: 39159767b951fead9cb36a36c40d920638796138 stages: 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 7e389d1761613..7dbd86c4e9b1a 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 @@ -78,7 +78,7 @@ resources: type: Github endpoint: Microsoft name: pypa/manylinux - ref: 5eda9aded5462201e6310105728d33016e637ea7 + ref: 39159767b951fead9cb36a36c40d920638796138 variables: - name: ReleaseVersionSuffix 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 8a9592282cd46..50816a0bdeeb0 100644 --- a/tools/ci_build/github/azure-pipelines/cuda-packaging-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/cuda-packaging-pipeline.yml @@ -91,7 +91,7 @@ resources: type: Github endpoint: Microsoft name: pypa/manylinux - ref: 5eda9aded5462201e6310105728d33016e637ea7 + ref: 39159767b951fead9cb36a36c40d920638796138 stages: # Set ReleaseVersionSuffix diff --git a/tools/ci_build/github/azure-pipelines/linux-ci-pipeline.yml b/tools/ci_build/github/azure-pipelines/linux-ci-pipeline.yml index 64b78dca504ca..8a9144b76d684 100644 --- a/tools/ci_build/github/azure-pipelines/linux-ci-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/linux-ci-pipeline.yml @@ -33,7 +33,7 @@ resources: type: Github endpoint: Microsoft name: pypa/manylinux - ref: 5eda9aded5462201e6310105728d33016e637ea7 + ref: 39159767b951fead9cb36a36c40d920638796138 stages: - stage: x64 dependsOn: [] diff --git a/tools/ci_build/github/azure-pipelines/linux-cpu-aten-pipeline.yml b/tools/ci_build/github/azure-pipelines/linux-cpu-aten-pipeline.yml index 146186e9eeaf5..1a30d6261424c 100644 --- a/tools/ci_build/github/azure-pipelines/linux-cpu-aten-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/linux-cpu-aten-pipeline.yml @@ -33,7 +33,7 @@ resources: type: Github endpoint: Microsoft name: pypa/manylinux - ref: 5eda9aded5462201e6310105728d33016e637ea7 + ref: 39159767b951fead9cb36a36c40d920638796138 jobs: - job: Linux_Build diff --git a/tools/ci_build/github/azure-pipelines/linux-cpu-eager-pipeline.yml b/tools/ci_build/github/azure-pipelines/linux-cpu-eager-pipeline.yml index a5c08e95b7efc..868c81fd945ce 100644 --- a/tools/ci_build/github/azure-pipelines/linux-cpu-eager-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/linux-cpu-eager-pipeline.yml @@ -33,7 +33,7 @@ resources: type: Github endpoint: Microsoft name: pypa/manylinux - ref: 5eda9aded5462201e6310105728d33016e637ea7 + ref: 39159767b951fead9cb36a36c40d920638796138 jobs: # This pipeline builds the latest PyTorch commit from source diff --git a/tools/ci_build/github/azure-pipelines/linux-cpu-minimal-build-ci-pipeline.yml b/tools/ci_build/github/azure-pipelines/linux-cpu-minimal-build-ci-pipeline.yml index 3eb74f306951c..d954e5d741531 100644 --- a/tools/ci_build/github/azure-pipelines/linux-cpu-minimal-build-ci-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/linux-cpu-minimal-build-ci-pipeline.yml @@ -52,7 +52,7 @@ resources: type: Github endpoint: Microsoft name: pypa/manylinux - ref: 5eda9aded5462201e6310105728d33016e637ea7 + ref: 39159767b951fead9cb36a36c40d920638796138 jobs: - job: Linux_CPU_Minimal_Build_E2E diff --git a/tools/ci_build/github/azure-pipelines/linux-dnnl-ci-pipeline.yml b/tools/ci_build/github/azure-pipelines/linux-dnnl-ci-pipeline.yml index 1c6d8bbfe7fbe..2f2d89f5c0530 100644 --- a/tools/ci_build/github/azure-pipelines/linux-dnnl-ci-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/linux-dnnl-ci-pipeline.yml @@ -33,7 +33,7 @@ resources: type: Github endpoint: Microsoft name: pypa/manylinux - ref: 5eda9aded5462201e6310105728d33016e637ea7 + ref: 39159767b951fead9cb36a36c40d920638796138 jobs: - job: Linux_py_Wheels 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 0993a81a02249..5cf85bd8fe126 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 @@ -40,7 +40,7 @@ resources: type: Github endpoint: Microsoft name: pypa/manylinux - ref: 5eda9aded5462201e6310105728d33016e637ea7 + ref: 39159767b951fead9cb36a36c40d920638796138 variables: - template: templates/common-variables.yml 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 4ca11a4d1565b..ee02fa1aeb106 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 @@ -40,7 +40,7 @@ resources: type: Github endpoint: Microsoft name: pypa/manylinux - ref: 5eda9aded5462201e6310105728d33016e637ea7 + ref: 39159767b951fead9cb36a36c40d920638796138 variables: - name: docker_base_image ${{ if eq(parameters.CudaVersion, '11.8') }}: diff --git a/tools/ci_build/github/azure-pipelines/mac-react-native-ci-pipeline.yml b/tools/ci_build/github/azure-pipelines/mac-react-native-ci-pipeline.yml index e8f4931d5ad9f..991c4b5ce6d8f 100644 --- a/tools/ci_build/github/azure-pipelines/mac-react-native-ci-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/mac-react-native-ci-pipeline.yml @@ -44,7 +44,7 @@ resources: type: Github endpoint: Microsoft name: pypa/manylinux - ref: 5eda9aded5462201e6310105728d33016e637ea7 + ref: 39159767b951fead9cb36a36c40d920638796138 variables: ${{ if eq(parameters.NpmPublish, 'nightly (@dev)') }}: diff --git a/tools/ci_build/github/azure-pipelines/npm-packaging-pipeline.yml b/tools/ci_build/github/azure-pipelines/npm-packaging-pipeline.yml index 7f73da23b5eb1..d2f496fed0de8 100644 --- a/tools/ci_build/github/azure-pipelines/npm-packaging-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/npm-packaging-pipeline.yml @@ -34,7 +34,7 @@ resources: type: Github endpoint: Microsoft name: pypa/manylinux - ref: 5eda9aded5462201e6310105728d33016e637ea7 + ref: 39159767b951fead9cb36a36c40d920638796138 stages: - template: templates/web-ci.yml diff --git a/tools/ci_build/github/azure-pipelines/orttraining-linux-ci-pipeline.yml b/tools/ci_build/github/azure-pipelines/orttraining-linux-ci-pipeline.yml index 018672e0b2dea..f3e4200261e31 100644 --- a/tools/ci_build/github/azure-pipelines/orttraining-linux-ci-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/orttraining-linux-ci-pipeline.yml @@ -33,7 +33,7 @@ resources: type: Github endpoint: Microsoft name: pypa/manylinux - ref: 5eda9aded5462201e6310105728d33016e637ea7 + ref: 39159767b951fead9cb36a36c40d920638796138 jobs: - job: Linux_Build diff --git a/tools/ci_build/github/azure-pipelines/orttraining-pai-ci-pipeline.yml b/tools/ci_build/github/azure-pipelines/orttraining-pai-ci-pipeline.yml index 8d02a5e5809a2..e0ce0293ab76e 100644 --- a/tools/ci_build/github/azure-pipelines/orttraining-pai-ci-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/orttraining-pai-ci-pipeline.yml @@ -17,7 +17,7 @@ resources: type: Github endpoint: Microsoft name: pypa/manylinux - ref: 5eda9aded5462201e6310105728d33016e637ea7 + ref: 39159767b951fead9cb36a36c40d920638796138 variables: - name: video diff --git a/tools/ci_build/github/azure-pipelines/orttraining-py-packaging-pipeline-cpu.yml b/tools/ci_build/github/azure-pipelines/orttraining-py-packaging-pipeline-cpu.yml index d6831e291911a..c905afca0f4a9 100644 --- a/tools/ci_build/github/azure-pipelines/orttraining-py-packaging-pipeline-cpu.yml +++ b/tools/ci_build/github/azure-pipelines/orttraining-py-packaging-pipeline-cpu.yml @@ -6,7 +6,7 @@ resources: type: Github endpoint: Microsoft name: pypa/manylinux - ref: 5eda9aded5462201e6310105728d33016e637ea7 + ref: 39159767b951fead9cb36a36c40d920638796138 stages: - stage: Python_Packaging_Linux_Training_CPU diff --git a/tools/ci_build/github/azure-pipelines/orttraining-py-packaging-pipeline-cuda.yml b/tools/ci_build/github/azure-pipelines/orttraining-py-packaging-pipeline-cuda.yml index f244851f8cc37..3e269753db204 100644 --- a/tools/ci_build/github/azure-pipelines/orttraining-py-packaging-pipeline-cuda.yml +++ b/tools/ci_build/github/azure-pipelines/orttraining-py-packaging-pipeline-cuda.yml @@ -6,7 +6,7 @@ resources: type: Github endpoint: Microsoft name: pypa/manylinux - ref: 5eda9aded5462201e6310105728d33016e637ea7 + ref: 39159767b951fead9cb36a36c40d920638796138 stages: - template: templates/py-packaging-training-cuda-stage.yml diff --git a/tools/ci_build/github/azure-pipelines/orttraining-py-packaging-pipeline-cuda12.yml b/tools/ci_build/github/azure-pipelines/orttraining-py-packaging-pipeline-cuda12.yml index 422fb33eec5de..c4f78a12a3852 100644 --- a/tools/ci_build/github/azure-pipelines/orttraining-py-packaging-pipeline-cuda12.yml +++ b/tools/ci_build/github/azure-pipelines/orttraining-py-packaging-pipeline-cuda12.yml @@ -6,7 +6,7 @@ resources: type: Github endpoint: Microsoft name: pypa/manylinux - ref: 5eda9aded5462201e6310105728d33016e637ea7 + ref: 39159767b951fead9cb36a36c40d920638796138 stages: - template: templates/py-packaging-training-cuda-stage.yml diff --git a/tools/ci_build/github/azure-pipelines/orttraining-py-packaging-pipeline-rocm.yml b/tools/ci_build/github/azure-pipelines/orttraining-py-packaging-pipeline-rocm.yml index f2ba99369c144..90e90dc9ed0f6 100644 --- a/tools/ci_build/github/azure-pipelines/orttraining-py-packaging-pipeline-rocm.yml +++ b/tools/ci_build/github/azure-pipelines/orttraining-py-packaging-pipeline-rocm.yml @@ -6,7 +6,7 @@ resources: type: Github endpoint: Microsoft name: pypa/manylinux - ref: 5eda9aded5462201e6310105728d33016e637ea7 + ref: 39159767b951fead9cb36a36c40d920638796138 stages: - stage: "Python_Packaging_ROCm57_Release" diff --git a/tools/ci_build/github/azure-pipelines/py-cuda-packaging-pipeline.yml b/tools/ci_build/github/azure-pipelines/py-cuda-packaging-pipeline.yml index aee42d3675087..b7f1e04345ee8 100644 --- a/tools/ci_build/github/azure-pipelines/py-cuda-packaging-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/py-cuda-packaging-pipeline.yml @@ -28,7 +28,7 @@ resources: type: Github endpoint: Microsoft name: pypa/manylinux - ref: 5eda9aded5462201e6310105728d33016e637ea7 + ref: 39159767b951fead9cb36a36c40d920638796138 stages: - template: stages/py-cuda-packaging-stage.yml diff --git a/tools/ci_build/github/azure-pipelines/py-package-build-pipeline.yml b/tools/ci_build/github/azure-pipelines/py-package-build-pipeline.yml index 4c80aedeb1f18..ae6cd0c78c712 100644 --- a/tools/ci_build/github/azure-pipelines/py-package-build-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/py-package-build-pipeline.yml @@ -47,7 +47,7 @@ resources: type: Github endpoint: Microsoft name: pypa/manylinux - ref: 5eda9aded5462201e6310105728d33016e637ea7 + ref: 39159767b951fead9cb36a36c40d920638796138 stages: - template: templates/py-packaging-selectable-stage.yml diff --git a/tools/ci_build/github/azure-pipelines/py-package-test-pipeline.yml b/tools/ci_build/github/azure-pipelines/py-package-test-pipeline.yml index 55d3150f21aa3..2d7e36a098c03 100644 --- a/tools/ci_build/github/azure-pipelines/py-package-test-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/py-package-test-pipeline.yml @@ -10,7 +10,7 @@ resources: type: Github endpoint: Microsoft name: pypa/manylinux - ref: 5eda9aded5462201e6310105728d33016e637ea7 + ref: 39159767b951fead9cb36a36c40d920638796138 stages: - stage: Linux_Test_CPU_x86_64_stage diff --git a/tools/ci_build/github/azure-pipelines/py-packaging-pipeline.yml b/tools/ci_build/github/azure-pipelines/py-packaging-pipeline.yml index 62f84a9bb185c..c3322ea3384c0 100644 --- a/tools/ci_build/github/azure-pipelines/py-packaging-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/py-packaging-pipeline.yml @@ -58,7 +58,7 @@ resources: type: Github endpoint: Microsoft name: pypa/manylinux - ref: 5eda9aded5462201e6310105728d33016e637ea7 + ref: 39159767b951fead9cb36a36c40d920638796138 stages: - template: templates/py-packaging-stage.yml From bc2ae96cd80739cb8f4205725c1b5218a177ed4a Mon Sep 17 00:00:00 2001 From: Jian Chen Date: Sat, 16 Dec 2023 13:56:32 -0500 Subject: [PATCH 06/16] Update commitHash --- cgmanifests/cgmanifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cgmanifests/cgmanifest.json b/cgmanifests/cgmanifest.json index 8cc24da7cad03..e8dbc9cf9eff6 100644 --- a/cgmanifests/cgmanifest.json +++ b/cgmanifests/cgmanifest.json @@ -398,7 +398,7 @@ "component": { "type": "git", "git": { - "commitHash": "93d8a750f5f3de6c941719427f1fee23995092bb", + "commitHash": "aead4d751c2101e23336aa73f2380df83e7a13f3", "repositoryUrl": "https://github.com/pypa/manylinux" }, "comments": "For building our CI build docker image" From 6962d2abc8154ba860853dde2e033b3bd38ddad6 Mon Sep 17 00:00:00 2001 From: Jian Chen Date: Sat, 16 Dec 2023 14:22:53 -0500 Subject: [PATCH 07/16] Update ssl --- .../ci_build/github/linux/docker/Dockerfile.manylinux2_28_cpu | 4 ++-- .../github/linux/docker/Dockerfile.manylinux2_28_cuda | 4 ++-- .../github/linux/docker/Dockerfile.manylinux2_28_rocm | 4 ++-- .../linux/docker/Dockerfile.manylinux2_28_training_cuda11_8 | 4 ++-- .../linux/docker/Dockerfile.manylinux2_28_training_cuda12_2 | 4 ++-- .../inference/x64/python/cpu/Dockerfile.manylinux2_28_cpu | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_cpu b/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_cpu index 546fca69201a1..8477ef15f5e95 100644 --- a/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_cpu +++ b/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_cpu @@ -88,8 +88,8 @@ RUN export SQLITE_AUTOCONF_ROOT=sqlite-autoconf-3390200 && \ manylinux-entrypoint /build_scripts/build-sqlite3.sh COPY build_scripts/build-openssl.sh /build_scripts/ -RUN export OPENSSL_ROOT=openssl-1.1.1q && \ - export OPENSSL_HASH=d7939ce614029cdff0b6c20f0e2e5703158a489a72b2507b8bd51bf8c8fd10ca && \ +RUN export OPENSSL_ROOT=openssl-3.0.12 && \ + export OPENSSL_HASH=f93c9e8edde5e9166119de31755fc87b4aa34863662f67ddfcba14d0b6b69b61 && \ export OPENSSL_DOWNLOAD_URL=https://www.openssl.org/source && \ manylinux-entrypoint /build_scripts/build-openssl.sh 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 807b9769146e7..59d23a3022a6f 100644 --- a/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_cuda +++ b/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_cuda @@ -94,8 +94,8 @@ RUN export SQLITE_AUTOCONF_ROOT=sqlite-autoconf-3390200 && \ manylinux-entrypoint /build_scripts/build-sqlite3.sh COPY build_scripts/build-openssl.sh /build_scripts/ -RUN export OPENSSL_ROOT=openssl-1.1.1q && \ - export OPENSSL_HASH=d7939ce614029cdff0b6c20f0e2e5703158a489a72b2507b8bd51bf8c8fd10ca && \ +RUN export OPENSSL_ROOT=openssl-3.0.12 && \ + export OPENSSL_HASH=f93c9e8edde5e9166119de31755fc87b4aa34863662f67ddfcba14d0b6b69b61 && \ export OPENSSL_DOWNLOAD_URL=https://www.openssl.org/source && \ manylinux-entrypoint /build_scripts/build-openssl.sh diff --git a/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_rocm b/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_rocm index 913b2b92e81e8..0e01b442549d3 100644 --- a/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_rocm +++ b/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_rocm @@ -108,8 +108,8 @@ RUN export SQLITE_AUTOCONF_ROOT=sqlite-autoconf-3390200 && \ manylinux-entrypoint /build_scripts/build-sqlite3.sh COPY build_scripts/build-openssl.sh /build_scripts/ -RUN export OPENSSL_ROOT=openssl-1.1.1q && \ - export OPENSSL_HASH=d7939ce614029cdff0b6c20f0e2e5703158a489a72b2507b8bd51bf8c8fd10ca && \ +RUN export OPENSSL_ROOT=openssl-3.0.12 && \ + export OPENSSL_HASH=f93c9e8edde5e9166119de31755fc87b4aa34863662f67ddfcba14d0b6b69b61 && \ export OPENSSL_DOWNLOAD_URL=https://www.openssl.org/source && \ manylinux-entrypoint /build_scripts/build-openssl.sh diff --git a/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_training_cuda11_8 b/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_training_cuda11_8 index b194302760aaf..b961d7bbafb55 100644 --- a/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_training_cuda11_8 +++ b/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_training_cuda11_8 @@ -93,8 +93,8 @@ RUN export SQLITE_AUTOCONF_ROOT=sqlite-autoconf-3390200 && \ manylinux-entrypoint /build_scripts/build-sqlite3.sh COPY build_scripts/build-openssl.sh /build_scripts/ -RUN export OPENSSL_ROOT=openssl-1.1.1q && \ - export OPENSSL_HASH=d7939ce614029cdff0b6c20f0e2e5703158a489a72b2507b8bd51bf8c8fd10ca && \ +RUN export OPENSSL_ROOT=openssl-3.0.12 && \ + export OPENSSL_HASH=f93c9e8edde5e9166119de31755fc87b4aa34863662f67ddfcba14d0b6b69b61 && \ export OPENSSL_DOWNLOAD_URL=https://www.openssl.org/source && \ manylinux-entrypoint /build_scripts/build-openssl.sh diff --git a/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_training_cuda12_2 b/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_training_cuda12_2 index fec9cd0517965..4522859ab387c 100644 --- a/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_training_cuda12_2 +++ b/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_training_cuda12_2 @@ -93,8 +93,8 @@ RUN export SQLITE_AUTOCONF_ROOT=sqlite-autoconf-3390200 && \ manylinux-entrypoint /build_scripts/build-sqlite3.sh COPY build_scripts/build-openssl.sh /build_scripts/ -RUN export OPENSSL_ROOT=openssl-1.1.1q && \ - export OPENSSL_HASH=d7939ce614029cdff0b6c20f0e2e5703158a489a72b2507b8bd51bf8c8fd10ca && \ +RUN export OPENSSL_ROOT=openssl-3.0.12 && \ + export OPENSSL_HASH=f93c9e8edde5e9166119de31755fc87b4aa34863662f67ddfcba14d0b6b69b61 && \ export OPENSSL_DOWNLOAD_URL=https://www.openssl.org/source && \ manylinux-entrypoint /build_scripts/build-openssl.sh diff --git a/tools/ci_build/github/linux/docker/inference/x64/python/cpu/Dockerfile.manylinux2_28_cpu b/tools/ci_build/github/linux/docker/inference/x64/python/cpu/Dockerfile.manylinux2_28_cpu index 2e691b006deda..e8b0273b7b460 100644 --- a/tools/ci_build/github/linux/docker/inference/x64/python/cpu/Dockerfile.manylinux2_28_cpu +++ b/tools/ci_build/github/linux/docker/inference/x64/python/cpu/Dockerfile.manylinux2_28_cpu @@ -88,8 +88,8 @@ RUN export SQLITE_AUTOCONF_ROOT=sqlite-autoconf-3390200 && \ manylinux-entrypoint /build_scripts/build-sqlite3.sh COPY build_scripts/build-openssl.sh /build_scripts/ -RUN export OPENSSL_ROOT=openssl-1.1.1q && \ - export OPENSSL_HASH=d7939ce614029cdff0b6c20f0e2e5703158a489a72b2507b8bd51bf8c8fd10ca && \ +RUN export OPENSSL_ROOT=openssl-3.0.12 && \ + export OPENSSL_HASH=f93c9e8edde5e9166119de31755fc87b4aa34863662f67ddfcba14d0b6b69b61 && \ export OPENSSL_DOWNLOAD_URL=https://www.openssl.org/source && \ manylinux-entrypoint /build_scripts/build-openssl.sh From 4d84f96410d508835808c1352618389f2e33e460 Mon Sep 17 00:00:00 2001 From: Jian Chen Date: Sat, 16 Dec 2023 14:40:04 -0500 Subject: [PATCH 08/16] Update commit --- cgmanifests/cgmanifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cgmanifests/cgmanifest.json b/cgmanifests/cgmanifest.json index e8dbc9cf9eff6..3e56648ea4aad 100644 --- a/cgmanifests/cgmanifest.json +++ b/cgmanifests/cgmanifest.json @@ -398,7 +398,7 @@ "component": { "type": "git", "git": { - "commitHash": "aead4d751c2101e23336aa73f2380df83e7a13f3", + "commitHash": "39159767b951fead9cb36a36c40d920638796138", "repositoryUrl": "https://github.com/pypa/manylinux" }, "comments": "For building our CI build docker image" From fb0e35395ab03238dcb0123fab3bb421b04e5e6d Mon Sep 17 00:00:00 2001 From: Jian Chen Date: Sat, 16 Dec 2023 15:34:53 -0500 Subject: [PATCH 09/16] reset to 3e65bae127612c57d5efb4bcf1c0232d467aeb3b --- cgmanifests/cgmanifest.json | 2 +- .../github/linux/docker/Dockerfile.manylinux2_28_cpu | 4 ++-- .../github/linux/docker/Dockerfile.manylinux2_28_cuda | 4 ++-- .../github/linux/docker/Dockerfile.manylinux2_28_rocm | 4 ++-- .../docker/Dockerfile.manylinux2_28_training_cuda11_8 | 4 ++-- .../docker/Dockerfile.manylinux2_28_training_cuda12_2 | 4 ++-- .../x64/python/cpu/Dockerfile.manylinux2_28_cpu | 4 ++-- tools/ci_build/github/linux/docker/manylinux-entrypoint | 9 +++++++++ 8 files changed, 22 insertions(+), 13 deletions(-) create mode 100755 tools/ci_build/github/linux/docker/manylinux-entrypoint diff --git a/cgmanifests/cgmanifest.json b/cgmanifests/cgmanifest.json index 8cc24da7cad03..3e56648ea4aad 100644 --- a/cgmanifests/cgmanifest.json +++ b/cgmanifests/cgmanifest.json @@ -398,7 +398,7 @@ "component": { "type": "git", "git": { - "commitHash": "93d8a750f5f3de6c941719427f1fee23995092bb", + "commitHash": "39159767b951fead9cb36a36c40d920638796138", "repositoryUrl": "https://github.com/pypa/manylinux" }, "comments": "For building our CI build docker image" diff --git a/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_cpu b/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_cpu index 546fca69201a1..8477ef15f5e95 100644 --- a/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_cpu +++ b/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_cpu @@ -88,8 +88,8 @@ RUN export SQLITE_AUTOCONF_ROOT=sqlite-autoconf-3390200 && \ manylinux-entrypoint /build_scripts/build-sqlite3.sh COPY build_scripts/build-openssl.sh /build_scripts/ -RUN export OPENSSL_ROOT=openssl-1.1.1q && \ - export OPENSSL_HASH=d7939ce614029cdff0b6c20f0e2e5703158a489a72b2507b8bd51bf8c8fd10ca && \ +RUN export OPENSSL_ROOT=openssl-3.0.12 && \ + export OPENSSL_HASH=f93c9e8edde5e9166119de31755fc87b4aa34863662f67ddfcba14d0b6b69b61 && \ export OPENSSL_DOWNLOAD_URL=https://www.openssl.org/source && \ manylinux-entrypoint /build_scripts/build-openssl.sh 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 807b9769146e7..59d23a3022a6f 100644 --- a/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_cuda +++ b/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_cuda @@ -94,8 +94,8 @@ RUN export SQLITE_AUTOCONF_ROOT=sqlite-autoconf-3390200 && \ manylinux-entrypoint /build_scripts/build-sqlite3.sh COPY build_scripts/build-openssl.sh /build_scripts/ -RUN export OPENSSL_ROOT=openssl-1.1.1q && \ - export OPENSSL_HASH=d7939ce614029cdff0b6c20f0e2e5703158a489a72b2507b8bd51bf8c8fd10ca && \ +RUN export OPENSSL_ROOT=openssl-3.0.12 && \ + export OPENSSL_HASH=f93c9e8edde5e9166119de31755fc87b4aa34863662f67ddfcba14d0b6b69b61 && \ export OPENSSL_DOWNLOAD_URL=https://www.openssl.org/source && \ manylinux-entrypoint /build_scripts/build-openssl.sh diff --git a/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_rocm b/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_rocm index 913b2b92e81e8..0e01b442549d3 100644 --- a/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_rocm +++ b/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_rocm @@ -108,8 +108,8 @@ RUN export SQLITE_AUTOCONF_ROOT=sqlite-autoconf-3390200 && \ manylinux-entrypoint /build_scripts/build-sqlite3.sh COPY build_scripts/build-openssl.sh /build_scripts/ -RUN export OPENSSL_ROOT=openssl-1.1.1q && \ - export OPENSSL_HASH=d7939ce614029cdff0b6c20f0e2e5703158a489a72b2507b8bd51bf8c8fd10ca && \ +RUN export OPENSSL_ROOT=openssl-3.0.12 && \ + export OPENSSL_HASH=f93c9e8edde5e9166119de31755fc87b4aa34863662f67ddfcba14d0b6b69b61 && \ export OPENSSL_DOWNLOAD_URL=https://www.openssl.org/source && \ manylinux-entrypoint /build_scripts/build-openssl.sh diff --git a/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_training_cuda11_8 b/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_training_cuda11_8 index b194302760aaf..b961d7bbafb55 100644 --- a/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_training_cuda11_8 +++ b/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_training_cuda11_8 @@ -93,8 +93,8 @@ RUN export SQLITE_AUTOCONF_ROOT=sqlite-autoconf-3390200 && \ manylinux-entrypoint /build_scripts/build-sqlite3.sh COPY build_scripts/build-openssl.sh /build_scripts/ -RUN export OPENSSL_ROOT=openssl-1.1.1q && \ - export OPENSSL_HASH=d7939ce614029cdff0b6c20f0e2e5703158a489a72b2507b8bd51bf8c8fd10ca && \ +RUN export OPENSSL_ROOT=openssl-3.0.12 && \ + export OPENSSL_HASH=f93c9e8edde5e9166119de31755fc87b4aa34863662f67ddfcba14d0b6b69b61 && \ export OPENSSL_DOWNLOAD_URL=https://www.openssl.org/source && \ manylinux-entrypoint /build_scripts/build-openssl.sh diff --git a/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_training_cuda12_2 b/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_training_cuda12_2 index fec9cd0517965..4522859ab387c 100644 --- a/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_training_cuda12_2 +++ b/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_training_cuda12_2 @@ -93,8 +93,8 @@ RUN export SQLITE_AUTOCONF_ROOT=sqlite-autoconf-3390200 && \ manylinux-entrypoint /build_scripts/build-sqlite3.sh COPY build_scripts/build-openssl.sh /build_scripts/ -RUN export OPENSSL_ROOT=openssl-1.1.1q && \ - export OPENSSL_HASH=d7939ce614029cdff0b6c20f0e2e5703158a489a72b2507b8bd51bf8c8fd10ca && \ +RUN export OPENSSL_ROOT=openssl-3.0.12 && \ + export OPENSSL_HASH=f93c9e8edde5e9166119de31755fc87b4aa34863662f67ddfcba14d0b6b69b61 && \ export OPENSSL_DOWNLOAD_URL=https://www.openssl.org/source && \ manylinux-entrypoint /build_scripts/build-openssl.sh diff --git a/tools/ci_build/github/linux/docker/inference/x64/python/cpu/Dockerfile.manylinux2_28_cpu b/tools/ci_build/github/linux/docker/inference/x64/python/cpu/Dockerfile.manylinux2_28_cpu index 2e691b006deda..e8b0273b7b460 100644 --- a/tools/ci_build/github/linux/docker/inference/x64/python/cpu/Dockerfile.manylinux2_28_cpu +++ b/tools/ci_build/github/linux/docker/inference/x64/python/cpu/Dockerfile.manylinux2_28_cpu @@ -88,8 +88,8 @@ RUN export SQLITE_AUTOCONF_ROOT=sqlite-autoconf-3390200 && \ manylinux-entrypoint /build_scripts/build-sqlite3.sh COPY build_scripts/build-openssl.sh /build_scripts/ -RUN export OPENSSL_ROOT=openssl-1.1.1q && \ - export OPENSSL_HASH=d7939ce614029cdff0b6c20f0e2e5703158a489a72b2507b8bd51bf8c8fd10ca && \ +RUN export OPENSSL_ROOT=openssl-3.0.12 && \ + export OPENSSL_HASH=f93c9e8edde5e9166119de31755fc87b4aa34863662f67ddfcba14d0b6b69b61 && \ export OPENSSL_DOWNLOAD_URL=https://www.openssl.org/source && \ manylinux-entrypoint /build_scripts/build-openssl.sh diff --git a/tools/ci_build/github/linux/docker/manylinux-entrypoint b/tools/ci_build/github/linux/docker/manylinux-entrypoint new file mode 100755 index 0000000000000..973f1e60042bc --- /dev/null +++ b/tools/ci_build/github/linux/docker/manylinux-entrypoint @@ -0,0 +1,9 @@ +#!/bin/bash + +set -eu + +if [ "${AUDITWHEEL_ARCH}" == "i686" ] && [ "$(uname -m)" == "x86_64" ]; then + linux32 "$@" +else + exec "$@" +fi From 333f25a805eae8c94f02a5de366de7fef8f88220 Mon Sep 17 00:00:00 2001 From: Jian Chen Date: Sat, 16 Dec 2023 15:35:53 -0500 Subject: [PATCH 10/16] reset to 3e65bae127612c57d5efb4bcf1c0232d467aeb3b --- tools/ci_build/github/linux/docker/manylinux-entrypoint | 9 --------- 1 file changed, 9 deletions(-) delete mode 100755 tools/ci_build/github/linux/docker/manylinux-entrypoint diff --git a/tools/ci_build/github/linux/docker/manylinux-entrypoint b/tools/ci_build/github/linux/docker/manylinux-entrypoint deleted file mode 100755 index 973f1e60042bc..0000000000000 --- a/tools/ci_build/github/linux/docker/manylinux-entrypoint +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -set -eu - -if [ "${AUDITWHEEL_ARCH}" == "i686" ] && [ "$(uname -m)" == "x86_64" ]; then - linux32 "$@" -else - exec "$@" -fi From 1b02edc0ceda0a62cfd4a3d9c9ad153faba798ab Mon Sep 17 00:00:00 2001 From: Jian Chen Date: Sat, 16 Dec 2023 15:39:16 -0500 Subject: [PATCH 11/16] rolling back ssl changes --- .../ci_build/github/linux/docker/Dockerfile.manylinux2_28_cpu | 4 ++-- .../github/linux/docker/Dockerfile.manylinux2_28_cuda | 4 ++-- .../github/linux/docker/Dockerfile.manylinux2_28_rocm | 4 ++-- .../linux/docker/Dockerfile.manylinux2_28_training_cuda11_8 | 4 ++-- .../linux/docker/Dockerfile.manylinux2_28_training_cuda12_2 | 4 ++-- .../inference/x64/python/cpu/Dockerfile.manylinux2_28_cpu | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_cpu b/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_cpu index 8477ef15f5e95..546fca69201a1 100644 --- a/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_cpu +++ b/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_cpu @@ -88,8 +88,8 @@ RUN export SQLITE_AUTOCONF_ROOT=sqlite-autoconf-3390200 && \ manylinux-entrypoint /build_scripts/build-sqlite3.sh COPY build_scripts/build-openssl.sh /build_scripts/ -RUN export OPENSSL_ROOT=openssl-3.0.12 && \ - export OPENSSL_HASH=f93c9e8edde5e9166119de31755fc87b4aa34863662f67ddfcba14d0b6b69b61 && \ +RUN export OPENSSL_ROOT=openssl-1.1.1q && \ + export OPENSSL_HASH=d7939ce614029cdff0b6c20f0e2e5703158a489a72b2507b8bd51bf8c8fd10ca && \ export OPENSSL_DOWNLOAD_URL=https://www.openssl.org/source && \ manylinux-entrypoint /build_scripts/build-openssl.sh 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 59d23a3022a6f..807b9769146e7 100644 --- a/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_cuda +++ b/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_cuda @@ -94,8 +94,8 @@ RUN export SQLITE_AUTOCONF_ROOT=sqlite-autoconf-3390200 && \ manylinux-entrypoint /build_scripts/build-sqlite3.sh COPY build_scripts/build-openssl.sh /build_scripts/ -RUN export OPENSSL_ROOT=openssl-3.0.12 && \ - export OPENSSL_HASH=f93c9e8edde5e9166119de31755fc87b4aa34863662f67ddfcba14d0b6b69b61 && \ +RUN export OPENSSL_ROOT=openssl-1.1.1q && \ + export OPENSSL_HASH=d7939ce614029cdff0b6c20f0e2e5703158a489a72b2507b8bd51bf8c8fd10ca && \ export OPENSSL_DOWNLOAD_URL=https://www.openssl.org/source && \ manylinux-entrypoint /build_scripts/build-openssl.sh diff --git a/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_rocm b/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_rocm index 0e01b442549d3..913b2b92e81e8 100644 --- a/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_rocm +++ b/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_rocm @@ -108,8 +108,8 @@ RUN export SQLITE_AUTOCONF_ROOT=sqlite-autoconf-3390200 && \ manylinux-entrypoint /build_scripts/build-sqlite3.sh COPY build_scripts/build-openssl.sh /build_scripts/ -RUN export OPENSSL_ROOT=openssl-3.0.12 && \ - export OPENSSL_HASH=f93c9e8edde5e9166119de31755fc87b4aa34863662f67ddfcba14d0b6b69b61 && \ +RUN export OPENSSL_ROOT=openssl-1.1.1q && \ + export OPENSSL_HASH=d7939ce614029cdff0b6c20f0e2e5703158a489a72b2507b8bd51bf8c8fd10ca && \ export OPENSSL_DOWNLOAD_URL=https://www.openssl.org/source && \ manylinux-entrypoint /build_scripts/build-openssl.sh diff --git a/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_training_cuda11_8 b/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_training_cuda11_8 index b961d7bbafb55..b194302760aaf 100644 --- a/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_training_cuda11_8 +++ b/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_training_cuda11_8 @@ -93,8 +93,8 @@ RUN export SQLITE_AUTOCONF_ROOT=sqlite-autoconf-3390200 && \ manylinux-entrypoint /build_scripts/build-sqlite3.sh COPY build_scripts/build-openssl.sh /build_scripts/ -RUN export OPENSSL_ROOT=openssl-3.0.12 && \ - export OPENSSL_HASH=f93c9e8edde5e9166119de31755fc87b4aa34863662f67ddfcba14d0b6b69b61 && \ +RUN export OPENSSL_ROOT=openssl-1.1.1q && \ + export OPENSSL_HASH=d7939ce614029cdff0b6c20f0e2e5703158a489a72b2507b8bd51bf8c8fd10ca && \ export OPENSSL_DOWNLOAD_URL=https://www.openssl.org/source && \ manylinux-entrypoint /build_scripts/build-openssl.sh diff --git a/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_training_cuda12_2 b/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_training_cuda12_2 index 4522859ab387c..fec9cd0517965 100644 --- a/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_training_cuda12_2 +++ b/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_training_cuda12_2 @@ -93,8 +93,8 @@ RUN export SQLITE_AUTOCONF_ROOT=sqlite-autoconf-3390200 && \ manylinux-entrypoint /build_scripts/build-sqlite3.sh COPY build_scripts/build-openssl.sh /build_scripts/ -RUN export OPENSSL_ROOT=openssl-3.0.12 && \ - export OPENSSL_HASH=f93c9e8edde5e9166119de31755fc87b4aa34863662f67ddfcba14d0b6b69b61 && \ +RUN export OPENSSL_ROOT=openssl-1.1.1q && \ + export OPENSSL_HASH=d7939ce614029cdff0b6c20f0e2e5703158a489a72b2507b8bd51bf8c8fd10ca && \ export OPENSSL_DOWNLOAD_URL=https://www.openssl.org/source && \ manylinux-entrypoint /build_scripts/build-openssl.sh diff --git a/tools/ci_build/github/linux/docker/inference/x64/python/cpu/Dockerfile.manylinux2_28_cpu b/tools/ci_build/github/linux/docker/inference/x64/python/cpu/Dockerfile.manylinux2_28_cpu index e8b0273b7b460..2e691b006deda 100644 --- a/tools/ci_build/github/linux/docker/inference/x64/python/cpu/Dockerfile.manylinux2_28_cpu +++ b/tools/ci_build/github/linux/docker/inference/x64/python/cpu/Dockerfile.manylinux2_28_cpu @@ -88,8 +88,8 @@ RUN export SQLITE_AUTOCONF_ROOT=sqlite-autoconf-3390200 && \ manylinux-entrypoint /build_scripts/build-sqlite3.sh COPY build_scripts/build-openssl.sh /build_scripts/ -RUN export OPENSSL_ROOT=openssl-3.0.12 && \ - export OPENSSL_HASH=f93c9e8edde5e9166119de31755fc87b4aa34863662f67ddfcba14d0b6b69b61 && \ +RUN export OPENSSL_ROOT=openssl-1.1.1q && \ + export OPENSSL_HASH=d7939ce614029cdff0b6c20f0e2e5703158a489a72b2507b8bd51bf8c8fd10ca && \ export OPENSSL_DOWNLOAD_URL=https://www.openssl.org/source && \ manylinux-entrypoint /build_scripts/build-openssl.sh From b2bceed8a483a065201f2eb0579d26dd4ae4060e Mon Sep 17 00:00:00 2001 From: Jian Chen Date: Sat, 16 Dec 2023 15:56:14 -0500 Subject: [PATCH 12/16] Rolling back hash --- cgmanifests/cgmanifest.json | 2 +- .../github/azure-pipelines/binary-size-checks-pipeline.yml | 2 +- .../azure-pipelines/build-perf-test-binaries-pipeline.yml | 2 +- .../azure-pipelines/c-api-noopenmp-packaging-pipelines.yml | 2 +- .../ci_build/github/azure-pipelines/cuda-packaging-pipeline.yml | 2 +- tools/ci_build/github/azure-pipelines/linux-ci-pipeline.yml | 2 +- .../ci_build/github/azure-pipelines/linux-cpu-aten-pipeline.yml | 2 +- .../github/azure-pipelines/linux-cpu-eager-pipeline.yml | 2 +- .../azure-pipelines/linux-cpu-minimal-build-ci-pipeline.yml | 2 +- .../ci_build/github/azure-pipelines/linux-dnnl-ci-pipeline.yml | 2 +- tools/ci_build/github/azure-pipelines/linux-gpu-ci-pipeline.yml | 2 +- .../github/azure-pipelines/linux-gpu-tensorrt-ci-pipeline.yml | 2 +- .../github/azure-pipelines/mac-react-native-ci-pipeline.yml | 2 +- .../ci_build/github/azure-pipelines/npm-packaging-pipeline.yml | 2 +- .../github/azure-pipelines/orttraining-linux-ci-pipeline.yml | 2 +- .../github/azure-pipelines/orttraining-pai-ci-pipeline.yml | 2 +- .../azure-pipelines/orttraining-py-packaging-pipeline-cpu.yml | 2 +- .../azure-pipelines/orttraining-py-packaging-pipeline-cuda.yml | 2 +- .../orttraining-py-packaging-pipeline-cuda12.yml | 2 +- .../azure-pipelines/orttraining-py-packaging-pipeline-rocm.yml | 2 +- .../github/azure-pipelines/py-cuda-packaging-pipeline.yml | 2 +- .../github/azure-pipelines/py-package-build-pipeline.yml | 2 +- .../github/azure-pipelines/py-package-test-pipeline.yml | 2 +- tools/ci_build/github/azure-pipelines/py-packaging-pipeline.yml | 2 +- 24 files changed, 24 insertions(+), 24 deletions(-) diff --git a/cgmanifests/cgmanifest.json b/cgmanifests/cgmanifest.json index 3e56648ea4aad..e8dbc9cf9eff6 100644 --- a/cgmanifests/cgmanifest.json +++ b/cgmanifests/cgmanifest.json @@ -398,7 +398,7 @@ "component": { "type": "git", "git": { - "commitHash": "39159767b951fead9cb36a36c40d920638796138", + "commitHash": "aead4d751c2101e23336aa73f2380df83e7a13f3", "repositoryUrl": "https://github.com/pypa/manylinux" }, "comments": "For building our CI build docker image" diff --git a/tools/ci_build/github/azure-pipelines/binary-size-checks-pipeline.yml b/tools/ci_build/github/azure-pipelines/binary-size-checks-pipeline.yml index 3fa1c9c824c0e..e9762bc312455 100644 --- a/tools/ci_build/github/azure-pipelines/binary-size-checks-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/binary-size-checks-pipeline.yml @@ -10,7 +10,7 @@ resources: type: Github endpoint: Microsoft name: pypa/manylinux - ref: 39159767b951fead9cb36a36c40d920638796138 + ref: 5eda9aded5462201e6310105728d33016e637ea7 stages: diff --git a/tools/ci_build/github/azure-pipelines/build-perf-test-binaries-pipeline.yml b/tools/ci_build/github/azure-pipelines/build-perf-test-binaries-pipeline.yml index 25337a2c749a7..08330764ff5f7 100644 --- a/tools/ci_build/github/azure-pipelines/build-perf-test-binaries-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/build-perf-test-binaries-pipeline.yml @@ -12,7 +12,7 @@ resources: type: Github endpoint: Microsoft name: pypa/manylinux - ref: 39159767b951fead9cb36a36c40d920638796138 + ref: 5eda9aded5462201e6310105728d33016e637ea7 stages: 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 7dbd86c4e9b1a..7e389d1761613 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 @@ -78,7 +78,7 @@ resources: type: Github endpoint: Microsoft name: pypa/manylinux - ref: 39159767b951fead9cb36a36c40d920638796138 + ref: 5eda9aded5462201e6310105728d33016e637ea7 variables: - name: ReleaseVersionSuffix 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 50816a0bdeeb0..8a9592282cd46 100644 --- a/tools/ci_build/github/azure-pipelines/cuda-packaging-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/cuda-packaging-pipeline.yml @@ -91,7 +91,7 @@ resources: type: Github endpoint: Microsoft name: pypa/manylinux - ref: 39159767b951fead9cb36a36c40d920638796138 + ref: 5eda9aded5462201e6310105728d33016e637ea7 stages: # Set ReleaseVersionSuffix diff --git a/tools/ci_build/github/azure-pipelines/linux-ci-pipeline.yml b/tools/ci_build/github/azure-pipelines/linux-ci-pipeline.yml index 8a9144b76d684..64b78dca504ca 100644 --- a/tools/ci_build/github/azure-pipelines/linux-ci-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/linux-ci-pipeline.yml @@ -33,7 +33,7 @@ resources: type: Github endpoint: Microsoft name: pypa/manylinux - ref: 39159767b951fead9cb36a36c40d920638796138 + ref: 5eda9aded5462201e6310105728d33016e637ea7 stages: - stage: x64 dependsOn: [] diff --git a/tools/ci_build/github/azure-pipelines/linux-cpu-aten-pipeline.yml b/tools/ci_build/github/azure-pipelines/linux-cpu-aten-pipeline.yml index 1a30d6261424c..146186e9eeaf5 100644 --- a/tools/ci_build/github/azure-pipelines/linux-cpu-aten-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/linux-cpu-aten-pipeline.yml @@ -33,7 +33,7 @@ resources: type: Github endpoint: Microsoft name: pypa/manylinux - ref: 39159767b951fead9cb36a36c40d920638796138 + ref: 5eda9aded5462201e6310105728d33016e637ea7 jobs: - job: Linux_Build diff --git a/tools/ci_build/github/azure-pipelines/linux-cpu-eager-pipeline.yml b/tools/ci_build/github/azure-pipelines/linux-cpu-eager-pipeline.yml index 868c81fd945ce..a5c08e95b7efc 100644 --- a/tools/ci_build/github/azure-pipelines/linux-cpu-eager-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/linux-cpu-eager-pipeline.yml @@ -33,7 +33,7 @@ resources: type: Github endpoint: Microsoft name: pypa/manylinux - ref: 39159767b951fead9cb36a36c40d920638796138 + ref: 5eda9aded5462201e6310105728d33016e637ea7 jobs: # This pipeline builds the latest PyTorch commit from source diff --git a/tools/ci_build/github/azure-pipelines/linux-cpu-minimal-build-ci-pipeline.yml b/tools/ci_build/github/azure-pipelines/linux-cpu-minimal-build-ci-pipeline.yml index d954e5d741531..3eb74f306951c 100644 --- a/tools/ci_build/github/azure-pipelines/linux-cpu-minimal-build-ci-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/linux-cpu-minimal-build-ci-pipeline.yml @@ -52,7 +52,7 @@ resources: type: Github endpoint: Microsoft name: pypa/manylinux - ref: 39159767b951fead9cb36a36c40d920638796138 + ref: 5eda9aded5462201e6310105728d33016e637ea7 jobs: - job: Linux_CPU_Minimal_Build_E2E diff --git a/tools/ci_build/github/azure-pipelines/linux-dnnl-ci-pipeline.yml b/tools/ci_build/github/azure-pipelines/linux-dnnl-ci-pipeline.yml index 2f2d89f5c0530..1c6d8bbfe7fbe 100644 --- a/tools/ci_build/github/azure-pipelines/linux-dnnl-ci-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/linux-dnnl-ci-pipeline.yml @@ -33,7 +33,7 @@ resources: type: Github endpoint: Microsoft name: pypa/manylinux - ref: 39159767b951fead9cb36a36c40d920638796138 + ref: 5eda9aded5462201e6310105728d33016e637ea7 jobs: - job: Linux_py_Wheels 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 5cf85bd8fe126..0993a81a02249 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 @@ -40,7 +40,7 @@ resources: type: Github endpoint: Microsoft name: pypa/manylinux - ref: 39159767b951fead9cb36a36c40d920638796138 + ref: 5eda9aded5462201e6310105728d33016e637ea7 variables: - template: templates/common-variables.yml 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 ee02fa1aeb106..4ca11a4d1565b 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 @@ -40,7 +40,7 @@ resources: type: Github endpoint: Microsoft name: pypa/manylinux - ref: 39159767b951fead9cb36a36c40d920638796138 + ref: 5eda9aded5462201e6310105728d33016e637ea7 variables: - name: docker_base_image ${{ if eq(parameters.CudaVersion, '11.8') }}: diff --git a/tools/ci_build/github/azure-pipelines/mac-react-native-ci-pipeline.yml b/tools/ci_build/github/azure-pipelines/mac-react-native-ci-pipeline.yml index 991c4b5ce6d8f..e8f4931d5ad9f 100644 --- a/tools/ci_build/github/azure-pipelines/mac-react-native-ci-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/mac-react-native-ci-pipeline.yml @@ -44,7 +44,7 @@ resources: type: Github endpoint: Microsoft name: pypa/manylinux - ref: 39159767b951fead9cb36a36c40d920638796138 + ref: 5eda9aded5462201e6310105728d33016e637ea7 variables: ${{ if eq(parameters.NpmPublish, 'nightly (@dev)') }}: diff --git a/tools/ci_build/github/azure-pipelines/npm-packaging-pipeline.yml b/tools/ci_build/github/azure-pipelines/npm-packaging-pipeline.yml index d2f496fed0de8..7f73da23b5eb1 100644 --- a/tools/ci_build/github/azure-pipelines/npm-packaging-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/npm-packaging-pipeline.yml @@ -34,7 +34,7 @@ resources: type: Github endpoint: Microsoft name: pypa/manylinux - ref: 39159767b951fead9cb36a36c40d920638796138 + ref: 5eda9aded5462201e6310105728d33016e637ea7 stages: - template: templates/web-ci.yml diff --git a/tools/ci_build/github/azure-pipelines/orttraining-linux-ci-pipeline.yml b/tools/ci_build/github/azure-pipelines/orttraining-linux-ci-pipeline.yml index f3e4200261e31..018672e0b2dea 100644 --- a/tools/ci_build/github/azure-pipelines/orttraining-linux-ci-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/orttraining-linux-ci-pipeline.yml @@ -33,7 +33,7 @@ resources: type: Github endpoint: Microsoft name: pypa/manylinux - ref: 39159767b951fead9cb36a36c40d920638796138 + ref: 5eda9aded5462201e6310105728d33016e637ea7 jobs: - job: Linux_Build diff --git a/tools/ci_build/github/azure-pipelines/orttraining-pai-ci-pipeline.yml b/tools/ci_build/github/azure-pipelines/orttraining-pai-ci-pipeline.yml index e0ce0293ab76e..8d02a5e5809a2 100644 --- a/tools/ci_build/github/azure-pipelines/orttraining-pai-ci-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/orttraining-pai-ci-pipeline.yml @@ -17,7 +17,7 @@ resources: type: Github endpoint: Microsoft name: pypa/manylinux - ref: 39159767b951fead9cb36a36c40d920638796138 + ref: 5eda9aded5462201e6310105728d33016e637ea7 variables: - name: video diff --git a/tools/ci_build/github/azure-pipelines/orttraining-py-packaging-pipeline-cpu.yml b/tools/ci_build/github/azure-pipelines/orttraining-py-packaging-pipeline-cpu.yml index c905afca0f4a9..d6831e291911a 100644 --- a/tools/ci_build/github/azure-pipelines/orttraining-py-packaging-pipeline-cpu.yml +++ b/tools/ci_build/github/azure-pipelines/orttraining-py-packaging-pipeline-cpu.yml @@ -6,7 +6,7 @@ resources: type: Github endpoint: Microsoft name: pypa/manylinux - ref: 39159767b951fead9cb36a36c40d920638796138 + ref: 5eda9aded5462201e6310105728d33016e637ea7 stages: - stage: Python_Packaging_Linux_Training_CPU diff --git a/tools/ci_build/github/azure-pipelines/orttraining-py-packaging-pipeline-cuda.yml b/tools/ci_build/github/azure-pipelines/orttraining-py-packaging-pipeline-cuda.yml index 3e269753db204..f244851f8cc37 100644 --- a/tools/ci_build/github/azure-pipelines/orttraining-py-packaging-pipeline-cuda.yml +++ b/tools/ci_build/github/azure-pipelines/orttraining-py-packaging-pipeline-cuda.yml @@ -6,7 +6,7 @@ resources: type: Github endpoint: Microsoft name: pypa/manylinux - ref: 39159767b951fead9cb36a36c40d920638796138 + ref: 5eda9aded5462201e6310105728d33016e637ea7 stages: - template: templates/py-packaging-training-cuda-stage.yml diff --git a/tools/ci_build/github/azure-pipelines/orttraining-py-packaging-pipeline-cuda12.yml b/tools/ci_build/github/azure-pipelines/orttraining-py-packaging-pipeline-cuda12.yml index c4f78a12a3852..422fb33eec5de 100644 --- a/tools/ci_build/github/azure-pipelines/orttraining-py-packaging-pipeline-cuda12.yml +++ b/tools/ci_build/github/azure-pipelines/orttraining-py-packaging-pipeline-cuda12.yml @@ -6,7 +6,7 @@ resources: type: Github endpoint: Microsoft name: pypa/manylinux - ref: 39159767b951fead9cb36a36c40d920638796138 + ref: 5eda9aded5462201e6310105728d33016e637ea7 stages: - template: templates/py-packaging-training-cuda-stage.yml diff --git a/tools/ci_build/github/azure-pipelines/orttraining-py-packaging-pipeline-rocm.yml b/tools/ci_build/github/azure-pipelines/orttraining-py-packaging-pipeline-rocm.yml index 90e90dc9ed0f6..f2ba99369c144 100644 --- a/tools/ci_build/github/azure-pipelines/orttraining-py-packaging-pipeline-rocm.yml +++ b/tools/ci_build/github/azure-pipelines/orttraining-py-packaging-pipeline-rocm.yml @@ -6,7 +6,7 @@ resources: type: Github endpoint: Microsoft name: pypa/manylinux - ref: 39159767b951fead9cb36a36c40d920638796138 + ref: 5eda9aded5462201e6310105728d33016e637ea7 stages: - stage: "Python_Packaging_ROCm57_Release" diff --git a/tools/ci_build/github/azure-pipelines/py-cuda-packaging-pipeline.yml b/tools/ci_build/github/azure-pipelines/py-cuda-packaging-pipeline.yml index b7f1e04345ee8..aee42d3675087 100644 --- a/tools/ci_build/github/azure-pipelines/py-cuda-packaging-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/py-cuda-packaging-pipeline.yml @@ -28,7 +28,7 @@ resources: type: Github endpoint: Microsoft name: pypa/manylinux - ref: 39159767b951fead9cb36a36c40d920638796138 + ref: 5eda9aded5462201e6310105728d33016e637ea7 stages: - template: stages/py-cuda-packaging-stage.yml diff --git a/tools/ci_build/github/azure-pipelines/py-package-build-pipeline.yml b/tools/ci_build/github/azure-pipelines/py-package-build-pipeline.yml index ae6cd0c78c712..4c80aedeb1f18 100644 --- a/tools/ci_build/github/azure-pipelines/py-package-build-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/py-package-build-pipeline.yml @@ -47,7 +47,7 @@ resources: type: Github endpoint: Microsoft name: pypa/manylinux - ref: 39159767b951fead9cb36a36c40d920638796138 + ref: 5eda9aded5462201e6310105728d33016e637ea7 stages: - template: templates/py-packaging-selectable-stage.yml diff --git a/tools/ci_build/github/azure-pipelines/py-package-test-pipeline.yml b/tools/ci_build/github/azure-pipelines/py-package-test-pipeline.yml index 2d7e36a098c03..55d3150f21aa3 100644 --- a/tools/ci_build/github/azure-pipelines/py-package-test-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/py-package-test-pipeline.yml @@ -10,7 +10,7 @@ resources: type: Github endpoint: Microsoft name: pypa/manylinux - ref: 39159767b951fead9cb36a36c40d920638796138 + ref: 5eda9aded5462201e6310105728d33016e637ea7 stages: - stage: Linux_Test_CPU_x86_64_stage diff --git a/tools/ci_build/github/azure-pipelines/py-packaging-pipeline.yml b/tools/ci_build/github/azure-pipelines/py-packaging-pipeline.yml index c3322ea3384c0..62f84a9bb185c 100644 --- a/tools/ci_build/github/azure-pipelines/py-packaging-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/py-packaging-pipeline.yml @@ -58,7 +58,7 @@ resources: type: Github endpoint: Microsoft name: pypa/manylinux - ref: 39159767b951fead9cb36a36c40d920638796138 + ref: 5eda9aded5462201e6310105728d33016e637ea7 stages: - template: templates/py-packaging-stage.yml From 783774f480cd54119fe16026dfd00ceb1a4e87c3 Mon Sep 17 00:00:00 2001 From: Jian Chen Date: Sat, 16 Dec 2023 16:27:24 -0500 Subject: [PATCH 13/16] add COPY --from=build_cpython312 --- tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_cuda | 1 + tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_rocm | 1 + .../linux/docker/Dockerfile.manylinux2_28_training_cuda11_8 | 1 + .../linux/docker/Dockerfile.manylinux2_28_training_cuda12_2 | 1 + .../docker/inference/x64/python/cpu/Dockerfile.manylinux2_28_cpu | 1 + 5 files changed, 5 insertions(+) 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 807b9769146e7..0c95083d614ed 100644 --- a/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_cuda +++ b/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_cuda @@ -135,6 +135,7 @@ COPY --from=build_cpython38 /opt/_internal /opt/_internal/ COPY --from=build_cpython39 /opt/_internal /opt/_internal/ COPY --from=build_cpython310 /opt/_internal /opt/_internal/ COPY --from=build_cpython311 /opt/_internal /opt/_internal/ +COPY --from=build_cpython312 /opt/_internal /opt/_internal/ RUN manylinux-entrypoint /build_scripts/finalize-python.sh FROM runtime_base diff --git a/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_rocm b/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_rocm index 913b2b92e81e8..3367be10892fc 100644 --- a/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_rocm +++ b/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_rocm @@ -151,6 +151,7 @@ COPY --from=build_cpython38 /opt/_internal /opt/_internal/ COPY --from=build_cpython39 /opt/_internal /opt/_internal/ COPY --from=build_cpython310 /opt/_internal /opt/_internal/ COPY --from=build_cpython311 /opt/_internal /opt/_internal/ +COPY --from=build_cpython312 /opt/_internal /opt/_internal/ RUN manylinux-entrypoint /build_scripts/finalize-python.sh diff --git a/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_training_cuda11_8 b/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_training_cuda11_8 index b194302760aaf..a6a75afb0f4c3 100644 --- a/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_training_cuda11_8 +++ b/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_training_cuda11_8 @@ -134,6 +134,7 @@ COPY --from=build_cpython38 /opt/_internal /opt/_internal/ COPY --from=build_cpython39 /opt/_internal /opt/_internal/ COPY --from=build_cpython310 /opt/_internal /opt/_internal/ COPY --from=build_cpython311 /opt/_internal /opt/_internal/ +COPY --from=build_cpython312 /opt/_internal /opt/_internal/ RUN manylinux-entrypoint /build_scripts/finalize-python.sh diff --git a/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_training_cuda12_2 b/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_training_cuda12_2 index fec9cd0517965..d29157daef611 100644 --- a/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_training_cuda12_2 +++ b/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_training_cuda12_2 @@ -134,6 +134,7 @@ COPY --from=build_cpython38 /opt/_internal /opt/_internal/ COPY --from=build_cpython39 /opt/_internal /opt/_internal/ COPY --from=build_cpython310 /opt/_internal /opt/_internal/ COPY --from=build_cpython311 /opt/_internal /opt/_internal/ +COPY --from=build_cpython312 /opt/_internal /opt/_internal/ RUN manylinux-entrypoint /build_scripts/finalize-python.sh diff --git a/tools/ci_build/github/linux/docker/inference/x64/python/cpu/Dockerfile.manylinux2_28_cpu b/tools/ci_build/github/linux/docker/inference/x64/python/cpu/Dockerfile.manylinux2_28_cpu index 2e691b006deda..66fe0cafd945b 100644 --- a/tools/ci_build/github/linux/docker/inference/x64/python/cpu/Dockerfile.manylinux2_28_cpu +++ b/tools/ci_build/github/linux/docker/inference/x64/python/cpu/Dockerfile.manylinux2_28_cpu @@ -126,6 +126,7 @@ COPY --from=build_cpython38 /opt/_internal /opt/_internal/ COPY --from=build_cpython39 /opt/_internal /opt/_internal/ COPY --from=build_cpython310 /opt/_internal /opt/_internal/ COPY --from=build_cpython311 /opt/_internal /opt/_internal/ +COPY --from=build_cpython312 /opt/_internal /opt/_internal/ RUN manylinux-entrypoint /build_scripts/finalize-python.sh From aa9a8f765d093fb7c62c391010c7e41012932d39 Mon Sep 17 00:00:00 2001 From: Jian Chen Date: Mon, 18 Dec 2023 21:26:41 -0500 Subject: [PATCH 14/16] Update numpy version in requirements.txt --- .../github/linux/docker/scripts/manylinux/install_deps_aten.sh | 2 +- tools/ci_build/requirements.txt | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/ci_build/github/linux/docker/scripts/manylinux/install_deps_aten.sh b/tools/ci_build/github/linux/docker/scripts/manylinux/install_deps_aten.sh index 8d13b86a2b73b..1f85f72aef423 100755 --- a/tools/ci_build/github/linux/docker/scripts/manylinux/install_deps_aten.sh +++ b/tools/ci_build/github/linux/docker/scripts/manylinux/install_deps_aten.sh @@ -6,7 +6,7 @@ yum -y install \ graphviz 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/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") else PYTHON_EXES=("/opt/conda/bin/python") fi diff --git a/tools/ci_build/requirements.txt b/tools/ci_build/requirements.txt index 8aed658d72bd2..31eaec145b508 100644 --- a/tools/ci_build/requirements.txt +++ b/tools/ci_build/requirements.txt @@ -1,7 +1,8 @@ # packages used by transformers python unittest (only enabled in Linux CPU CI Pipeline) packaging protobuf==3.20.2 -numpy==1.26.0 +numpy==1.24.0; python_version < '3.12' +numpy==1.26.0; python_version >= '3.12' coloredlogs==15.0 transformers==4.30.0 psutil From 5ad7839c27064843d1aa6ea5206f8c4d2fdb6fb7 Mon Sep 17 00:00:00 2001 From: Jian Chen Date: Tue, 19 Dec 2023 15:38:24 -0500 Subject: [PATCH 15/16] Remove numpy version requirements from requirements.txt.in --- requirements.txt.in | 2 +- tools/ci_build/requirements.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements.txt.in b/requirements.txt.in index 89242061fb119..a9c1327b8fed2 100644 --- a/requirements.txt.in +++ b/requirements.txt.in @@ -1,6 +1,6 @@ coloredlogs flatbuffers -numpy >= @Python_NumPy_VERSION@ +numpy packaging protobuf sympy diff --git a/tools/ci_build/requirements.txt b/tools/ci_build/requirements.txt index 31eaec145b508..fc259056bd207 100644 --- a/tools/ci_build/requirements.txt +++ b/tools/ci_build/requirements.txt @@ -1,8 +1,8 @@ # packages used by transformers python unittest (only enabled in Linux CPU CI Pipeline) packaging protobuf==3.20.2 -numpy==1.24.0; python_version < '3.12' -numpy==1.26.0; python_version >= '3.12' +numpy==1.24.0 ; python_version < '3.12' +numpy==1.26.0 ; python_version >= '3.12' coloredlogs==15.0 transformers==4.30.0 psutil From 4dd3f2f3d845d0435e2ba656387a8ae79819d7b9 Mon Sep 17 00:00:00 2001 From: Jian Chen Date: Tue, 19 Dec 2023 17:51:02 -0500 Subject: [PATCH 16/16] moving python3.8 to the end --- requirements.txt.in | 2 +- tools/ci_build/github/linux/build_linux_python_package.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt.in b/requirements.txt.in index a9c1327b8fed2..89242061fb119 100644 --- a/requirements.txt.in +++ b/requirements.txt.in @@ -1,6 +1,6 @@ coloredlogs flatbuffers -numpy +numpy >= @Python_NumPy_VERSION@ packaging protobuf sympy diff --git a/tools/ci_build/github/linux/build_linux_python_package.sh b/tools/ci_build/github/linux/build_linux_python_package.sh index 9a4240c2a414c..4c0a39fdc512e 100755 --- a/tools/ci_build/github/linux/build_linux_python_package.sh +++ b/tools/ci_build/github/linux/build_linux_python_package.sh @@ -9,7 +9,7 @@ EXTRA_ARG="" # Put 3.8 at the last because Ubuntu 20.04 use python 3.8 and we will upload the intermediate build files of this # config to Azure DevOps Artifacts and download them to a Ubuntu 20.04 machine to run the tests. -PYTHON_EXES=("/opt/python/cp39-cp39/bin/python3.9" "/opt/python/cp310-cp310/bin/python3.10" "/opt/python/cp311-cp311/bin/python3.11" "/opt/python/cp38-cp38/bin/python3.8" "/opt/python/cp312-cp312/bin/python3.12") +PYTHON_EXES=("/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" "/opt/python/cp38-cp38/bin/python3.8") while getopts "d:p:x:c:" parameter_Option do case "${parameter_Option}" in