Merge branch 'main' into main

onnx · Mar 6, 2024 · 5a235d2 · 5a235d2
2 parents 7402282 + 358b519
commit 5a235d2
Show file tree

Hide file tree

Showing 30 changed files with 379 additions and 287 deletions.
diff --git a/README.md b/README.md
@@ -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.15 | 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.15 | 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

diff --git a/VERSION_NUMBER b/VERSION_NUMBER
@@ -1 +1 @@
-1.15.1
+1.16.1
diff --git a/ci_build/azure_pipelines/keras2onnx_application_tests.yml b/ci_build/azure_pipelines/keras2onnx_application_tests.yml
@@ -8,22 +8,21 @@ jobs:
     vmImage: 'ubuntu-latest'
   strategy:
     matrix:
-      Python37-tf-1.15:
-        python.version: '3.7' # Max version that supports tf 1.15
-        ONNX_PATH: onnx==1.14.1
-        INSTALL_KERAS: pip install keras==2.3.1
+      Python310-tf2-2.13:
+        python.version: '3.10'
+        ONNX_PATH: onnx==1.15.0
+        INSTALL_KERAS:
         UNINSTALL_KERAS:
-        INSTALL_TENSORFLOW: pip install tensorflow==1.15.0
-        INSTALL_ORT: pip install onnxruntime==1.14.1 # Max version that supports python 3.7
+        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:
+        INSTALL_TRANSFORMERS: pip install transformers==3.4.0
         INSTALL_NUMPY: pip install numpy==1.19.0
-        INSTALL_LEGACY: pip install h5py==2.9.0
-        NIGHTLY_BUILD_TEST: python run_all_v2.py --exclude "test_keras_applications_v2.py"
+        NIGHTLY_BUILD_TEST: python run_all_v2.py
 
       Python39-tf2-2.12:
         python.version: '3.9'
-        ONNX_PATH: onnx==1.14.1
+        ONNX_PATH: onnx==1.15.0
         INSTALL_KERAS:
         UNINSTALL_KERAS:
         INSTALL_TENSORFLOW: pip install tensorflow==2.12.0
@@ -35,7 +34,7 @@ jobs:
 
       Python310-tf2-2.11:
         python.version: '3.10'
-        ONNX_PATH: onnx==1.14.1
+        ONNX_PATH: onnx==1.15.0
         INSTALL_KERAS:
         UNINSTALL_KERAS:
         INSTALL_TENSORFLOW: pip install tensorflow==2.11.0
@@ -45,9 +44,9 @@ jobs:
         INSTALL_NUMPY:
         NIGHTLY_BUILD_TEST: python run_all_v2.py
 
-      Python38-tf2-2.10:
-        python.version: '3.8'
-        ONNX_PATH: onnx==1.14.1
+      Python39-tf2-2.10:
+        python.version: '3.9'
+        ONNX_PATH: onnx==1.15.0
         INSTALL_KERAS:
         UNINSTALL_KERAS:
         INSTALL_TENSORFLOW: pip install tensorflow==2.10.0
@@ -57,18 +56,6 @@ jobs:
         INSTALL_NUMPY:
         NIGHTLY_BUILD_TEST: python run_all_v2.py
 
-      Python310-tf2-oldest:
-        python.version: '3.10'
-        ONNX_PATH: onnx==1.14.1
-        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:
@@ -82,7 +69,7 @@ jobs:
     matrix:
       Python37-tf-1.15:
         python.version: '3.7' # Max version that supports tf 1.15
-        ONNX_PATH: onnx==1.14.1
+        ONNX_PATH: onnx==1.14.1 # Max version that supports python 3.7
         INSTALL_KERAS: pip install keras==2.3.1
         UNINSTALL_KERAS:
         INSTALL_TENSORFLOW: pip install tensorflow==1.15.0
@@ -93,21 +80,21 @@ jobs:
         INSTALL_LEGACY: pip install h5py==2.9.0
         NIGHTLY_BUILD_TEST: python run_all_v2.py --exclude "test_keras_applications_v2.py"
 
-      Python39-tf2-2.12:
+      Python39-tf2-2.15:
         python.version: '3.9'
-        ONNX_PATH: onnx==1.14.1
+        ONNX_PATH: onnx==1.15.0
         INSTALL_KERAS:
         UNINSTALL_KERAS:
