Skip to content

Upgrade ort to 1.16.3 in CI. #2283

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 14 commits into from
Dec 28, 2023
Merged

Upgrade ort to 1.16.3 in CI. #2283

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
bb76435
Upgrade ort to 1.16.3 in CI.
fatcat-z Dec 26, 2023
67ba5af
Add 1.16.0 into the list.
fatcat-z Dec 26, 2023
7f78012
Merge branch 'main' into upgrade_ort_in_ci
fatcat-z Dec 27, 2023
5813cb7
Update ci_build/azure_pipelines/pretrained_model_test.yml
fatcat-z Dec 27, 2023
0f638e1
Remove unnecessary blank.
fatcat-z Dec 27, 2023
7795089
Update CI tests and the way of install tensorflow-text.
fatcat-z Dec 27, 2023
806a5aa
Fix the way to determine which tensorflow-text version to use.
fatcat-z Dec 27, 2023
df9ff76
Change tf version coverage to [2.9.0 ... 2.14.0].
fatcat-z Dec 28, 2023
c9b6d1a
Correct numpy version.
fatcat-z Dec 28, 2023
db3418e
Minimum python version supported by tf 1.14.0 is 3.8.
fatcat-z Dec 28, 2023
29c44a2
Remove 2.14.0 from CI pipeline.
fatcat-z Dec 28, 2023
8b8731b
Remove some tests fro the gate CI.
fatcat-z Dec 28, 2023
59cdc27
Install latest protobuf.
fatcat-z Dec 28, 2023
ed93a4e
Restore protobuf version.
fatcat-z Dec 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ The common issues we run into we try to document here [Troubleshooting Guide](Tr

| Build Type | OS | Python | TensorFlow | ONNX opset | Status |
| --- | --- | --- | --- | --- | --- |
| Unit Test - Basic | Linux, Windows | 3.7-3.10 | 1.15, 2.8-2.13 | 14-18 | [![Build Status](https://dev.azure.com/tensorflow-onnx/tensorflow-onnx/_apis/build/status/unit_test?branchName=main)](https://dev.azure.com/tensorflow-onnx/tensorflow-onnx/_build/latest?definitionId=16&branchName=main) |
| Unit Test - Full | Linux, Windows | 3.7-3.10 | 1.15, 2.8-2.13 | 14-18 | [![Build Status](https://dev.azure.com/tensorflow-onnx/tensorflow-onnx/_apis/build/status/unit_test-matrix?branchName=main)](https://dev.azure.com/tensorflow-onnx/tensorflow-onnx/_build/latest?definitionId=18&branchName=main) | |
| Unit Test - Basic | Linux, Windows | 3.7-3.10 | 1.15, 2.9-2.13 | 14-18 | [![Build Status](https://dev.azure.com/tensorflow-onnx/tensorflow-onnx/_apis/build/status/unit_test?branchName=main)](https://dev.azure.com/tensorflow-onnx/tensorflow-onnx/_build/latest?definitionId=16&branchName=main) |
| Unit Test - Full | Linux, Windows | 3.7-3.10 | 1.15, 2.9-2.13 | 14-18 | [![Build Status](https://dev.azure.com/tensorflow-onnx/tensorflow-onnx/_apis/build/status/unit_test-matrix?branchName=main)](https://dev.azure.com/tensorflow-onnx/tensorflow-onnx/_build/latest?definitionId=18&branchName=main) | |
<br/>

## Supported Versions
Expand Down
26 changes: 13 additions & 13 deletions ci_build/azure_pipelines/keras2onnx_application_tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ jobs:
ONNX_PATH: onnx==1.15.0
INSTALL_KERAS:
UNINSTALL_KERAS:
INSTALL_TENSORFLOW: pip install tensorflow==2.8.0
INSTALL_TENSORFLOW: pip install tensorflow==2.9.0
INSTALL_ORT: pip install onnxruntime==1.15.0
INSTALL_KERAS_RESNET: pip install keras-resnet
INSTALL_TRANSFORMERS: pip install transformers==4.2.0
Expand Down Expand Up @@ -93,6 +93,18 @@ jobs:
INSTALL_LEGACY: pip install h5py==2.9.0
NIGHTLY_BUILD_TEST: python run_all_v2.py --exclude "test_keras_applications_v2.py"

Python310-tf2-2.13:
python.version: '3.10'
ONNX_PATH: onnx==1.15.0
INSTALL_KERAS:
UNINSTALL_KERAS:
INSTALL_TENSORFLOW: pip install tensorflow==2.13.0
INSTALL_ORT: pip install onnxruntime==1.15.0
INSTALL_KERAS_RESNET: pip install keras-resnet
INSTALL_TRANSFORMERS: pip install transformers==4.2.0
INSTALL_NUMPY:
NIGHTLY_BUILD_TEST: python run_all_v2.py

Python39-tf2-2.12:
python.version: '3.9'
ONNX_PATH: onnx==1.15.0
Expand Down Expand Up @@ -129,18 +141,6 @@ jobs:
INSTALL_NUMPY:
NIGHTLY_BUILD_TEST: python run_all_v2.py

Python310-tf2-oldest:
python.version: '3.10'
ONNX_PATH: onnx==1.15.0
INSTALL_KERAS:
UNINSTALL_KERAS:
INSTALL_TENSORFLOW: pip install tensorflow==2.8.0
INSTALL_ORT: pip install onnxruntime==1.15.0
INSTALL_KERAS_RESNET: pip install keras-resnet
INSTALL_TRANSFORMERS: pip install transformers==4.2.0
INSTALL_NUMPY:
NIGHTLY_BUILD_TEST: python run_all_v2.py

steps:
- template: 'templates/keras2onnx_application_tests.yml'
parameters:
Expand Down
18 changes: 2 additions & 16 deletions ci_build/azure_pipelines/keras2onnx_unit_test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,17 +36,10 @@ jobs:
INSTALL_ORT: pip install onnxruntime==1.15.0
INSTALL_NUMPY:

Python38-tf2-2.9:
python.version: '3.8'
ONNX_PATH: onnx==1.15.0
TENSORFLOW_PATH: tensorflow==2.9.0
INSTALL_ORT: pip install onnxruntime==1.15.0
INSTALL_NUMPY:

Python310-tf2-oldest:
python.version: '3.10'
ONNX_PATH: onnx==1.15.0
TENSORFLOW_PATH: tensorflow==2.8.0
TENSORFLOW_PATH: tensorflow==2.9.0
INSTALL_ORT: pip install onnxruntime==1.15.0
INSTALL_NUMPY:

Expand Down Expand Up @@ -98,17 +91,10 @@ jobs:
INSTALL_ORT: pip install onnxruntime==1.15.0
INSTALL_NUMPY:

Python38-tf2-2.9:
python.version: '3.8'
ONNX_PATH: onnx==1.15.0
TENSORFLOW_PATH: tensorflow==2.9.0
INSTALL_ORT: pip install onnxruntime==1.15.0
INSTALL_NUMPY:

Python310-tf2-oldest:
python.version: '3.10'
ONNX_PATH: onnx==1.15.0
TENSORFLOW_PATH: tensorflow==2.8.0
TENSORFLOW_PATH: tensorflow==2.9.0
INSTALL_ORT: pip install onnxruntime==1.15.0
INSTALL_NUMPY:

Expand Down
6 changes: 3 additions & 3 deletions ci_build/azure_pipelines/onnxruntime_nightly_test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ stages:
parameters:
platforms: ['linux', 'windows']
python_versions: ['3.8']
tf_versions: ['2.8.0', '2.9.0', '2.13.0']
tf_versions: ['2.9.0', '2.10.0', '2.13.0']
onnx_backends: {onnxruntime: ['nightly']}
job:
steps:
Expand All @@ -30,7 +30,7 @@ stages:
parameters:
platforms: ['linux', 'windows']
python_versions: ['3.9']
tf_versions: ['2.10.0', '2.12.0']
tf_versions: ['2.12.0']
onnx_backends: {onnxruntime: ['nightly']}
job:
steps:
Expand All @@ -41,7 +41,7 @@ stages:
parameters:
platforms: ['linux', 'windows']
python_versions: ['3.10']
tf_versions: ['2.8.0', '2.13.0']
tf_versions: ['2.9.0', '2.13.0']
onnx_backends: {onnxruntime: ['nightly']}
job:
steps:
Expand Down
31 changes: 26 additions & 5 deletions ci_build/azure_pipelines/pretrained_model_test-matrix.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,17 @@ jobs:
parameters:
platforms: ['windows']
python_versions: ['3.8']
tf_versions: ['2.8.0', '2.13.0']
tf_versions: ['2.9.0']
onnx_opsets: ['18', '17', '16', '15']
job:
steps:
- template: 'pretrained_model_test.yml'

- template: 'templates/job_generator.yml'
parameters:
platforms: ['windows']
python_versions: ['3.9']
tf_versions: ['2.13.0']
onnx_opsets: ['18', '17', '16', '15']
job:
steps:
Expand All @@ -30,7 +40,7 @@ jobs:
python_versions: ['3.7'] # Max version that supports tf 1.15
tf_versions: ['1.15.5']
onnx_versions: ['1.14.1'] # Max version that supports python 3.7
onnx_opsets: ['14']
onnx_opsets: ['18', '17', '16', '14']
onnx_backends: {onnxruntime: ['1.14.1']} # Max version that supports python 3.7
job:
steps:
Expand All @@ -40,7 +50,17 @@ jobs:
parameters:
platforms: ['linux', 'windows']
python_versions: ['3.8']
tf_versions: ['2.8.0', '2.13.0']
tf_versions: ['2.9.0']
onnx_opsets: ['17', '16', '14']
job:
steps:
- template: 'pretrained_model_test.yml'

- template: 'templates/job_generator.yml'
parameters:
platforms: ['linux', 'windows']
python_versions: ['3.9']
tf_versions: ['2.13.0']
onnx_opsets: ['17', '16', '14']
job:
steps:
Expand All @@ -50,7 +70,7 @@ jobs:
parameters:
platforms: ['linux', 'windows']
python_versions: ['3.10']
tf_versions: ['2.8.0']
tf_versions: ['2.10.0']
job:
steps:
- template: 'pretrained_model_test.yml'
Expand All @@ -59,7 +79,7 @@ jobs:
parameters:
platforms: ['linux', 'windows']
python_versions: ['3.9']
tf_versions: ['2.10.0', '2.11.0', '2.12.0']
tf_versions: ['2.11.0', '2.12.0']
job:
steps:
- template: 'pretrained_model_test.yml'
Expand All @@ -69,6 +89,7 @@ jobs:
platforms: ['linux']
python_versions: ['3.10']
tf_versions: ['2.9.0', '2.13.0']
onnx_opsets: ['17', '16', '14']
job:
steps:
- template: 'pretrained_model_test.yml'
Expand Down
16 changes: 13 additions & 3 deletions ci_build/azure_pipelines/pretrained_model_test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
python_versions: ['3.7'] # Max version that supports tf 1.15
tf_versions: ['1.15.5']
onnx_versions: ['1.14.1'] # Max version that supports python 3.7
onnx_opsets: ['18', '17', '16', '15']
onnx_opsets: ['15']
onnx_backends: {onnxruntime: ['1.14.1']} # Max version that supports python 3.7
job:
steps:
Expand All @@ -17,7 +17,7 @@ jobs:
parameters:
platforms: ['linux']
python_versions: ['3.8']
tf_versions: ['2.8.0', '2.13.0']
tf_versions: ['2.9.0']
onnx_opsets: ['18', '15']
job:
steps:
Expand All @@ -26,9 +26,19 @@ jobs:
- template: 'templates/job_generator.yml'
parameters:
platforms: ['linux']
python_versions: ['3.10']
python_versions: ['3.9']
tf_versions: ['2.13.0']
onnx_opsets: ['18', '15']
job:
steps:
- template: 'pretrained_model_test.yml'

- template: 'templates/job_generator.yml'
parameters:
platforms: ['linux']
python_versions: ['3.10']
tf_versions: ['2.9.0', '2.13.0']
onnx_opsets: ['18', '15']
job:
steps:
- template: 'pretrained_model_test.yml'
2 changes: 1 addition & 1 deletion ci_build/azure_pipelines/templates/job_generator.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ parameters:
tf_versions: ['']
onnx_versions: ['1.15.0']
onnx_opsets: ['18', '17', '16', '15', '14']
onnx_backends: {onnxruntime: ['1.15.1']}
onnx_backends: {onnxruntime: ['1.16.3']}
job: {}
run_setup: 'True'
report_coverage: 'False'
Expand Down
14 changes: 1 addition & 13 deletions ci_build/azure_pipelines/templates/setup.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,7 @@ steps:
set -ex
pip install pytest pytest-cov pytest-runner coverage graphviz requests pyyaml pillow pandas parameterized sympy coloredlogs flatbuffers timeout-decorator
pip install $(CI_PIP_ONNX_NAME)

# TF < 2.7 reuires numpy <= 1.19, but onnxruntime >= 1.11 requires numpy >= 1.21
if [[ $CI_TF_VERSION < 2.7 ]] && [[ $CI_ONNX_BACKEND == "onnxruntime" ]] ;
then
pip install $(CI_PIP_ONNX_BACKEND_NAME) numpy --no-deps -U
else
pip install $(CI_PIP_ONNX_BACKEND_NAME) numpy==1.23.4
fi
pip install $(CI_PIP_ONNX_BACKEND_NAME) numpy

if [[ $CI_SKIP_TFJS_TESTS == "False" ]] ;
then
Expand All @@ -24,11 +17,6 @@ steps:
then
pip install onnxruntime-extensions
pip install "tensorflow-text<=$(CI_TF_VERSION)"

if [[ $CI_TF_VERSION < 2.8 ]] ;
then
pip install wrapt==1.14.1
fi
fi

if [[ $CI_ONNXRUNTIME_NIGHTLY == "true" ]] ;
Expand Down
22 changes: 11 additions & 11 deletions ci_build/azure_pipelines/trimmed_keras2onnx_application_tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,44 +26,44 @@ jobs:
ONNX_PATH: onnx==1.15.0
INSTALL_KERAS:
UNINSTALL_KERAS:
INSTALL_TENSORFLOW: pip install tensorflow==2.8.0
INSTALL_ORT: pip install onnxruntime==1.15.0
INSTALL_TENSORFLOW: pip install tensorflow==2.9.0
INSTALL_ORT: pip install onnxruntime==1.16.3
INSTALL_KERAS_RESNET: pip install keras-resnet
INSTALL_TRANSFORMERS: pip install transformers==4.2.0
INSTALL_NUMPY:
NIGHTLY_BUILD_TEST: python run_all_v2.py

Python38-tf2-2.13:
Python38-tf2-latest:
python.version: '3.8'
ONNX_PATH: onnx==1.15.0
INSTALL_KERAS:
UNINSTALL_KERAS:
INSTALL_TENSORFLOW: pip install tensorflow==2.13.0
INSTALL_ORT: pip install onnxruntime==1.15.0
INSTALL_ORT: pip install onnxruntime==1.16.3
INSTALL_KERAS_RESNET: pip install keras-resnet
INSTALL_TRANSFORMERS: pip install transformers==4.2.0
INSTALL_NUMPY:
NIGHTLY_BUILD_TEST: python run_all_v2.py

Python38-tf2-oldest-onnx-15:
python.version: '3.8'
Python310-tf2-oldest:
python.version: '3.10'
ONNX_PATH: onnx==1.15.0
INSTALL_KERAS:
UNINSTALL_KERAS:
INSTALL_TENSORFLOW: pip install tensorflow==2.8.0
INSTALL_ORT: pip install onnxruntime==1.15.0
INSTALL_TENSORFLOW: pip install tensorflow==2.9.0
INSTALL_ORT: pip install onnxruntime==1.16.3
INSTALL_KERAS_RESNET: pip install keras-resnet
INSTALL_TRANSFORMERS: pip install transformers==4.2.0
INSTALL_NUMPY:
NIGHTLY_BUILD_TEST: python run_all_v2.py

Python38-tf2-2.13-onnx-15:
python.version: '3.8'
Python310-tf2-latest:
python.version: '3.10'
ONNX_PATH: onnx==1.15.0
INSTALL_KERAS:
UNINSTALL_KERAS:
INSTALL_TENSORFLOW: pip install tensorflow==2.13.0
INSTALL_ORT: pip install onnxruntime==1.15.0
INSTALL_ORT: pip install onnxruntime==1.16.3
INSTALL_KERAS_RESNET: pip install keras-resnet
INSTALL_TRANSFORMERS: pip install transformers==4.2.0
INSTALL_NUMPY:
Expand Down
30 changes: 22 additions & 8 deletions ci_build/azure_pipelines/trimmed_keras2onnx_unit_test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,29 @@ jobs:
Python38-tf2-oldest:
python.version: '3.8'
ONNX_PATH: onnx==1.15.0
TENSORFLOW_PATH: tensorflow==2.8.0
INSTALL_ORT: pip install onnxruntime==1.15.0
TENSORFLOW_PATH: tensorflow==2.9.0
INSTALL_ORT: pip install onnxruntime==1.16.3
INSTALL_NUMPY:

Python38-tf2-2.13:
Python38-tf2-latest:
python.version: '3.8'
ONNX_PATH: onnx==1.15.0
TENSORFLOW_PATH: tensorflow==2.13.0
INSTALL_ORT: pip install onnxruntime==1.15.0
INSTALL_ORT: pip install onnxruntime==1.16.3
INSTALL_NUMPY:

Python310-tf2-oldest:
python.version: '3.10'
ONNX_PATH: onnx==1.15.0
TENSORFLOW_PATH: tensorflow==2.9.0
INSTALL_ORT: pip install onnxruntime==1.16.3
INSTALL_NUMPY:

Python310-tf2-latest:
python.version: '3.10'
ONNX_PATH: onnx==1.15.0
TENSORFLOW_PATH: tensorflow==2.13.0
INSTALL_ORT: pip install onnxruntime==1.16.3
INSTALL_NUMPY:

############ Pure Keras Unit Tests ############
Expand Down Expand Up @@ -61,15 +75,15 @@ jobs:
Python38-tf2-oldest:
python.version: '3.8'
ONNX_PATH: onnx==1.15.0
TENSORFLOW_PATH: tensorflow==2.8.0
INSTALL_ORT: pip install onnxruntime==1.15.0
TENSORFLOW_PATH: tensorflow==2.9.0
INSTALL_ORT: pip install onnxruntime==1.16.3
INSTALL_NUMPY:

Python38-tf2-2.13:
Python38-tf2-latest:
python.version: '3.8'
ONNX_PATH: onnx==1.15.0
TENSORFLOW_PATH: tensorflow==2.13.0
INSTALL_ORT: pip install onnxruntime==1.15.0
INSTALL_ORT: pip install onnxruntime==1.16.3
INSTALL_NUMPY:

############ Pure Keras Unit Tests ############
Expand Down
Loading