Complete changes to support latest tensorflow. (#2292)

Signed-off-by: Jay Zhang <[email protected]>
onnx · Jan 16, 2024 · 13bab8a · 13bab8a
1 parent 6a2d99e
commit 13bab8a
Show file tree

Hide file tree

Showing 13 changed files with 138 additions and 139 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.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) | |
+| 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/ci_build/azure_pipelines/keras2onnx_application_tests.yml b/ci_build/azure_pipelines/keras2onnx_application_tests.yml
@@ -8,18 +8,17 @@ 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 # Max version that supports python 3.7
-        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'
@@ -45,8 +44,8 @@ jobs:
         INSTALL_NUMPY:
         NIGHTLY_BUILD_TEST: python run_all_v2.py
 
-      Python38-tf2-2.10:
-        python.version: '3.8'
+      Python39-tf2-2.10:
+        python.version: '3.9'
         ONNX_PATH: onnx==1.15.0
         INSTALL_KERAS:
         UNINSTALL_KERAS:
@@ -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.15.0
-        INSTALL_KERAS:
-        UNINSTALL_KERAS:
-        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
-        INSTALL_NUMPY:
-        NIGHTLY_BUILD_TEST: python run_all_v2.py
-
   steps:
   - template: 'templates/keras2onnx_application_tests.yml'
     parameters:
@@ -93,32 +80,32 @@ 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:
+      Python310-tf2-2.15:
         python.version: '3.10'
         ONNX_PATH: onnx==1.15.0
         INSTALL_KERAS:
         UNINSTALL_KERAS:
-        INSTALL_TENSORFLOW: pip install tensorflow==2.13.0
+        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==4.2.0
         INSTALL_NUMPY:
         NIGHTLY_BUILD_TEST: python run_all_v2.py
 
-      Python39-tf2-2.12:
-        python.version: '3.9'
+      Python310-tf2-2.14:
+        python.version: '3.10'
         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.14.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'
+      Python39-tf2-2.11:
+        python.version: '3.9'
         ONNX_PATH: onnx==1.15.0
         INSTALL_KERAS:
         UNINSTALL_KERAS:
@@ -141,6 +128,18 @@ jobs:
         INSTALL_NUMPY:
         NIGHTLY_BUILD_TEST: python run_all_v2.py
 
+      Python38-tf2-2.9:
+        python.version: '3.8'
+        ONNX_PATH: onnx==1.15.0
+        INSTALL_KERAS:
+        UNINSTALL_KERAS:
+        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.12.0
+        INSTALL_NUMPY:
+        NIGHTLY_BUILD_TEST: python run_all_v2.py
+
   steps:
   - template: 'templates/keras2onnx_application_tests.yml'
     parameters:

diff --git a/ci_build/azure_pipelines/keras2onnx_unit_test.yml b/ci_build/azure_pipelines/keras2onnx_unit_test.yml
@@ -15,8 +15,8 @@ jobs:
         INSTALL_ORT: pip install onnxruntime==1.15.0
         INSTALL_NUMPY:
 
-      Python38-tf2-2.12:
-        python.version: '3.8'
+      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
@@ -29,20 +29,13 @@ jobs:
         INSTALL_ORT: pip install onnxruntime==1.15.0
         INSTALL_NUMPY:
 
-      Python310-tf2-2.10:
-        python.version: '3.10'
+      Python38-tf2-2.10:
+        python.version: '3.8'
         ONNX_PATH: onnx==1.15.0
         TENSORFLOW_PATH: tensorflow==2.10.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.9.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
@@ -63,9 +56,16 @@ jobs:
   strategy:
     matrix:
       ############ TF Keras Unit Tests ############
-      Python310-tf2-2.13:
+      Python310-tf2-2.14:
         python.version: '3.10'
         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:
@@ -84,20 +84,13 @@ jobs:
         INSTALL_ORT: pip install onnxruntime==1.15.0
         INSTALL_NUMPY:
 
-      Python310-tf2-2.10:
-        python.version: '3.10'
+      Python38-tf2-2.10:
+        python.version: '3.8'
         ONNX_PATH: onnx==1.15.0
         TENSORFLOW_PATH: tensorflow==2.10.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.9.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

diff --git a/ci_build/azure_pipelines/onnxruntime_nightly_test.yml b/ci_build/azure_pipelines/onnxruntime_nightly_test.yml
@@ -19,7 +19,7 @@ stages:
       parameters:
         platforms: ['linux', 'windows']
         python_versions: ['3.8']
-        tf_versions: ['2.9.0', '2.10.0', '2.13.0']
+        tf_versions: ['2.9.0', '2.10.0', '2.15.0']
         onnx_backends: {onnxruntime: ['nightly']}
         job:
           steps:
@@ -30,7 +30,7 @@ stages:
       parameters:
         platforms: ['linux', 'windows']
         python_versions: ['3.9']
-        tf_versions: ['2.12.0']
+        tf_versions: ['2.11.0', '2.12.0']
         onnx_backends: {onnxruntime: ['nightly']}
         job:
           steps:
@@ -41,7 +41,7 @@ stages:
       parameters:
         platforms: ['linux', 'windows']
         python_versions: ['3.10']
-        tf_versions: ['2.9.0', '2.13.0']
+        tf_versions: ['2.9.0', '2.15.0']
         onnx_backends: {onnxruntime: ['nightly']}
         job:
           steps:

diff --git a/ci_build/azure_pipelines/pretrained_model_test-matrix.yml b/ci_build/azure_pipelines/pretrained_model_test-matrix.yml
@@ -8,18 +8,20 @@ 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: ['18', '17', '16', '15', '14']
     onnx_backends: {onnxruntime: ['1.14.1']} # Max version that supports python 3.7
     job:
       steps:
       - template: 'pretrained_model_test.yml'
 
 - template: 'templates/job_generator.yml'
   parameters:
-    platforms: ['windows']
-    python_versions: ['3.8']
-    tf_versions: ['2.9.0']
-    onnx_opsets: ['18', '17', '16', '15']
+    platforms: ['linux']
+    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', '14']
+    onnx_backends: {onnxruntime: ['1.14.1']} # Max version that supports python 3.7
     job:
       steps:
       - template: 'pretrained_model_test.yml'
@@ -28,27 +30,15 @@ jobs:
   parameters:
     platforms: ['windows']
     python_versions: ['3.9']
-    tf_versions: ['2.13.0']
-    onnx_opsets: ['18', '17', '16', '15']
-    job:
-      steps:
-      - template: 'pretrained_model_test.yml'
-
-- template: 'templates/job_generator.yml'
-  parameters:
-    platforms: ['linux', 'windows']
-    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', '14']
-    onnx_backends: {onnxruntime: ['1.14.1']} # Max version that supports python 3.7
+    tf_versions: ['2.9.0', '2.15.0']
+    onnx_opsets: ['18', '17', '16', '15', '14']
     job:
       steps:
       - template: 'pretrained_model_test.yml'
 
 - template: 'templates/job_generator.yml'
   parameters:
-    platforms: ['linux', 'windows']
+    platforms: ['linux']
     python_versions: ['3.8']
     tf_versions: ['2.9.0']
     onnx_opsets: ['17', '16', '14']
@@ -58,9 +48,9 @@ jobs:
 
 - template: 'templates/job_generator.yml'
   parameters:
-    platforms: ['linux', 'windows']
-    python_versions: ['3.9']
-    tf_versions: ['2.13.0']
+    platforms: ['linux']
+    python_versions: ['3.10']
+    tf_versions: ['2.15.0']
     onnx_opsets: ['17', '16', '14']
     job:
       steps:
@@ -69,7 +59,7 @@ jobs:
 - template: 'templates/job_generator.yml'
   parameters:
     platforms: ['linux', 'windows']
-    python_versions: ['3.10']
+    python_versions: ['3.8']
     tf_versions: ['2.10.0']
     job:
       steps:
@@ -86,10 +76,9 @@ jobs:
 
 - template: 'templates/job_generator.yml'
   parameters:
-    platforms: ['linux']
+    platforms: ['linux', 'windows']
     python_versions: ['3.10']
-    tf_versions: ['2.9.0', '2.13.0']
-    onnx_opsets: ['17', '16', '14']
+    tf_versions: ['2.14.0']
     job:
       steps:
       - template: 'pretrained_model_test.yml'

diff --git a/ci_build/azure_pipelines/pretrained_model_test.yml b/ci_build/azure_pipelines/pretrained_model_test.yml
@@ -27,7 +27,7 @@ jobs:
   parameters:
     platforms: ['linux']
     python_versions: ['3.9']
-    tf_versions: ['2.13.0']
+    tf_versions: ['2.15.0']
     onnx_opsets: ['18', '15']
     job:
       steps:
@@ -37,7 +37,7 @@ jobs:
   parameters:
     platforms: ['linux']
     python_versions: ['3.10']
-    tf_versions: ['2.9.0', '2.13.0']
+    tf_versions: ['2.9.0', '2.15.0']
     onnx_opsets: ['18', '15']
     job:
       steps:

diff --git a/ci_build/azure_pipelines/trimmed_keras2onnx_application_tests.yml b/ci_build/azure_pipelines/trimmed_keras2onnx_application_tests.yml
@@ -19,7 +19,7 @@ jobs:
         INSTALL_TRANSFORMERS:
         INSTALL_NUMPY: pip install numpy==1.19.0
         INSTALL_LEGACY: pip install h5py==2.9.0
-        NIGHTLY_BUILD_TEST: python run_all.py --exclude "test_keras_applications_v2.py"
+        NIGHTLY_BUILD_TEST: python run_all_v2.py --exclude "test_keras_applications_v2.py"
 
       Python38-tf2-oldest:
         python.version: '3.8'
@@ -33,36 +33,36 @@ jobs:
         INSTALL_NUMPY:
         NIGHTLY_BUILD_TEST: python run_all_v2.py
 
-      Python38-tf2-latest:
+      Python310-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_TENSORFLOW: pip install tensorflow==2.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
 
-      Python310-tf2-oldest:
-        python.version: '3.10'
+      Python38-tf2-oldest-plus-1:
+        python.version: '3.8'
         ONNX_PATH: onnx==1.15.0
         INSTALL_KERAS:
         UNINSTALL_KERAS:
-        INSTALL_TENSORFLOW: pip install tensorflow==2.9.0
+        INSTALL_TENSORFLOW: pip install tensorflow==2.10.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
 
-      Python310-tf2-latest:
-        python.version: '3.10'
+      Python39-tf2-latest-minus-1:
+        python.version: '3.9'
         ONNX_PATH: onnx==1.15.0
         INSTALL_KERAS:
         UNINSTALL_KERAS:
-        INSTALL_TENSORFLOW: pip install tensorflow==2.13.0
+        INSTALL_TENSORFLOW: pip install tensorflow==2.14.0
         INSTALL_ORT: pip install onnxruntime==1.16.3
         INSTALL_KERAS_RESNET: pip install keras-resnet
         INSTALL_TRANSFORMERS: pip install transformers==4.2.0