-        INSTALL_TENSORFLOW: pip install tensorflow==2.12.0
-        INSTALL_ORT: pip install onnxruntime==1.15.1
+        INSTALL_TENSORFLOW: pip install tensorflow==2.15.0
+        INSTALL_ORT: pip install onnxruntime==1.15.0
         INSTALL_KERAS_RESNET: pip install keras-resnet
-        INSTALL_TRANSFORMERS: pip install transformers==3.4.0
-        INSTALL_NUMPY: pip install numpy==1.19.0
+        INSTALL_TRANSFORMERS: pip install transformers==4.2.0
+        INSTALL_NUMPY:
         NIGHTLY_BUILD_TEST: python run_all_v2.py
 
-      Python310-tf2-2.11:
-        python.version: '3.10'
-        ONNX_PATH: onnx==1.14.1
+      Python39-tf2-2.11:
+        python.version: '3.9'
+        ONNX_PATH: onnx==1.15.0
         INSTALL_KERAS:
         UNINSTALL_KERAS:
         INSTALL_TENSORFLOW: pip install tensorflow==2.11.0
@@ -119,7 +106,7 @@ jobs:
 
       Python38-tf2-2.10:
         python.version: '3.8'
-        ONNX_PATH: onnx==1.14.1
+        ONNX_PATH: onnx==1.15.0
         INSTALL_KERAS:
         UNINSTALL_KERAS:
         INSTALL_TENSORFLOW: pip install tensorflow==2.10.0
@@ -129,15 +116,15 @@ jobs:
         INSTALL_NUMPY:
         NIGHTLY_BUILD_TEST: python run_all_v2.py
 
-      Python310-tf2-oldest:
-        python.version: '3.10'
-        ONNX_PATH: onnx==1.14.1
+      Python38-tf2-2.9:
+        python.version: '3.8'
+        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.15.1
         INSTALL_KERAS_RESNET: pip install keras-resnet
-        INSTALL_TRANSFORMERS: pip install transformers==4.2.0
+        INSTALL_TRANSFORMERS: pip install transformers==4.12.0
         INSTALL_NUMPY:
         NIGHTLY_BUILD_TEST: python run_all_v2.py
 

diff --git a/ci_build/azure_pipelines/keras2onnx_unit_test.yml b/ci_build/azure_pipelines/keras2onnx_unit_test.yml
@@ -10,50 +10,36 @@ jobs:
       ############ TF Keras Unit Tests ############
       Python310-tf2-2.13:
         python.version: '3.10'
-        ONNX_PATH: onnx==1.14.1
+        ONNX_PATH: onnx==1.15.0
         TENSORFLOW_PATH: tensorflow==2.13.0
         INSTALL_ORT: pip install onnxruntime==1.15.0
         INSTALL_NUMPY:
 
-      Python38-tf2-2.12:
-        python.version: '3.8'
-        ONNX_PATH: onnx==1.14.1
+      Python39-tf2-2.12:
+        python.version: '3.9'
+        ONNX_PATH: onnx==1.15.0
         TENSORFLOW_PATH: tensorflow==2.12.0
         INSTALL_ORT: pip install onnxruntime==1.15.0
         INSTALL_NUMPY:
 
       Python39-tf2-2.11:
         python.version: '3.9'
-        ONNX_PATH: onnx==1.14.1
+        ONNX_PATH: onnx==1.15.0
         TENSORFLOW_PATH: tensorflow==2.11.0
         INSTALL_ORT: pip install onnxruntime==1.15.0
         INSTALL_NUMPY:
 
-      Python310-tf2-2.10:
-        python.version: '3.10'
-        ONNX_PATH: onnx==1.14.1
-        TENSORFLOW_PATH: tensorflow==2.10.0
-        INSTALL_ORT: pip install onnxruntime==1.15.0
-        INSTALL_NUMPY:
-
-      Python38-tf2-2.9:
+      Python38-tf2-2.10:
         python.version: '3.8'
-        ONNX_PATH: onnx==1.14.1
-        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.14.1
-        TENSORFLOW_PATH: tensorflow==2.8.0
+        ONNX_PATH: onnx==1.15.0
+        TENSORFLOW_PATH: tensorflow==2.10.0
         INSTALL_ORT: pip install onnxruntime==1.15.0
         INSTALL_NUMPY:
 
       ############ Pure Keras Unit Tests ############
       Keras-Py37-tf1.15.0:
         python.version: '3.7' # Max version that supports tf 1.15
