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
This commit is contained in:
Wenbing Li
GitHub
Родитель
5cb3153485
Коммит
1c04e95bda
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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) |
|
||||
|
|
|
|||
|
|
@ -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'
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
0.8.0
|
||||
0.9.0
|
||||
Загрузка…
Ссылка в новой задаче