From 1c04e95bdad87f5fd2f8cf116f6ca7ddb2651897 Mon Sep 17 00:00:00 2001 From: Wenbing Li <10278425+wenbingl@users.noreply.github.com> Date: Sat, 3 Jun 2023 20:09:41 -0700 Subject: [PATCH] upgrade all dependency versions (#466) * release the dependency package version * upgrade the dependency versions * more fixing for 3.11 * Update ci.yml * upgrade torch version in MacOS * fix torch version in MacOS * upgrade Python support versions * pybind11 switch URL mode * more URL modes --- .pipelines/OneBranch.Official.yml | 2 +- .pipelines/OneBranch.PullRequest.yml | 2 +- .pipelines/ci.yml | 48 ++++++++++++++-------------- .pipelines/wheels_linux.yml | 2 +- .pipelines/wheels_macos.yml | 2 +- .pipelines/wheels_win32.yml | 2 +- cmake/externals/dr_libs.cmake | 4 +-- cmake/externals/pybind11.cmake | 4 +-- docs/ci_matrix.md | 4 +-- requirements-dev.txt | 8 ++--- version.txt | 2 +- 11 files changed, 40 insertions(+), 40 deletions(-) diff --git a/.pipelines/OneBranch.Official.yml b/.pipelines/OneBranch.Official.yml index 4fb3ff3b..fe311c5b 100644 --- a/.pipelines/OneBranch.Official.yml +++ b/.pipelines/OneBranch.Official.yml @@ -24,7 +24,7 @@ variables: REPOROOT: $(Build.SourcesDirectory) OUTPUTROOT: $(REPOROOT)\out NUGET_XMLDOC_MODE: none - CIBW_BUILD: cp3{7,8,9,10}-*amd64 + CIBW_BUILD: cp3{8,9,10,11}-*amd64 CIBW_ARCHS: AMD64 DEBIAN_FRONTEND: noninteractive diff --git a/.pipelines/OneBranch.PullRequest.yml b/.pipelines/OneBranch.PullRequest.yml index a55cb92d..5550b0c9 100644 --- a/.pipelines/OneBranch.PullRequest.yml +++ b/.pipelines/OneBranch.PullRequest.yml @@ -24,7 +24,7 @@ variables: REPOROOT: $(Build.SourcesDirectory) OUTPUTROOT: $(REPOROOT)\out NUGET_XMLDOC_MODE: none - CIBW_BUILD: cp3{7,8,9,10}-*amd64 + CIBW_BUILD: cp3{8,9,10,11}-*amd64 CIBW_ARCHS: AMD64 CIBW_BUILD_VERBOSITY: 1 DEBIAN_FRONTEND: noninteractive diff --git a/.pipelines/ci.yml b/.pipelines/ci.yml index b3f435ec..f467fd45 100644 --- a/.pipelines/ci.yml +++ b/.pipelines/ci.yml @@ -21,9 +21,13 @@ jobs: strategy: matrix: + py311-1150: + python.version: '3.11' + torch.version: 'torch torchvision torchaudio --index-url https://download.pytorch.org/whl/cpu' + ort.version: '1.15.0' py310-1141: python.version: '3.10' - torch.version: 'torch==1.13.1+cpu torchvision==0.14.1+cpu torchaudio==0.13.1 --extra-index-url https://download.pytorch.org/whl/cpu' + torch.version: 'torch==1.13.1+cpu torchvision==0.14.1+cpu torchaudio==0.13.1 --index-url https://download.pytorch.org/whl/cpu' ort.version: '1.14.1' py39-1131: python.version: '3.9' @@ -33,10 +37,6 @@ jobs: python.version: '3.8' torch.version: 'torch==1.11.0+cpu torchvision==0.12.0+cpu torchaudio==0.11.0+cpu -f https://download.pytorch.org/whl/cpu/torch_stable.html' ort.version: '1.12.1' - py37-1110: - python.version: '3.7' - torch.version: 'torch==1.10.0+cpu torchvision==0.11.1+cpu torchaudio==0.10.0+cpu -f https://download.pytorch.org/whl/cpu/torch_stable.html' - ort.version: '1.11.0' steps: - task: DownloadGitHubRelease@0 @@ -101,6 +101,9 @@ jobs: strategy: matrix: + ort-1150: + ort.version: '1.15.0' + ort.dirname: 'onnxruntime-osx-x86_64-$(ort.version)' ort-1141: ort.version: '1.14.1' ort.dirname: 'onnxruntime-osx-x86_64-$(ort.version)' @@ -110,9 +113,6 @@ jobs: ort-1121: ort.version: '1.12.1' ort.dirname: 'onnxruntime-osx-x86_64-$(ort.version)' - ort-1110: - ort.version: '1.11.0' - ort.dirname: 'onnxruntime-osx-x86_64-$(ort.version)' steps: # needed for onnxruntime @@ -155,22 +155,22 @@ jobs: strategy: matrix: + py311-1150: + python.version: '3.11' + torch.version: 'torch torchvision torchaudio' + ort.version: '1.15.0' py310-1141: python.version: '3.10' - torch.version: 'torch torchvision torchaudio' + torch.version: 'torch==1.13.1 torchvision==0.14.1 torchaudio==0.13.1 --index-url https://download.pytorch.org/whl/cpu' ort.version: '1.14.1' - py310-1131: - python.version: '3.10' + py39-1131: + python.version: '3.9' torch.version: 'torch==1.12.1 torchvision==0.13.1 torchaudio==0.12.1 -f https://download.pytorch.org/whl/torch_stable.html' ort.version: '1.13.1' - py39-1121: - python.version: '3.9' - torch.version: 'torch==1.11.0 torchvision==0.12.0 torchaudio==0.11.0 -f https://download.pytorch.org/whl/torch_stable.html' - ort.version: '1.12.1' - py38-1110: + py38-1120: python.version: '3.8' - torch.version: 'torch==1.10.0 torchvision==0.11.1 torchaudio==0.10.0 -f https://download.pytorch.org/whl/torch_stable.html' - ort.version: '1.11.0' + torch.version: 'torch==1.11.0 torchvision==0.12.0 torchaudio==0.11.0 -f https://download.pytorch.org/whl/torch_stable.html' + ort.version: '1.12.0' steps: # needed for onnxruntime @@ -216,14 +216,14 @@ jobs: strategy: matrix: + ort-1150: + ort.version: '1.15.0' ort-1141: ort.version: '1.14.1' ort-1131: ort.version: '1.13.1' ort-1121: ort.version: '1.12.1' - ort-1110: - ort.version: '1.11.0' steps: - task: DownloadGitHubRelease@0 @@ -276,6 +276,10 @@ jobs: strategy: matrix: + py311-1150: + python.version: '3.11' + torch.version: 'torch torchvision torchaudio' + ort.version: '1.15.0' py310-1141: python.version: '3.10' torch.version: 'torch torchvision torchaudio' @@ -288,10 +292,6 @@ jobs: python.version: '3.8' torch.version: 'torch==1.11.0+cpu torchvision==0.12.0+cpu torchaudio==0.11.0+cpu -f https://download.pytorch.org/whl/cpu/torch_stable.html' ort.version: '1.12.1' - py37-1110: - python.version: '3.7' - torch.version: 'torch==1.10.0+cpu torchvision==0.11.1+cpu torchaudio==0.10.0+cpu -f https://download.pytorch.org/whl/cpu/torch_stable.html' - ort.version: '1.11.0' steps: - powershell: Write-Host "##vso[task.prependpath]$env:CONDA\Scripts" diff --git a/.pipelines/wheels_linux.yml b/.pipelines/wheels_linux.yml index ce0fa3a1..9d51bfaf 100644 --- a/.pipelines/wheels_linux.yml +++ b/.pipelines/wheels_linux.yml @@ -3,7 +3,7 @@ jobs: timeoutInMinutes: 120 pool: {name: 'Azure-Pipelines-EO-Ubuntu-2004-aiinfra'} variables: - CIBW_BUILD: "cp3{7,8,9,10}-*" + CIBW_BUILD: "cp3{8,9,10,11}-*" steps: - task: UsePythonVersion@0 diff --git a/.pipelines/wheels_macos.yml b/.pipelines/wheels_macos.yml index 7cd8c1e7..aa54bc7b 100644 --- a/.pipelines/wheels_macos.yml +++ b/.pipelines/wheels_macos.yml @@ -3,7 +3,7 @@ jobs: timeoutInMinutes: 180 pool: {vmImage: 'macOS-12'} variables: - CIBW_BUILD: "cp3{8,9,10}-*" + CIBW_BUILD: "cp3{8,9,10,11}-*" CIBW_ARCHS_MACOS: "x86_64 universal2 arm64" # Skip trying to test arm64 builds on Intel Macs # CIBW_TEST_SKIP: "*-macosx_arm64 *-macosx_universal2:arm64" diff --git a/.pipelines/wheels_win32.yml b/.pipelines/wheels_win32.yml index a486ce8f..11d55c61 100644 --- a/.pipelines/wheels_win32.yml +++ b/.pipelines/wheels_win32.yml @@ -3,7 +3,7 @@ jobs: timeoutInMinutes: 120 pool: {name: 'onnxruntime-Win-CPU-2022'} variables: - CIBW_BUILD: "cp3{7,8,9,10}-*amd64" + CIBW_BUILD: "cp3{8,9,10,11}-*amd64" steps: - task: UsePythonVersion@0 diff --git a/cmake/externals/dr_libs.cmake b/cmake/externals/dr_libs.cmake index b3ba4711..3d3df6d0 100644 --- a/cmake/externals/dr_libs.cmake +++ b/cmake/externals/dr_libs.cmake @@ -1,6 +1,6 @@ FetchContent_Declare(dr_libs - GIT_REPOSITORY https://github.com/mackron/dr_libs.git - GIT_TAG dd762b861ecadf5ddd5fb03e9ca1db6707b54fbb + URL https://github.com/mackron/dr_libs/archive/dbbd08d81fd2b084c5ae931531871d0c5fd83b87.zip + URL_HASH SHA1=84a2a31ef890b6204223b12f71d6e701c0edcd92 ) FetchContent_GetProperties(dr_libs) diff --git a/cmake/externals/pybind11.cmake b/cmake/externals/pybind11.cmake index 06f7dc57..c6460d06 100644 --- a/cmake/externals/pybind11.cmake +++ b/cmake/externals/pybind11.cmake @@ -1,7 +1,7 @@ FetchContent_Declare( pybind11 - GIT_REPOSITORY https://github.com/pybind/pybind11.git - GIT_TAG v2.6.2 + URL https://github.com/pybind/pybind11/archive/refs/tags/v2.10.1.zip + URL_HASH SHA1=769b6aa67a77f17a770960f604b727645b6f6a13 ) FetchContent_GetProperties(pybind11) diff --git a/docs/ci_matrix.md b/docs/ci_matrix.md index 1c8061de..8e58f81f 100644 --- a/docs/ci_matrix.md +++ b/docs/ci_matrix.md @@ -2,6 +2,6 @@ The matrix below lists the versions of individual dependencies of onxxruntime-extensions. These are the configurations that are routinely and extensively verified by our CI. -Python | 3.7 | 3.8 | 3.9 | 3.10 +Python | 3.8 | 3.9 | 3.10 | 3.11 | ---|---|---|---|--- -Onnxruntime |1.11.0 (Mar 26, 2022) |1.12.1 (Aug 4, 2022) |1.13.1(Oct 24, 2022) |1.14.1 (Mar 2, 2023) +Onnxruntime |1.12.1 (Aug 4, 2022) |1.13.1(Oct 24, 2022) |1.14.1 (Mar 2, 2023) |1.15.0 (May 24, 2023) | diff --git a/requirements-dev.txt b/requirements-dev.txt index 2f6d3b10..5cad1d28 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -2,7 +2,7 @@ -r requirements.txt pytest # multiple versions of onnxruntime are supported, but only one can be installed at a time -onnxruntime >=1.10.0 -transformers >= 4.9.2,<=4.24.0 -tensorflow_text >=2.5.0 -protobuf==3.20.* +protobuf < 4.0.0 +onnxruntime >=1.12.0 +transformers >=4.9.2 +tensorflow_text >=2.5.0;python_version < '3.11' diff --git a/version.txt b/version.txt index 8adc70fd..899f24fc 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -0.8.0 \ No newline at end of file +0.9.0 \ No newline at end of file