-        ONNX_PATH: onnx==1.14.1
+        ONNX_PATH: onnx==1.14.1 # Max version that supports python 3.7
         KERAS: keras==2.4.3
         TENSORFLOW_PATH: tensorflow==1.15.0
         INSTALL_ORT: pip install onnxruntime==1.14.1 # Max version that supports python 3.7
@@ -70,52 +56,45 @@ jobs:
   strategy:
     matrix:
       ############ TF Keras Unit Tests ############
-      Python310-tf2-2.13:
+      Python310-tf2-2.14:
         python.version: '3.10'
-        ONNX_PATH: onnx==1.14.1
+        ONNX_PATH: onnx==1.15.0
+        TENSORFLOW_PATH: tensorflow==2.14.0
+        INSTALL_ORT: pip install onnxruntime==1.15.0
+        INSTALL_NUMPY:
+
+      Python39-tf2-2.13:
+        python.version: '3.9'
+        ONNX_PATH: onnx==1.15.0
         TENSORFLOW_PATH: tensorflow==2.13.0
         INSTALL_ORT: pip install onnxruntime==1.15.0
         INSTALL_NUMPY:
 
       Python38-tf2-2.12:
         python.version: '3.8'
-        ONNX_PATH: onnx==1.14.1
+        ONNX_PATH: onnx==1.15.0
         TENSORFLOW_PATH: tensorflow==2.12.0
         INSTALL_ORT: pip install onnxruntime==1.15.0
         INSTALL_NUMPY:
 
       Python39-tf2-2.11:
         python.version: '3.9'
-        ONNX_PATH: onnx==1.14.1
+        ONNX_PATH: onnx==1.15.0
         TENSORFLOW_PATH: tensorflow==2.11.0
         INSTALL_ORT: pip install onnxruntime==1.15.0
         INSTALL_NUMPY:
 
-      Python310-tf2-2.10:
-        python.version: '3.10'
-        ONNX_PATH: onnx==1.14.1
-        TENSORFLOW_PATH: tensorflow==2.10.0
-        INSTALL_ORT: pip install onnxruntime==1.15.0
-        INSTALL_NUMPY:
-
-      Python38-tf2-2.9:
+      Python38-tf2-2.10:
         python.version: '3.8'
-        ONNX_PATH: onnx==1.14.1
-        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.14.1
-        TENSORFLOW_PATH: tensorflow==2.8.0
+        ONNX_PATH: onnx==1.15.0
+        TENSORFLOW_PATH: tensorflow==2.10.0
         INSTALL_ORT: pip install onnxruntime==1.15.0
         INSTALL_NUMPY:
 
       ############ Pure Keras Unit Tests ############
       Keras-Py37-tf1.15.0:
         python.version: '3.7' # Max version that supports tf 1.15
-        ONNX_PATH: onnx==1.14.1
+        ONNX_PATH: onnx==1.14.1 # Max version that supports python 3.7
         KERAS: keras==2.4.3
         TENSORFLOW_PATH: tensorflow==1.15.0
         INSTALL_ORT: pip install onnxruntime==1.14.1 # Max version that supports python 3.7

diff --git a/ci_build/azure_pipelines/onnxruntime_nightly_test.yml b/ci_build/azure_pipelines/onnxruntime_nightly_test.yml
@@ -8,6 +8,7 @@ stages:
         platforms: ['linux', 'windows']
         python_versions: [3.7']
         tf_versions: ['1.15.5']
+        onnx_versions: ['1.14.1'] # Max version that supports python 3.7
         onnx_backends: {onnxruntime: ['nightly']}
         job:
           steps:
@@ -18,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']
         onnx_backends: {onnxruntime: ['nightly']}
         job:
           steps:
@@ -29,7 +30,7 @@ stages:
       parameters:
         platforms: ['linux', 'windows']
         python_versions: ['3.9']
-        tf_versions: ['2.10.0', '2.12.0']
+        tf_versions: ['2.11.0', '2.12.0']
         onnx_backends: {onnxruntime: ['nightly']}
         job:
           steps:
@@ -40,7 +41,7 @@ stages:
       parameters:
         platforms: ['linux', 'windows']
         python_versions: ['3.10']
-        tf_versions: ['2.8.0', '2.13.0']
+        tf_versions: ['2.13.0', '2.15.0']
         onnx_backends: {onnxruntime: ['nightly']}
         job:
           steps: