From 9c93fade6f82dbce27195efab8fcde793c4c9369 Mon Sep 17 00:00:00 2001 From: Wenbing Li <10278425+wenbingl@users.noreply.github.com> Date: Mon, 27 Mar 2023 16:52:08 -0700 Subject: [PATCH] add the onnxruntime 1.14 release into the CI pipeline (#387) * add the onnxruntime 1.14 release into the CI pipeline * torch 2.0 crashed on Linux --- .pipelines/ci.yml | 62 +++++++++++++++++++++--------------------- cmake/ext_ortlib.cmake | 4 +-- docs/ci_matrix.md | 5 +--- version.txt | 2 +- 4 files changed, 35 insertions(+), 38 deletions(-) diff --git a/.pipelines/ci.yml b/.pipelines/ci.yml index 5a50296a..fdb5c345 100644 --- a/.pipelines/ci.yml +++ b/.pipelines/ci.yml @@ -21,22 +21,22 @@ jobs: strategy: matrix: - py310-1131: + py310-1141: python.version: '3.10' - torch.version: 'torch torchvision torchaudio' - ort.version: '1.13.1' - py39-1121: + 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' + ort.version: '1.14.1' + py39-1131: python.version: '3.9' torch.version: 'torch==1.12.1+cpu torchvision==0.13.1+cpu torchaudio==0.12.1+cpu -f https://download.pytorch.org/whl/cpu/torch_stable.html' - ort.version: '1.12.0' - py38-1110: + ort.version: '1.13.1' + py38-1121: 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.11.0' - py37-1100: + 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.10.0' + ort.version: '1.11.0' steps: - task: DownloadGitHubRelease@0 @@ -101,6 +101,9 @@ jobs: strategy: matrix: + ort-1141: + ort.version: '1.14.1' + ort.dirname: 'onnxruntime-osx-x86_64-$(ort.version)' ort-1131: ort.version: '1.13.1' ort.dirname: 'onnxruntime-osx-x86_64-$(ort.version)' @@ -110,9 +113,6 @@ jobs: ort-1110: ort.version: '1.11.0' ort.dirname: 'onnxruntime-osx-x86_64-$(ort.version)' - ort-1100: - ort.version: '1.10.0' - ort.dirname: 'onnxruntime-osx-x86_64-$(ort.version)' steps: # needed for onnxruntime @@ -155,22 +155,22 @@ jobs: strategy: matrix: - py310-1131: + py310-1141: python.version: '3.10' torch.version: 'torch torchvision torchaudio' - ort.version: '1.13.1' - py310-1121: + ort.version: '1.14.1' + py310-1131: python.version: '3.10' 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.12.1' - py39-1110: + 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.11.0' - py38-1100: + ort.version: '1.12.1' + py38-1110: 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.10.0' + ort.version: '1.11.0' steps: # needed for onnxruntime @@ -212,18 +212,18 @@ jobs: ######### - job: WindowsC pool: - vmImage: 'windows-2019' + vmImage: 'windows-latest' strategy: matrix: + 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' - ort-1100: - ort.version: '1.10.0' steps: - task: DownloadGitHubRelease@0 @@ -276,22 +276,22 @@ jobs: strategy: matrix: - py310-1131: + py310-1141: python.version: '3.10' torch.version: 'torch torchvision torchaudio' - ort.version: '1.13.1' - py39-1121: + ort.version: '1.14.1' + py39-1131: python.version: '3.9' torch.version: 'torch==1.12.1+cpu torchvision==0.13.1+cpu torchaudio==0.12.1+cpu -f https://download.pytorch.org/whl/cpu/torch_stable.html' - ort.version: '1.12.1' - py38-1110: + ort.version: '1.13.1' + py38-1121: 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.11.0' - py37-1100: + 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.10.0' + ort.version: '1.11.0' steps: - powershell: Write-Host "##vso[task.prependpath]$env:CONDA\Scripts" diff --git a/cmake/ext_ortlib.cmake b/cmake/ext_ortlib.cmake index 62a7e845..02e0f633 100644 --- a/cmake/ext_ortlib.cmake +++ b/cmake/ext_ortlib.cmake @@ -5,8 +5,8 @@ elseif(ONNXRUNTIME_PKG_DIR) set(ONNXRUNTIME_INCLUDE_DIR ${ONNXRUNTIME_PKG_DIR}/include) set(ONNXRUNTIME_LIB_DIR ${ONNXRUNTIME_PKG_DIR}/lib) else() - # default to 1.10.0 if not specified - set(ONNXRUNTIME_VER "1.10.0" CACHE STRING "ONNX Runtime version") + # default to 1.11.1 if not specified + set(ONNXRUNTIME_VER "1.11.1" CACHE STRING "ONNX Runtime version") if(CMAKE_HOST_APPLE) set(ONNXRUNTIME_URL "v${ONNXRUNTIME_VER}/onnxruntime-osx-universal2-${ONNXRUNTIME_VER}.tgz") diff --git a/docs/ci_matrix.md b/docs/ci_matrix.md index 4173fbc6..1c8061de 100644 --- a/docs/ci_matrix.md +++ b/docs/ci_matrix.md @@ -4,7 +4,4 @@ The matrix below lists the versions of individual dependencies of onxxruntime-ex Python | 3.7 | 3.8 | 3.9 | 3.10 ---|---|---|---|--- -Onnxruntime | 1.9.0 (Sept 22, 2021) | 1.10.0 (Dec 7, 2021) | 1.11.0 (Mar 26, 2022) | 1.12.1 (Aug 4, 2022) -Torch | 1.9.1 (Sept 22, 2021) | 1.10.0 (Oct 21, 2021) | 1.11.0 (Mar 10, 2022) | 1.12.1 (Aug 5, 2022) -TorchVision | 0.10.1 (Jun 15, 2021) | 0.11.1 (Oct 21, 2021) | 0.12.0 (Mar 10, 2022) | 0.13.1 (Aug 5, 2022) -TorchAudio | 0.9.0 (Jun 15, 2021) | 0.10.0 (Oct 21, 2021) | 0.11.0 (Mar 10, 2022) | 0.12.1 (Aug 5, 2022) +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) diff --git a/version.txt b/version.txt index bcaffe19..8adc70fd 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -0.7.0 \ No newline at end of file +0.8.0 \ No newline at end of file