From 276e8733bda76e6e42845af1b795fcb8189aba96 Mon Sep 17 00:00:00 2001 From: Changming Sun Date: Wed, 27 Sep 2023 07:54:48 -0700 Subject: [PATCH] Update onnx python package and setuptools (#17709) ### Description A follow-up for #17125 --- .../onnx_backend_test_series_filters.jsonc | 8 ++++++++ .../templates/jobs/win-ci-prebuild-steps.yml | 2 +- ...Dockerfile.package_ubi8_cuda11_8_tensorrt8_6 | 2 +- .../Dockerfile.ubuntu_cuda11_6_tensorrt8_4 | 2 +- .../Dockerfile.ubuntu_cuda11_8_tensorrt8_5 | 2 +- .../Dockerfile.ubuntu_cuda11_8_tensorrt8_6 | 2 +- .../linux/docker/Dockerfile.ubuntu_tensorrt_bin | 2 +- .../x64/python/cpu/scripts/requirements.txt | 4 ++-- .../docker/scripts/manylinux/requirements.txt | 4 ++-- .../linux/docker/scripts/requirements.txt | 4 ++-- .../requirements.txt | 2 +- .../requirements_torch_cpu/requirements.txt | 2 +- .../stage1/torch_eager_cpu/requirements.txt | 2 +- tools/ci_build/github/windows/helpers.ps1 | 17 ++++++++++------- 14 files changed, 33 insertions(+), 22 deletions(-) diff --git a/onnxruntime/test/testdata/onnx_backend_test_series_filters.jsonc b/onnxruntime/test/testdata/onnx_backend_test_series_filters.jsonc index 67391cb1a8219..c142106ed506c 100644 --- a/onnxruntime/test/testdata/onnx_backend_test_series_filters.jsonc +++ b/onnxruntime/test/testdata/onnx_backend_test_series_filters.jsonc @@ -464,6 +464,14 @@ "^test_squeeze_negative_axes" ], "current_failing_tests_OPENVINO_CPU_FP32": [ + "^test_affine_grid_2d_align_corners", + "^test_affine_grid_2d_align_corners_expanded", + "^test_affine_grid_2d", + "^test_affine_grid_2d_expanded", + "^test_affine_grid_3d_align_corners", + "^test_affine_grid_3d_align_corners_expanded", + "^test_affine_grid_3d", + "^test_affine_grid_3d_expanded", "^test_operator_permute2", "^test_operator_repeat", "^test_operator_repeat_dim_overflow", diff --git a/tools/ci_build/github/azure-pipelines/templates/jobs/win-ci-prebuild-steps.yml b/tools/ci_build/github/azure-pipelines/templates/jobs/win-ci-prebuild-steps.yml index 1ba907fe30df6..09c52f4d5ba0d 100644 --- a/tools/ci_build/github/azure-pipelines/templates/jobs/win-ci-prebuild-steps.yml +++ b/tools/ci_build/github/azure-pipelines/templates/jobs/win-ci-prebuild-steps.yml @@ -31,7 +31,7 @@ steps: architecture: ${{parameters.BuildArch}} - script: | - python -m pip install --upgrade "setuptools>=61.0.0" wheel numpy flatbuffers + python -m pip install --upgrade "setuptools>=68.2.2" wheel numpy flatbuffers workingDirectory: '$(Build.BinariesDirectory)' displayName: 'Install python modules' diff --git a/tools/ci_build/github/linux/docker/Dockerfile.package_ubi8_cuda11_8_tensorrt8_6 b/tools/ci_build/github/linux/docker/Dockerfile.package_ubi8_cuda11_8_tensorrt8_6 index cdf504c8e3b03..bbdb411b790a0 100644 --- a/tools/ci_build/github/linux/docker/Dockerfile.package_ubi8_cuda11_8_tensorrt8_6 +++ b/tools/ci_build/github/linux/docker/Dockerfile.package_ubi8_cuda11_8_tensorrt8_6 @@ -22,7 +22,7 @@ RUN dnf install -y \ ln -s /usr/bin/pip3 pip3.8; RUN pip3 install --upgrade pip -RUN pip3 install setuptools>=41.0.0 +RUN pip3 install setuptools>=68.2.2 # Install TensorRT RUN dnf install -y libnvinfer8 libnvonnxparsers8 libnvparsers8 libnvinfer-plugin8 libnvinfer-lean8 libnvinfer-vc-plugin8 libnvinfer-dispatch8 diff --git a/tools/ci_build/github/linux/docker/Dockerfile.ubuntu_cuda11_6_tensorrt8_4 b/tools/ci_build/github/linux/docker/Dockerfile.ubuntu_cuda11_6_tensorrt8_4 index 10f404c7c6a85..8b32425afce1c 100644 --- a/tools/ci_build/github/linux/docker/Dockerfile.ubuntu_cuda11_6_tensorrt8_4 +++ b/tools/ci_build/github/linux/docker/Dockerfile.ubuntu_cuda11_6_tensorrt8_4 @@ -31,7 +31,7 @@ RUN apt-get install -y --no-install-recommends \ ln -s /usr/bin/pip3 pip; RUN pip install --upgrade pip -RUN pip install setuptools>=41.0.0 +RUN pip install setuptools>=68.2.2 # Install TensorRT RUN v="8.4.1-1+cuda11.6" &&\ diff --git a/tools/ci_build/github/linux/docker/Dockerfile.ubuntu_cuda11_8_tensorrt8_5 b/tools/ci_build/github/linux/docker/Dockerfile.ubuntu_cuda11_8_tensorrt8_5 index cacc09f0c7455..cfc7023ef8e61 100644 --- a/tools/ci_build/github/linux/docker/Dockerfile.ubuntu_cuda11_8_tensorrt8_5 +++ b/tools/ci_build/github/linux/docker/Dockerfile.ubuntu_cuda11_8_tensorrt8_5 @@ -28,7 +28,7 @@ RUN apt-get install -y --no-install-recommends \ ln -s /usr/bin/pip3 pip; RUN pip install --upgrade pip -RUN pip install setuptools>=41.0.0 +RUN pip install setuptools>=68.2.2 # Install TensorRT RUN v="8.5.1-1+cuda11.8" &&\ diff --git a/tools/ci_build/github/linux/docker/Dockerfile.ubuntu_cuda11_8_tensorrt8_6 b/tools/ci_build/github/linux/docker/Dockerfile.ubuntu_cuda11_8_tensorrt8_6 index 0a4885e774047..edc41197be5c9 100644 --- a/tools/ci_build/github/linux/docker/Dockerfile.ubuntu_cuda11_8_tensorrt8_6 +++ b/tools/ci_build/github/linux/docker/Dockerfile.ubuntu_cuda11_8_tensorrt8_6 @@ -28,7 +28,7 @@ RUN apt-get install -y --no-install-recommends \ ln -s /usr/bin/pip3 pip; RUN pip install --upgrade pip -RUN pip install setuptools>=41.0.0 +RUN pip install setuptools>=68.2.2 # Install TensorRT RUN v="8.6.1.6-1+cuda11.8" &&\ diff --git a/tools/ci_build/github/linux/docker/Dockerfile.ubuntu_tensorrt_bin b/tools/ci_build/github/linux/docker/Dockerfile.ubuntu_tensorrt_bin index c9308ade37396..21b09b2d8978e 100644 --- a/tools/ci_build/github/linux/docker/Dockerfile.ubuntu_tensorrt_bin +++ b/tools/ci_build/github/linux/docker/Dockerfile.ubuntu_tensorrt_bin @@ -42,7 +42,7 @@ RUN apt-get install -y --no-install-recommends \ ln -s /usr/bin/pip3 pip; RUN pip install --upgrade pip -RUN pip install setuptools>=41.0.0 +RUN pip install setuptools>=68.2.2 # Install TensorRT from tar.gz RUN tar -xzvf /TensorRT-${TAR_TRT_VERSION}.tar.gz 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 8a9c4dac1dd58..5341ae062d332 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 @@ -2,9 +2,9 @@ numpy==1.21.6 ; python_version < '3.11' numpy==1.24.2 ; python_version >= '3.11' mypy pytest -setuptools>=41.4.0 +setuptools>=68.2.2 wheel -git+http://github.com/onnx/onnx.git@e2525550194ce3d8a2c4a3af451c9d9b3ae6650e#egg=onnx +git+http://github.com/onnx/onnx.git@fdefbe85ed9c362b95b9b401cd19db068a76141f#egg=onnx protobuf==3.20.2 sympy==1.12 flatbuffers 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 9eef51862c326..b2893286803b0 100644 --- a/tools/ci_build/github/linux/docker/scripts/manylinux/requirements.txt +++ b/tools/ci_build/github/linux/docker/scripts/manylinux/requirements.txt @@ -2,9 +2,9 @@ numpy==1.21.6 ; python_version < '3.11' numpy==1.24.2 ; python_version >= '3.11' mypy pytest -setuptools>=41.4.0 +setuptools>=68.2.2 wheel -git+http://github.com/onnx/onnx.git@ac3e58759463ff3a3089e3cd64fddbfad0f6724d#egg=onnx +git+http://github.com/onnx/onnx.git@fdefbe85ed9c362b95b9b401cd19db068a76141f#egg=onnx protobuf==3.20.2 sympy==1.12 flatbuffers diff --git a/tools/ci_build/github/linux/docker/scripts/requirements.txt b/tools/ci_build/github/linux/docker/scripts/requirements.txt index 9dbe856753faa..5d48a93b09c90 100644 --- a/tools/ci_build/github/linux/docker/scripts/requirements.txt +++ b/tools/ci_build/github/linux/docker/scripts/requirements.txt @@ -3,9 +3,9 @@ numpy==1.21.6 ; python_version < '3.11' numpy==1.24.2 ; python_version >= '3.11' mypy pytest -setuptools>=41.4.0 +setuptools>=68.2.2 wheel>=0.35.1 -git+http://github.com/onnx/onnx.git@e2525550194ce3d8a2c4a3af451c9d9b3ae6650e#egg=onnx +git+http://github.com/onnx/onnx.git@fdefbe85ed9c362b95b9b401cd19db068a76141f#egg=onnx argparse sympy==1.12 flatbuffers diff --git a/tools/ci_build/github/linux/docker/scripts/training/ortmodule/stage1/requirements_torch2.0.0_cu11.8/requirements.txt b/tools/ci_build/github/linux/docker/scripts/training/ortmodule/stage1/requirements_torch2.0.0_cu11.8/requirements.txt index fa28a810370f7..b3b2651c8d26d 100644 --- a/tools/ci_build/github/linux/docker/scripts/training/ortmodule/stage1/requirements_torch2.0.0_cu11.8/requirements.txt +++ b/tools/ci_build/github/linux/docker/scripts/training/ortmodule/stage1/requirements_torch2.0.0_cu11.8/requirements.txt @@ -5,4 +5,4 @@ torchvision==0.15.1+cu118 torchtext==0.15.1 # TODO(bmeswani): packaging 22.0 removes support for LegacyVersion leading to errors because transformers 4.4.2 uses LegacyVersion packaging==21.3 -setuptools>=41.4.0 +setuptools>=68.2.2 diff --git a/tools/ci_build/github/linux/docker/scripts/training/ortmodule/stage1/requirements_torch_cpu/requirements.txt b/tools/ci_build/github/linux/docker/scripts/training/ortmodule/stage1/requirements_torch_cpu/requirements.txt index 94b16d7ff4894..95d02b8400339 100644 --- a/tools/ci_build/github/linux/docker/scripts/training/ortmodule/stage1/requirements_torch_cpu/requirements.txt +++ b/tools/ci_build/github/linux/docker/scripts/training/ortmodule/stage1/requirements_torch_cpu/requirements.txt @@ -1,3 +1,3 @@ -f https://download.pytorch.org/whl/torch_stable.html torch==2.0.0+cpu -setuptools>=41.4.0 +setuptools>=68.2.2 diff --git a/tools/ci_build/github/linux/docker/scripts/training/ortmodule/stage1/torch_eager_cpu/requirements.txt b/tools/ci_build/github/linux/docker/scripts/training/ortmodule/stage1/torch_eager_cpu/requirements.txt index b071770c629e2..08e251eddbf96 100644 --- a/tools/ci_build/github/linux/docker/scripts/training/ortmodule/stage1/torch_eager_cpu/requirements.txt +++ b/tools/ci_build/github/linux/docker/scripts/training/ortmodule/stage1/torch_eager_cpu/requirements.txt @@ -1,7 +1,7 @@ --pre -f https://download.pytorch.org/whl/torch_stable.html torch==1.13.1+cpu -setuptools>=41.4.0 +setuptools>=68.2.2 cerberus h5py scikit-learn diff --git a/tools/ci_build/github/windows/helpers.ps1 b/tools/ci_build/github/windows/helpers.ps1 index 6e81f901a8288..20df10b244408 100644 --- a/tools/ci_build/github/windows/helpers.ps1 +++ b/tools/ci_build/github/windows/helpers.ps1 @@ -444,7 +444,7 @@ function Install-Abseil { .Description The Install-UTF8-Range function installs Google's utf8_range library from source. utf8_range depends on Abseil. - + .PARAMETER cmake_path The full path of cmake.exe @@ -604,14 +604,17 @@ function Install-ONNX { pushd . Write-Host "Uninstalling onnx and ignore errors if there is any..." - python.exe -m pip uninstall -y onnx -qq + [string[]]$pip_args ="-m", "pip", "uninstall", "-y", "onnx", "-qq" + &"python.exe" $pip_args + if ($lastExitCode -ne 0) { + exit $lastExitCode + } Write-Host "Installing python packages..." - $p = Start-Process -NoNewWindow -Wait -PassThru -FilePath "python.exe" -ArgumentList "-m", "pip", "install", "--disable-pip-version-check", "setuptools", "wheel", "numpy", "protobuf==$protobuf_version" - $exitCode = $p.ExitCode - if ($exitCode -ne 0) { - Write-Host -Object "Install dependent python wheels failed. Exitcode: $exitCode" - exit $exitCode + [string[]]$pip_args = "-m", "pip", "install", "-qq", "--disable-pip-version-check", "setuptools>=68.2.2", "wheel", "numpy", "protobuf==$protobuf_version" + &"python.exe" $pip_args + if ($lastExitCode -ne 0) { + exit $lastExitCode } $url=Get-DownloadURL -name onnx -src_root $src_root