From 527efa28c99aa8bc03366429b398d80d85239bff Mon Sep 17 00:00:00 2001
From: Jay Zhang <jiz@microsoft.com>
Date: Thu, 20 Jun 2024 11:11:32 +0000
Subject: [PATCH 01/32] Try if statement.

Signed-off-by: Jay Zhang <jiz@microsoft.com>
---
 .github/workflows/unit_tests_core.yml | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/unit_tests_core.yml b/.github/workflows/unit_tests_core.yml
index d95a77504..da6913280 100644
--- a/.github/workflows/unit_tests_core.yml
+++ b/.github/workflows/unit_tests_core.yml
@@ -9,16 +9,21 @@ on:
       - main
   workflow_dispatch:
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}-${{ github.event_name == 'workflow_dispatch' }}
+  cancel-in-progress: true
+
 jobs:
   run_tests:
     strategy:
+      fail-fast: false
       matrix:
-        tf_version: ['2.9.0', '2.13.0']
+        tf_version: ['2.9.0', '2.15.0']
         python_version: ['3.8', '3.9']
         opset_version: ['18', '15']
         ort_version: ['1.16.3']
         os: ['ubuntu-latest', 'windows-2022']
-
+    if: ${{ matrix.tf_version == '2.9.0' && matrix.python_version == '3.8' }}
     runs-on: ${{ matrix.os }}
 
     steps:
@@ -74,6 +79,7 @@ jobs:
           path: ./**/test-results-*.xml
 
   publish-test-results:
+    fail-fast: false
     name: "Publish Tests Results to Github"
     needs: run_tests
     runs-on: ubuntu-latest

From 0d1b6b82ae8078e5cb995ddc6373dde59a9e0153 Mon Sep 17 00:00:00 2001
From: Jay Zhang <jiz@microsoft.com>
Date: Thu, 20 Jun 2024 15:59:42 +0000
Subject: [PATCH 02/32] Update if.

Signed-off-by: Jay Zhang <jiz@microsoft.com>
---
 .github/workflows/pylint.yml          | 2 +-
 .github/workflows/unit_tests_core.yml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/pylint.yml b/.github/workflows/pylint.yml
index 8e6d09c64..6586126ea 100644
--- a/.github/workflows/pylint.yml
+++ b/.github/workflows/pylint.yml
@@ -1,4 +1,4 @@
-name: Pylint Workflow
+name: Pylint
 
 on:
   pull_request:
diff --git a/.github/workflows/unit_tests_core.yml b/.github/workflows/unit_tests_core.yml
index da6913280..3443b9af5 100644
--- a/.github/workflows/unit_tests_core.yml
+++ b/.github/workflows/unit_tests_core.yml
@@ -23,8 +23,9 @@ jobs:
         opset_version: ['18', '15']
         ort_version: ['1.16.3']
         os: ['ubuntu-latest', 'windows-2022']
-    if: ${{ matrix.tf_version == '2.9.0' && matrix.python_version == '3.8' }}
     runs-on: ${{ matrix.os }}
+    # if: ${{ matrix.tf_version == '2.9.0' && matrix.python_version == '3.8' }}
+    if: ${{ matrix.tf_version == '2.9.0' }}
 
     steps:
       - name: Set up Python (${{ matrix.python_version }})
@@ -79,7 +80,6 @@ jobs:
           path: ./**/test-results-*.xml
 
   publish-test-results:
-    fail-fast: false
     name: "Publish Tests Results to Github"
     needs: run_tests
     runs-on: ubuntu-latest

From 435ed5f0e476a419e9e83c9a205b781b38a9b0a2 Mon Sep 17 00:00:00 2001
From: Jay Zhang <jiz@microsoft.com>
Date: Fri, 21 Jun 2024 02:59:45 +0000
Subject: [PATCH 03/32] Leverage include to limite the scope.

Signed-off-by: Jay Zhang <jiz@microsoft.com>
---
 .../workflows/keras_application_test_core.yml |  5 +++++
 .github/workflows/keras_unit_test_core.yml    |  5 +++++
 .../workflows/pretrained_model_tests_core.yml | 21 ++++++++++++++++---
 .github/workflows/unit_tests_core.yml         | 20 ++++++++++++------
 tests/utils/setup_test_env.sh                 |  8 ++++---
 5 files changed, 47 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/keras_application_test_core.yml b/.github/workflows/keras_application_test_core.yml
index d35ece74f..583c94162 100644
--- a/.github/workflows/keras_application_test_core.yml
+++ b/.github/workflows/keras_application_test_core.yml
@@ -9,9 +9,14 @@ on:
       - main
   workflow_dispatch:
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}-${{ github.event_name == 'workflow_dispatch' }}
+  cancel-in-progress: true
+
 jobs:
   run_tests:
     strategy:
+      fail-fast: false
       matrix:
         tf_version: ['2.9.0', '2.13.0']
         python_version: ['3.8', '3.9']
diff --git a/.github/workflows/keras_unit_test_core.yml b/.github/workflows/keras_unit_test_core.yml
index 3894ca166..cae5512fc 100644
--- a/.github/workflows/keras_unit_test_core.yml
+++ b/.github/workflows/keras_unit_test_core.yml
@@ -9,9 +9,14 @@ on:
       - main
   workflow_dispatch:
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}-${{ github.event_name == 'workflow_dispatch' }}
+  cancel-in-progress: true
+
 jobs:
   run_tests:
     strategy:
+      fail-fast: false
       matrix:
         tf_version: ['2.9.0', '2.13.0']
         python_version: ['3.8', '3.9']
diff --git a/.github/workflows/pretrained_model_tests_core.yml b/.github/workflows/pretrained_model_tests_core.yml
index 0df68887f..0c520c883 100644
--- a/.github/workflows/pretrained_model_tests_core.yml
+++ b/.github/workflows/pretrained_model_tests_core.yml
@@ -9,14 +9,29 @@ on:
       - main
   workflow_dispatch:
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}-${{ github.event_name == 'workflow_dispatch' }}
+  cancel-in-progress: true
+
 jobs:
   run_tests:
     strategy:
+      fail-fast: false
       matrix:
-        tf_version: ['2.9.0', '2.13.0']
-        python_version: ['3.8', '3.9', '3.10']
         opset_version: ['18', '15']
         ort_version: ['1.16.3']
+        onnx_version: [''1.16.1']
+        include:
+          - tf_version: '2.9.0'
+            python_version: '3.8'
+          - tf_version: '2.15.0'
+            python_version: '3.9'
+          - tf_version: '1.15.5'
+            python_version: '3.7'
+            os: 'ubuntu-latest'
+            opset_version: '15'
+            ort_version: '1.14.1'
+            onnx_version: '1.14.1'
 
     runs-on: ubuntu-latest
 
@@ -33,7 +48,7 @@ jobs:
         shell: bash
         run: |
           chmod +x ./tests/utils/setup_test_env.sh
-          ./tests/utils/setup_test_env.sh ${{ matrix.tf_version }} ${{ matrix.ort_version }}
+          ./tests/utils/setup_test_env.sh ${{ matrix.tf_version }} ${{ matrix.ort_version }} ${{ matrix.onnx_version }}
 
       - name: Fix Paths (Windows only)
         if: runner.os == 'Windows'
diff --git a/.github/workflows/unit_tests_core.yml b/.github/workflows/unit_tests_core.yml
index 3443b9af5..1ce8bacb0 100644
--- a/.github/workflows/unit_tests_core.yml
+++ b/.github/workflows/unit_tests_core.yml
@@ -18,14 +18,22 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        tf_version: ['2.9.0', '2.15.0']
-        python_version: ['3.8', '3.9']
+        os: ['ubuntu-latest', 'windows-2022']
         opset_version: ['18', '15']
         ort_version: ['1.16.3']
-        os: ['ubuntu-latest', 'windows-2022']
+        onnx_version: [''1.16.1']
+        include:
+          - tf_version: '2.9.0'
+            python_version: '3.8'
+          - tf_version: '2.15.0'
+            python_version: '3.9'
+          - tf_version: '1.15.5'
+            python_version: '3.7'
+            os: 'ubuntu-latest'
+            opset_version: '15'
+            ort_version: '1.14.1'
+            onnx_version: '1.14.1'
     runs-on: ${{ matrix.os }}
-    # if: ${{ matrix.tf_version == '2.9.0' && matrix.python_version == '3.8' }}
-    if: ${{ matrix.tf_version == '2.9.0' }}
 
     steps:
       - name: Set up Python (${{ matrix.python_version }})
@@ -40,7 +48,7 @@ jobs:
         shell: bash
         run: |
           chmod +x ./tests/utils/setup_test_env.sh
-          ./tests/utils/setup_test_env.sh ${{ matrix.tf_version }} ${{ matrix.ort_version }}
+          ./tests/utils/setup_test_env.sh ${{ matrix.tf_version }} ${{ matrix.ort_version }} ${{ matrix.onnx_version }}
 
       - name: Fix Paths (Windows only)
         if: runner.os == 'Windows'
diff --git a/tests/utils/setup_test_env.sh b/tests/utils/setup_test_env.sh
index 004f2505b..c6fc03399 100755
--- a/tests/utils/setup_test_env.sh
+++ b/tests/utils/setup_test_env.sh
@@ -1,20 +1,22 @@
 #!/bin/bash
 
 # # Check if the argument is provided
-if [ "$#" -ne 2 ]; then
-    echo "Usage: $0 <tensorflow_version> <onnxruntime_version>"
+if [ "$#" -ne 3 ]; then
+    echo "Usage: $0 <tensorflow_version> <onnxruntime_version> <onnx_version>"
     exit 1
 fi
 
 # Assign the argument to a variable
 TF_VERSION=$1
 ORT_VERSION=$2
+ONNX_VERSION=$3
 
 echo "==== TensorFlow version: $TF_VERSION"
 echo "==== ONNXRuntime version: $ORT_VERSION"
+echo "==== ONNX version: $ONNX_VERSION"
 
 pip install pytest pytest-cov pytest-runner coverage graphviz requests pyyaml pillow pandas parameterized sympy coloredlogs flatbuffers timeout-decorator
-pip install onnx
+pip install onnx==$ONNX_VERSION
 pip install onnxruntime==$ORT_VERSION
 pip install numpy
 

From ce2344388e2e10815dfc29998d10596cf5aeb8b8 Mon Sep 17 00:00:00 2001
From: Jay Zhang <jiz@microsoft.com>
Date: Fri, 21 Jun 2024 03:04:07 +0000
Subject: [PATCH 04/32] Fix a typo and rename files.

Signed-off-by: Jay Zhang <jiz@microsoft.com>
---
 ..._application_test_core.yml => keras_application_test_ci.yml} | 0
 .../{keras_unit_test_core.yml => keras_unit_test_ci.yml}        | 0
 ...ained_model_tests_core.yml => pretrained_model_tests_ci.yml} | 2 +-
 .github/workflows/{unit_tests_core.yml => unit_tests_ci.yml}    | 2 +-
 4 files changed, 2 insertions(+), 2 deletions(-)
 rename .github/workflows/{keras_application_test_core.yml => keras_application_test_ci.yml} (100%)
 rename .github/workflows/{keras_unit_test_core.yml => keras_unit_test_ci.yml} (100%)
 rename .github/workflows/{pretrained_model_tests_core.yml => pretrained_model_tests_ci.yml} (98%)
 rename .github/workflows/{unit_tests_core.yml => unit_tests_ci.yml} (99%)

diff --git a/.github/workflows/keras_application_test_core.yml b/.github/workflows/keras_application_test_ci.yml
similarity index 100%
rename from .github/workflows/keras_application_test_core.yml
rename to .github/workflows/keras_application_test_ci.yml
diff --git a/.github/workflows/keras_unit_test_core.yml b/.github/workflows/keras_unit_test_ci.yml
similarity index 100%
rename from .github/workflows/keras_unit_test_core.yml
rename to .github/workflows/keras_unit_test_ci.yml
diff --git a/.github/workflows/pretrained_model_tests_core.yml b/.github/workflows/pretrained_model_tests_ci.yml
similarity index 98%
rename from .github/workflows/pretrained_model_tests_core.yml
rename to .github/workflows/pretrained_model_tests_ci.yml
index 0c520c883..02f80d6a3 100644
--- a/.github/workflows/pretrained_model_tests_core.yml
+++ b/.github/workflows/pretrained_model_tests_ci.yml
@@ -20,7 +20,7 @@ jobs:
       matrix:
         opset_version: ['18', '15']
         ort_version: ['1.16.3']
-        onnx_version: [''1.16.1']
+        onnx_version: ['1.16.1']
         include:
           - tf_version: '2.9.0'
             python_version: '3.8'
diff --git a/.github/workflows/unit_tests_core.yml b/.github/workflows/unit_tests_ci.yml
similarity index 99%
rename from .github/workflows/unit_tests_core.yml
rename to .github/workflows/unit_tests_ci.yml
index 1ce8bacb0..9fff20fc1 100644
--- a/.github/workflows/unit_tests_core.yml
+++ b/.github/workflows/unit_tests_ci.yml
@@ -21,7 +21,7 @@ jobs:
         os: ['ubuntu-latest', 'windows-2022']
         opset_version: ['18', '15']
         ort_version: ['1.16.3']
-        onnx_version: [''1.16.1']
+        onnx_version: ['1.16.1']
         include:
           - tf_version: '2.9.0'
             python_version: '3.8'

From dbb2f43c44150e902bded24ed426b2df63e9a40f Mon Sep 17 00:00:00 2001
From: Jay Zhang <jiz@microsoft.com>
Date: Fri, 21 Jun 2024 03:31:48 +0000
Subject: [PATCH 05/32] Finish updating 2 CI files.

Signed-off-by: Jay Zhang <jiz@microsoft.com>
---
 .github/workflows/pretrained_model_tests_ci.yml |  4 +++-
 .github/workflows/unit_tests_ci.yml             | 11 ++++++++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/pretrained_model_tests_ci.yml b/.github/workflows/pretrained_model_tests_ci.yml
index 02f80d6a3..c1658a956 100644
--- a/.github/workflows/pretrained_model_tests_ci.yml
+++ b/.github/workflows/pretrained_model_tests_ci.yml
@@ -18,6 +18,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
+        tf_version: ['2.9.0', '2.15.0']
+        python_version: ['3.9']
         opset_version: ['18', '15']
         ort_version: ['1.16.3']
         onnx_version: ['1.16.1']
@@ -25,7 +27,7 @@ jobs:
           - tf_version: '2.9.0'
             python_version: '3.8'
           - tf_version: '2.15.0'
-            python_version: '3.9'
+            python_version: '3.10'
           - tf_version: '1.15.5'
             python_version: '3.7'
             os: 'ubuntu-latest'
diff --git a/.github/workflows/unit_tests_ci.yml b/.github/workflows/unit_tests_ci.yml
index 9fff20fc1..b79b228d8 100644
--- a/.github/workflows/unit_tests_ci.yml
+++ b/.github/workflows/unit_tests_ci.yml
@@ -15,24 +15,29 @@ concurrency:
 
 jobs:
   run_tests:
+  name: Test (${{ matrix.python_version }}-${{ matrix.tf_version }}-${{ matrix.opset_version }}-${{ matrix.os }})
     strategy:
       fail-fast: false
       matrix:
         os: ['ubuntu-latest', 'windows-2022']
+        tf_version: ['2.9.0', '2.15.0']
+        python_version: ['3.9']
         opset_version: ['18', '15']
         ort_version: ['1.16.3']
         onnx_version: ['1.16.1']
+        skip_tflite: ['False']
         include:
           - tf_version: '2.9.0'
             python_version: '3.8'
           - tf_version: '2.15.0'
-            python_version: '3.9'
+            python_version: '3.10'
           - tf_version: '1.15.5'
             python_version: '3.7'
             os: 'ubuntu-latest'
             opset_version: '15'
             ort_version: '1.14.1'
             onnx_version: '1.14.1'
+            skip_tflite: 'True'
     runs-on: ${{ matrix.os }}
 
     steps:
@@ -63,7 +68,7 @@ jobs:
         run: |
           export TF2ONNX_TEST_BACKEND=onnxruntime
           export TF2ONNX_TEST_OPSET=${{ matrix.opset_version }}
-          export TF2ONNX_SKIP_TFLITE_TESTS=False
+          export TF2ONNX_SKIP_TFLITE_TESTS=${{ matrix.skip_tflite }}
           export TF2ONNX_SKIP_TFJS_TESTS=True
           export TF2ONNX_SKIP_TF_TESTS=False
           python -m pytest --cov=tf2onnx --cov-report=term --disable-pytest-warnings -r s tests --cov-append --junitxml=junit/test-results.xml
@@ -74,7 +79,7 @@ jobs:
         run: |
           set TF2ONNX_TEST_BACKEND=onnxruntime
           set TF2ONNX_TEST_OPSET=${{ matrix.opset_version }}
-          set TF2ONNX_SKIP_TFLITE_TESTS=False
+          set TF2ONNX_SKIP_TFLITE_TESTS=${{ matrix.skip_tflite }}
           set TF2ONNX_SKIP_TFJS_TESTS=True
           set TF2ONNX_SKIP_TF_TESTS=False
           python -m pytest --cov=tf2onnx --cov-report=term --disable-pytest-warnings -r s tests --cov-append --junitxml=junit/test-results.xml

From f47942ee11ce90731b899c9649ee74d1da4b3caa Mon Sep 17 00:00:00 2001
From: Jay Zhang <jiz@microsoft.com>
Date: Fri, 21 Jun 2024 03:35:08 +0000
Subject: [PATCH 06/32] Remove name of jobs.

Signed-off-by: Jay Zhang <jiz@microsoft.com>
---
 .github/workflows/unit_tests_ci.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/unit_tests_ci.yml b/.github/workflows/unit_tests_ci.yml
index b79b228d8..b3d65eb91 100644
--- a/.github/workflows/unit_tests_ci.yml
+++ b/.github/workflows/unit_tests_ci.yml
@@ -15,7 +15,6 @@ concurrency:
 
 jobs:
   run_tests:
-  name: Test (${{ matrix.python_version }}-${{ matrix.tf_version }}-${{ matrix.opset_version }}-${{ matrix.os }})
     strategy:
       fail-fast: false
       matrix:

From 71c3396ba863ad0e61a1fad29e78dd561996c578 Mon Sep 17 00:00:00 2001
From: Jay Zhang <jiz@microsoft.com>
Date: Fri, 21 Jun 2024 05:56:15 +0000
Subject: [PATCH 07/32] Update unit tests ci.

Signed-off-by: Jay Zhang <jiz@microsoft.com>
---
 .github/workflows/unit_tests_ci.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/unit_tests_ci.yml b/.github/workflows/unit_tests_ci.yml
index b3d65eb91..cbae2783a 100644
--- a/.github/workflows/unit_tests_ci.yml
+++ b/.github/workflows/unit_tests_ci.yml
@@ -32,7 +32,6 @@ jobs:
             python_version: '3.10'
           - tf_version: '1.15.5'
             python_version: '3.7'
-            os: 'ubuntu-latest'
             opset_version: '15'
             ort_version: '1.14.1'
             onnx_version: '1.14.1'

From d73aa7597e1f0f2501a8046eb17fbccd2cd866c2 Mon Sep 17 00:00:00 2001
From: Jay Zhang <jiz@microsoft.com>
Date: Fri, 21 Jun 2024 06:02:13 +0000
Subject: [PATCH 08/32] Correct the includes settings.

Signed-off-by: Jay Zhang <jiz@microsoft.com>
---
 .github/workflows/pretrained_model_tests_ci.yml | 6 ++++--
 .github/workflows/unit_tests_ci.yml             | 8 ++++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/pretrained_model_tests_ci.yml b/.github/workflows/pretrained_model_tests_ci.yml
index c1658a956..5f2dfd987 100644
--- a/.github/workflows/pretrained_model_tests_ci.yml
+++ b/.github/workflows/pretrained_model_tests_ci.yml
@@ -18,14 +18,16 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        tf_version: ['2.9.0', '2.15.0']
-        python_version: ['3.9']
         opset_version: ['18', '15']
         ort_version: ['1.16.3']
         onnx_version: ['1.16.1']
         include:
           - tf_version: '2.9.0'
             python_version: '3.8'
+          - tf_version: '2.9.0'
+            python_version: '3.9'
+          - tf_version: '2.15.0'
+            python_version: '3.9'
           - tf_version: '2.15.0'
             python_version: '3.10'
           - tf_version: '1.15.5'
diff --git a/.github/workflows/unit_tests_ci.yml b/.github/workflows/unit_tests_ci.yml
index cbae2783a..ee14f1a33 100644
--- a/.github/workflows/unit_tests_ci.yml
+++ b/.github/workflows/unit_tests_ci.yml
@@ -19,8 +19,6 @@ jobs:
       fail-fast: false
       matrix:
         os: ['ubuntu-latest', 'windows-2022']
-        tf_version: ['2.9.0', '2.15.0']
-        python_version: ['3.9']
         opset_version: ['18', '15']
         ort_version: ['1.16.3']
         onnx_version: ['1.16.1']
@@ -28,14 +26,20 @@ jobs:
         include:
           - tf_version: '2.9.0'
             python_version: '3.8'
+          - tf_version: '2.9.0'
+            python_version: '3.9'
+          - tf_version: '2.15.0'
+            python_version: '3.9'
           - tf_version: '2.15.0'
             python_version: '3.10'
           - tf_version: '1.15.5'
             python_version: '3.7'
+            os: 'ubuntu-latest'
             opset_version: '15'
             ort_version: '1.14.1'
             onnx_version: '1.14.1'
             skip_tflite: 'True'
+
     runs-on: ${{ matrix.os }}
 
     steps:

From 8407a63d458d04971cc154b80e6871c296abf7e9 Mon Sep 17 00:00:00 2001
From: Jay Zhang <jiz@microsoft.com>
Date: Fri, 21 Jun 2024 06:08:58 +0000
Subject: [PATCH 09/32] Try other scenarios.

Signed-off-by: Jay Zhang <jiz@microsoft.com>
---
 .../workflows/pretrained_model_tests_ci.yml    | 16 ++++++++--------
 .github/workflows/unit_tests_ci.yml            | 18 +++++++++---------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/pretrained_model_tests_ci.yml b/.github/workflows/pretrained_model_tests_ci.yml
index 5f2dfd987..73f5684af 100644
--- a/.github/workflows/pretrained_model_tests_ci.yml
+++ b/.github/workflows/pretrained_model_tests_ci.yml
@@ -28,14 +28,14 @@ jobs:
             python_version: '3.9'
           - tf_version: '2.15.0'
             python_version: '3.9'
-          - tf_version: '2.15.0'
-            python_version: '3.10'
-          - tf_version: '1.15.5'
-            python_version: '3.7'
-            os: 'ubuntu-latest'
-            opset_version: '15'
-            ort_version: '1.14.1'
-            onnx_version: '1.14.1'
+          # - tf_version: '2.15.0'
+          #   python_version: '3.10'
+          # - tf_version: '1.15.5'
+          #   python_version: '3.7'
+          #   os: 'ubuntu-latest'
+          #   opset_version: '15'
+          #   ort_version: '1.14.1'
+          #   onnx_version: '1.14.1'
 
     runs-on: ubuntu-latest
 
diff --git a/.github/workflows/unit_tests_ci.yml b/.github/workflows/unit_tests_ci.yml
index ee14f1a33..44eb1b64c 100644
--- a/.github/workflows/unit_tests_ci.yml
+++ b/.github/workflows/unit_tests_ci.yml
@@ -30,15 +30,15 @@ jobs:
             python_version: '3.9'
           - tf_version: '2.15.0'
             python_version: '3.9'
-          - tf_version: '2.15.0'
-            python_version: '3.10'
-          - tf_version: '1.15.5'
-            python_version: '3.7'
-            os: 'ubuntu-latest'
-            opset_version: '15'
-            ort_version: '1.14.1'
-            onnx_version: '1.14.1'
-            skip_tflite: 'True'
+          # - tf_version: '2.15.0'
+          #   python_version: '3.10'
+          # - tf_version: '1.15.5'
+          #   python_version: '3.7'
+          #   os: 'ubuntu-latest'
+          #   opset_version: '15'
+          #   ort_version: '1.14.1'
+          #   onnx_version: '1.14.1'
+          #   skip_tflite: 'True'
 
     runs-on: ${{ matrix.os }}
 

From d6304105f43abb357af77cc2c18a44b4f0d6bf67 Mon Sep 17 00:00:00 2001
From: Jay Zhang <jiz@microsoft.com>
Date: Sun, 23 Jun 2024 14:45:06 +0000
Subject: [PATCH 10/32] Refactor include.

Signed-off-by: Jay Zhang <jiz@microsoft.com>
---
 .github/workflows/unit_tests_ci.yml | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/unit_tests_ci.yml b/.github/workflows/unit_tests_ci.yml
index 44eb1b64c..2ab436368 100644
--- a/.github/workflows/unit_tests_ci.yml
+++ b/.github/workflows/unit_tests_ci.yml
@@ -19,26 +19,32 @@ jobs:
       fail-fast: false
       matrix:
         os: ['ubuntu-latest', 'windows-2022']
-        opset_version: ['18', '15']
         ort_version: ['1.16.3']
         onnx_version: ['1.16.1']
         skip_tflite: ['False']
         include:
           - tf_version: '2.9.0'
             python_version: '3.8'
+            opset_version: '18'
+          - tf_version: '2.9.0'
+            python_version: '3.8'
+            opset_version: '15'
           - tf_version: '2.9.0'
             python_version: '3.9'
+            opset_version: '18'
           - tf_version: '2.15.0'
             python_version: '3.9'
-          # - tf_version: '2.15.0'
-          #   python_version: '3.10'
-          # - tf_version: '1.15.5'
-          #   python_version: '3.7'
-          #   os: 'ubuntu-latest'
-          #   opset_version: '15'
-          #   ort_version: '1.14.1'
-          #   onnx_version: '1.14.1'
-          #   skip_tflite: 'True'
+            opset_version: '18'
+          - tf_version: '2.15.0'
+            python_version: '3.10'
+            opset_version: '18'
+          - tf_version: '1.15.5'
+            python_version: '3.7'
+            os: 'ubuntu-latest'
+            opset_version: '15'
+            ort_version: '1.14.1'
+            onnx_version: '1.14.1'
+            skip_tflite: 'True'
 
     runs-on: ${{ matrix.os }}
 

From ec0f91a07f3e2f2208d0b36173102b7914256041 Mon Sep 17 00:00:00 2001
From: Jay Zhang <jiz@microsoft.com>
Date: Sun, 23 Jun 2024 14:51:07 +0000
Subject: [PATCH 11/32] Refactor include.

Signed-off-by: Jay Zhang <jiz@microsoft.com>
---
 .github/workflows/unit_tests_ci.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/unit_tests_ci.yml b/.github/workflows/unit_tests_ci.yml
index 2ab436368..87b7cc924 100644
--- a/.github/workflows/unit_tests_ci.yml
+++ b/.github/workflows/unit_tests_ci.yml
@@ -19,9 +19,9 @@ jobs:
       fail-fast: false
       matrix:
         os: ['ubuntu-latest', 'windows-2022']
-        ort_version: ['1.16.3']
-        onnx_version: ['1.16.1']
-        skip_tflite: ['False']
+        ort_version: '1.16.3'
+        onnx_version: '1.16.1'
+        skip_tflite: 'False'
         include:
           - tf_version: '2.9.0'
             python_version: '3.8'

From d9f5e1911d6c44b7cf3d3bb4e22ae41c8168d7a5 Mon Sep 17 00:00:00 2001
From: Jay Zhang <jiz@microsoft.com>
Date: Sun, 23 Jun 2024 14:53:35 +0000
Subject: [PATCH 12/32] Update include.

Signed-off-by: Jay Zhang <jiz@microsoft.com>
---
 .github/workflows/unit_tests_ci.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/unit_tests_ci.yml b/.github/workflows/unit_tests_ci.yml
index 87b7cc924..f56d5544f 100644
--- a/.github/workflows/unit_tests_ci.yml
+++ b/.github/workflows/unit_tests_ci.yml
@@ -19,9 +19,9 @@ jobs:
       fail-fast: false
       matrix:
         os: ['ubuntu-latest', 'windows-2022']
-        ort_version: '1.16.3'
-        onnx_version: '1.16.1'
-        skip_tflite: 'False'
+        ort_version: 1.16.3
+        onnx_version: 1.16.1
+        skip_tflite: False
         include:
           - tf_version: '2.9.0'
             python_version: '3.8'

From 42d91109e307e4e1af41a7c6e9580941968f698b Mon Sep 17 00:00:00 2001
From: Jay Zhang <jiz@microsoft.com>
Date: Sun, 23 Jun 2024 14:57:28 +0000
Subject: [PATCH 13/32] Refactor include.

Signed-off-by: Jay Zhang <jiz@microsoft.com>
---
 .github/workflows/unit_tests_ci.yml | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/unit_tests_ci.yml b/.github/workflows/unit_tests_ci.yml
index f56d5544f..cc4454203 100644
--- a/.github/workflows/unit_tests_ci.yml
+++ b/.github/workflows/unit_tests_ci.yml
@@ -19,25 +19,37 @@ jobs:
       fail-fast: false
       matrix:
         os: ['ubuntu-latest', 'windows-2022']
-        ort_version: 1.16.3
-        onnx_version: 1.16.1
-        skip_tflite: False
         include:
           - tf_version: '2.9.0'
             python_version: '3.8'
             opset_version: '18'
+            ort_version: 1.16.3
+            onnx_version: 1.16.1
+            skip_tflite: False
           - tf_version: '2.9.0'
             python_version: '3.8'
             opset_version: '15'
+            ort_version: 1.16.3
+            onnx_version: 1.16.1
+            skip_tflite: False
           - tf_version: '2.9.0'
             python_version: '3.9'
             opset_version: '18'
+            ort_version: 1.16.3
+            onnx_version: 1.16.1
+            skip_tflite: False
           - tf_version: '2.15.0'
             python_version: '3.9'
             opset_version: '18'
+            ort_version: 1.16.3
+            onnx_version: 1.16.1
+            skip_tflite: False
           - tf_version: '2.15.0'
             python_version: '3.10'
             opset_version: '18'
+            ort_version: 1.16.3
+            onnx_version: 1.16.1
+            skip_tflite: False
           - tf_version: '1.15.5'
             python_version: '3.7'
             os: 'ubuntu-latest'

From 6af85c912a68455eaaad5dad7d24132bc8bb1d46 Mon Sep 17 00:00:00 2001
From: Jay Zhang <jiz@microsoft.com>
Date: Sun, 23 Jun 2024 15:02:51 +0000
Subject: [PATCH 14/32] Change again.

Signed-off-by: Jay Zhang <jiz@microsoft.com>
---
 .github/workflows/unit_tests_ci.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/unit_tests_ci.yml b/.github/workflows/unit_tests_ci.yml
index cc4454203..81f90c116 100644
--- a/.github/workflows/unit_tests_ci.yml
+++ b/.github/workflows/unit_tests_ci.yml
@@ -18,7 +18,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: ['ubuntu-latest', 'windows-2022']
+        os: [ubuntu-latest, windows-2022]
+        tf_version:
+          - '2.9.0'
+          - '2.15.0'
         include:
           - tf_version: '2.9.0'
             python_version: '3.8'

From b79835d8436b88cfad76e10c6c62c16be9adf374 Mon Sep 17 00:00:00 2001
From: Jay Zhang <jiz@microsoft.com>
Date: Sun, 23 Jun 2024 15:10:30 +0000
Subject: [PATCH 15/32] Move some to common part.

Signed-off-by: Jay Zhang <jiz@microsoft.com>
---
 .github/workflows/unit_tests_ci.yml | 27 ++++++++++++---------------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/unit_tests_ci.yml b/.github/workflows/unit_tests_ci.yml
index 81f90c116..52803d186 100644
--- a/.github/workflows/unit_tests_ci.yml
+++ b/.github/workflows/unit_tests_ci.yml
@@ -22,37 +22,34 @@ jobs:
         tf_version:
           - '2.9.0'
           - '2.15.0'
+        python_version: '3.9'
+        skip_tflite: 'False'
         include:
           - tf_version: '2.9.0'
             python_version: '3.8'
             opset_version: '18'
             ort_version: 1.16.3
             onnx_version: 1.16.1
-            skip_tflite: False
           - tf_version: '2.9.0'
             python_version: '3.8'
             opset_version: '15'
             ort_version: 1.16.3
             onnx_version: 1.16.1
-            skip_tflite: False
-          - tf_version: '2.9.0'
-            python_version: '3.9'
-            opset_version: '18'
-            ort_version: 1.16.3
-            onnx_version: 1.16.1
-            skip_tflite: False
-          - tf_version: '2.15.0'
-            python_version: '3.9'
-            opset_version: '18'
-            ort_version: 1.16.3
-            onnx_version: 1.16.1
-            skip_tflite: False
+          # - tf_version: '2.9.0'
+          #   python_version: '3.9'
+          #   opset_version: '18'
+          #   ort_version: 1.16.3
+          #   onnx_version: 1.16.1
+          # - tf_version: '2.15.0'
+          #   python_version: '3.9'
+          #   opset_version: '18'
+          #   ort_version: 1.16.3
+          #   onnx_version: 1.16.1
           - tf_version: '2.15.0'
             python_version: '3.10'
             opset_version: '18'
             ort_version: 1.16.3
             onnx_version: 1.16.1
-            skip_tflite: False
           - tf_version: '1.15.5'
             python_version: '3.7'
             os: 'ubuntu-latest'

From 21790d9e201285a7de00e293265ffe188a11fe21 Mon Sep 17 00:00:00 2001
From: Jay Zhang <jiz@microsoft.com>
Date: Sun, 23 Jun 2024 15:12:22 +0000
Subject: [PATCH 16/32] Reformat the value.

Signed-off-by: Jay Zhang <jiz@microsoft.com>
---
 .github/workflows/unit_tests_ci.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/unit_tests_ci.yml b/.github/workflows/unit_tests_ci.yml
index 52803d186..7e9a05240 100644
--- a/.github/workflows/unit_tests_ci.yml
+++ b/.github/workflows/unit_tests_ci.yml
@@ -22,8 +22,10 @@ jobs:
         tf_version:
           - '2.9.0'
           - '2.15.0'
-        python_version: '3.9'
-        skip_tflite: 'False'
+        python_version:
+          - '3.9'
+        skip_tflite:
+          - 'False'
         include:
           - tf_version: '2.9.0'
             python_version: '3.8'

From 4ed6f2d98d3e1c38f8dda4d69a8c2b6b9696d71d Mon Sep 17 00:00:00 2001
From: Jay Zhang <jiz@microsoft.com>
Date: Sun, 23 Jun 2024 15:15:14 +0000
Subject: [PATCH 17/32] Refactor.

Signed-off-by: Jay Zhang <jiz@microsoft.com>
---
 .github/workflows/unit_tests_ci.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/unit_tests_ci.yml b/.github/workflows/unit_tests_ci.yml
index 7e9a05240..d6e4efe29 100644
--- a/.github/workflows/unit_tests_ci.yml
+++ b/.github/workflows/unit_tests_ci.yml
@@ -24,19 +24,20 @@ jobs:
           - '2.15.0'
         python_version:
           - '3.9'
-        skip_tflite:
-          - 'False'
+          - '3.10'
         include:
           - tf_version: '2.9.0'
             python_version: '3.8'
             opset_version: '18'
             ort_version: 1.16.3
             onnx_version: 1.16.1
+            skip_tflite: 'False'
           - tf_version: '2.9.0'
             python_version: '3.8'
             opset_version: '15'
             ort_version: 1.16.3
             onnx_version: 1.16.1
+            skip_tflite: 'False'
           # - tf_version: '2.9.0'
           #   python_version: '3.9'
           #   opset_version: '18'
@@ -52,6 +53,7 @@ jobs:
             opset_version: '18'
             ort_version: 1.16.3
             onnx_version: 1.16.1
+            skip_tflite: 'False'
           - tf_version: '1.15.5'
             python_version: '3.7'
             os: 'ubuntu-latest'

From 320530b32dba0f453cd10b7a68c966c4e0199bcf Mon Sep 17 00:00:00 2001
From: Jay Zhang <jiz@microsoft.com>
Date: Sun, 23 Jun 2024 15:17:10 +0000
Subject: [PATCH 18/32] Refactor

Signed-off-by: Jay Zhang <jiz@microsoft.com>
---
 .github/workflows/unit_tests_ci.yml | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/unit_tests_ci.yml b/.github/workflows/unit_tests_ci.yml
index d6e4efe29..718c6c068 100644
--- a/.github/workflows/unit_tests_ci.yml
+++ b/.github/workflows/unit_tests_ci.yml
@@ -19,12 +19,8 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-2022]
-        tf_version:
-          - '2.9.0'
-          - '2.15.0'
-        python_version:
-          - '3.9'
-          - '3.10'
+        tf_version: ['2.9.0', '2.15.0']
+        python_version: ['3.9', '3.10']
         include:
           - tf_version: '2.9.0'
             python_version: '3.8'

From 44a40c674c81d764110fa014abf8829cf0d30059 Mon Sep 17 00:00:00 2001
From: Jay Zhang <jiz@microsoft.com>
Date: Sun, 23 Jun 2024 15:18:46 +0000
Subject: [PATCH 19/32] Refactor.

Signed-off-by: Jay Zhang <jiz@microsoft.com>
---
 .github/workflows/unit_tests_ci.yml | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/unit_tests_ci.yml b/.github/workflows/unit_tests_ci.yml
index 718c6c068..af953c1b0 100644
--- a/.github/workflows/unit_tests_ci.yml
+++ b/.github/workflows/unit_tests_ci.yml
@@ -18,9 +18,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, windows-2022]
-        tf_version: ['2.9.0', '2.15.0']
-        python_version: ['3.9', '3.10']
+        os: ['ubuntu-latest', 'windows-2022']
         include:
           - tf_version: '2.9.0'
             python_version: '3.8'
@@ -34,16 +32,16 @@ jobs:
             ort_version: 1.16.3
             onnx_version: 1.16.1
             skip_tflite: 'False'
-          # - tf_version: '2.9.0'
-          #   python_version: '3.9'
-          #   opset_version: '18'
-          #   ort_version: 1.16.3
-          #   onnx_version: 1.16.1
-          # - tf_version: '2.15.0'
-          #   python_version: '3.9'
-          #   opset_version: '18'
-          #   ort_version: 1.16.3
-          #   onnx_version: 1.16.1
+          - tf_version: '2.9.0'
+            python_version: '3.9'
+            opset_version: '18'
+            ort_version: 1.16.3
+            onnx_version: 1.16.1
+          - tf_version: '2.15.0'
+            python_version: '3.9'
+            opset_version: '18'
+            ort_version: 1.16.3
+            onnx_version: 1.16.1
           - tf_version: '2.15.0'
             python_version: '3.10'
             opset_version: '18'

From 7eeee83c64d8bfbb7c91a919e93805df3045986a Mon Sep 17 00:00:00 2001
From: Jay Zhang <jiz@microsoft.com>
Date: Sun, 23 Jun 2024 15:22:42 +0000
Subject: [PATCH 20/32] Add name.

Signed-off-by: Jay Zhang <jiz@microsoft.com>
---
 .github/workflows/unit_tests_ci.yml | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/unit_tests_ci.yml b/.github/workflows/unit_tests_ci.yml
index af953c1b0..d376b3b76 100644
--- a/.github/workflows/unit_tests_ci.yml
+++ b/.github/workflows/unit_tests_ci.yml
@@ -19,36 +19,49 @@ jobs:
       fail-fast: false
       matrix:
         os: ['ubuntu-latest', 'windows-2022']
+        name:
+          - 'test_01'
+          - 'test_02'
+          - 'test_03'
+          - 'test_04'
+          - 'test_05'
+          - 'test_06'
         include:
-          - tf_version: '2.9.0'
+          - name: 'test_01'
+            tf_version: '2.9.0'
             python_version: '3.8'
             opset_version: '18'
             ort_version: 1.16.3
             onnx_version: 1.16.1
             skip_tflite: 'False'
-          - tf_version: '2.9.0'
+          - name: 'test_02'
+            tf_version: '2.9.0'
             python_version: '3.8'
             opset_version: '15'
             ort_version: 1.16.3
             onnx_version: 1.16.1
             skip_tflite: 'False'
-          - tf_version: '2.9.0'
+          - name: 'test_03'
+            tf_version: '2.9.0'
             python_version: '3.9'
             opset_version: '18'
             ort_version: 1.16.3
             onnx_version: 1.16.1
-          - tf_version: '2.15.0'
+          - name: 'test_04'
+            tf_version: '2.15.0'
             python_version: '3.9'
             opset_version: '18'
             ort_version: 1.16.3
             onnx_version: 1.16.1
-          - tf_version: '2.15.0'
+          - name: 'test_05'
+            tf_version: '2.15.0'
             python_version: '3.10'
             opset_version: '18'
             ort_version: 1.16.3
             onnx_version: 1.16.1
             skip_tflite: 'False'
-          - tf_version: '1.15.5'
+          - name: 'test_06'
+            tf_version: '1.15.5'
             python_version: '3.7'
             os: 'ubuntu-latest'
             opset_version: '15'

From fd86a8376525c5eb5639286867cb3650f1d437a9 Mon Sep 17 00:00:00 2001
From: Jay Zhang <jiz@microsoft.com>
Date: Sun, 23 Jun 2024 15:31:43 +0000
Subject: [PATCH 21/32] Refactor.

Signed-off-by: Jay Zhang <jiz@microsoft.com>
---
 .github/workflows/unit_tests_ci.yml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/unit_tests_ci.yml b/.github/workflows/unit_tests_ci.yml
index d376b3b76..eca92bd7e 100644
--- a/.github/workflows/unit_tests_ci.yml
+++ b/.github/workflows/unit_tests_ci.yml
@@ -25,7 +25,6 @@ jobs:
           - 'test_03'
           - 'test_04'
           - 'test_05'
-          - 'test_06'
         include:
           - name: 'test_01'
             tf_version: '2.9.0'
@@ -44,9 +43,9 @@ jobs:
           - name: 'test_03'
             tf_version: '2.9.0'
             python_version: '3.9'
-            opset_version: '18'
-            ort_version: 1.16.3
-            onnx_version: 1.16.1
+            opset_version: '15'
+            ort_version: '1.16.3'
+            onnx_version: '1.16.1'
           - name: 'test_04'
             tf_version: '2.15.0'
             python_version: '3.9'

From 3c7d5abf74d1b46627b7a496eb67f6ef18605794 Mon Sep 17 00:00:00 2001
From: Jay Zhang <jiz@microsoft.com>
Date: Sun, 23 Jun 2024 15:37:10 +0000
Subject: [PATCH 22/32] Refactor.

Signed-off-by: Jay Zhang <jiz@microsoft.com>
---
 .github/workflows/unit_tests_ci.yml | 27 +++++++++++----------------
 1 file changed, 11 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/unit_tests_ci.yml b/.github/workflows/unit_tests_ci.yml
index eca92bd7e..49f56420a 100644
--- a/.github/workflows/unit_tests_ci.yml
+++ b/.github/workflows/unit_tests_ci.yml
@@ -22,43 +22,38 @@ jobs:
         name:
           - 'test_01'
           - 'test_02'
-          - 'test_03'
           - 'test_04'
           - 'test_05'
+        skip_tflite: 'False'
         include:
           - name: 'test_01'
             tf_version: '2.9.0'
             python_version: '3.8'
             opset_version: '18'
-            ort_version: 1.16.3
-            onnx_version: 1.16.1
-            skip_tflite: 'False'
+            ort_version: '1.16.3'
+            onnx_version: '1.16.1'
+            # skip_tflite: 'False'
           - name: 'test_02'
             tf_version: '2.9.0'
             python_version: '3.8'
             opset_version: '15'
-            ort_version: 1.16.3
-            onnx_version: 1.16.1
-            skip_tflite: 'False'
-          - name: 'test_03'
-            tf_version: '2.9.0'
-            python_version: '3.9'
-            opset_version: '15'
             ort_version: '1.16.3'
             onnx_version: '1.16.1'
+            # skip_tflite: 'False'
           - name: 'test_04'
             tf_version: '2.15.0'
             python_version: '3.9'
             opset_version: '18'
-            ort_version: 1.16.3
-            onnx_version: 1.16.1
+            ort_version: '1.16.3'
+            onnx_version: '1.16.1'
+            # skip_tflite: 'False'
           - name: 'test_05'
             tf_version: '2.15.0'
             python_version: '3.10'
             opset_version: '18'
-            ort_version: 1.16.3
-            onnx_version: 1.16.1
-            skip_tflite: 'False'
+            ort_version: '1.16.3'
+            onnx_version: '1.16.1'
+            # skip_tflite: 'False'
           - name: 'test_06'
             tf_version: '1.15.5'
             python_version: '3.7'

From 4dd4f9bbf7da177ce2c2e98586de3ae044305e90 Mon Sep 17 00:00:00 2001
From: Jay Zhang <jiz@microsoft.com>
Date: Sun, 23 Jun 2024 15:50:13 +0000
Subject: [PATCH 23/32] Refactor names.

Signed-off-by: Jay Zhang <jiz@microsoft.com>
---
 .github/workflows/unit_tests_ci.yml | 44 ++++++++++++++---------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/unit_tests_ci.yml b/.github/workflows/unit_tests_ci.yml
index 49f56420a..d48eefd9c 100644
--- a/.github/workflows/unit_tests_ci.yml
+++ b/.github/workflows/unit_tests_ci.yml
@@ -19,42 +19,42 @@ jobs:
       fail-fast: false
       matrix:
         os: ['ubuntu-latest', 'windows-2022']
+        opset_version: [18, 15]
         name:
-          - 'test_01'
-          - 'test_02'
-          - 'test_04'
-          - 'test_05'
-        skip_tflite: 'False'
+          - 'py38-tf2.9'
+          - 'py39-tf2.15'
+          - 'py310-tf2.15'
+          - 'py37-tf1.15'
         include:
-          - name: 'test_01'
+          - name: 'py38-tf2.9'
             tf_version: '2.9.0'
             python_version: '3.8'
-            opset_version: '18'
+            # opset_version: '18'
             ort_version: '1.16.3'
             onnx_version: '1.16.1'
-            # skip_tflite: 'False'
-          - name: 'test_02'
-            tf_version: '2.9.0'
-            python_version: '3.8'
-            opset_version: '15'
-            ort_version: '1.16.3'
-            onnx_version: '1.16.1'
-            # skip_tflite: 'False'
-          - name: 'test_04'
+            skip_tflite: 'False'
+          # - name: 'test_02'
+          #   tf_version: '2.9.0'
+          #   python_version: '3.8'
+          #   # opset_version: '15'
+          #   ort_version: '1.16.3'
+          #   onnx_version: '1.16.1'
+          #   skip_tflite: 'False'
+          - name: 'py39-tf2.15'
             tf_version: '2.15.0'
             python_version: '3.9'
-            opset_version: '18'
+            # opset_version: '18'
             ort_version: '1.16.3'
             onnx_version: '1.16.1'
-            # skip_tflite: 'False'
-          - name: 'test_05'
+            skip_tflite: 'False'
+          - name: 'py310-tf2.15'
             tf_version: '2.15.0'
             python_version: '3.10'
-            opset_version: '18'
+            # opset_version: '18'
             ort_version: '1.16.3'
             onnx_version: '1.16.1'
-            # skip_tflite: 'False'
-          - name: 'test_06'
+            skip_tflite: 'False'
+          - name: 'py37-tf1.15'
             tf_version: '1.15.5'
             python_version: '3.7'
             os: 'ubuntu-latest'

From c7466473214569f1ee92df48b6f6b3820cdc98a7 Mon Sep 17 00:00:00 2001
From: Jay Zhang <jiz@microsoft.com>
Date: Sun, 23 Jun 2024 15:52:19 +0000
Subject: [PATCH 24/32] Remove a name.

Signed-off-by: Jay Zhang <jiz@microsoft.com>
---
 .github/workflows/unit_tests_ci.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/unit_tests_ci.yml b/.github/workflows/unit_tests_ci.yml
index d48eefd9c..bddb47247 100644
--- a/.github/workflows/unit_tests_ci.yml
+++ b/.github/workflows/unit_tests_ci.yml
@@ -24,7 +24,6 @@ jobs:
           - 'py38-tf2.9'
           - 'py39-tf2.15'
           - 'py310-tf2.15'
-          - 'py37-tf1.15'
         include:
           - name: 'py38-tf2.9'
             tf_version: '2.9.0'

From 9e441ebac2941cc487439e59304e73d9eef1bffa Mon Sep 17 00:00:00 2001
From: Jay Zhang <jiz@microsoft.com>
Date: Mon, 24 Jun 2024 02:13:16 +0000
Subject: [PATCH 25/32] Move ort_version out of each job.

Signed-off-by: Jay Zhang <jiz@microsoft.com>
---
 .github/workflows/unit_tests_ci.yml | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/unit_tests_ci.yml b/.github/workflows/unit_tests_ci.yml
index bddb47247..34ea10a3e 100644
--- a/.github/workflows/unit_tests_ci.yml
+++ b/.github/workflows/unit_tests_ci.yml
@@ -18,39 +18,31 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: ['ubuntu-latest', 'windows-2022']
-        opset_version: [18, 15]
         name:
           - 'py38-tf2.9'
           - 'py39-tf2.15'
           - 'py310-tf2.15'
+        os: ['ubuntu-latest', 'windows-2022']
+        opset_version: [18, 15]
+        ort_version: ['1.16.3']
         include:
           - name: 'py38-tf2.9'
             tf_version: '2.9.0'
             python_version: '3.8'
-            # opset_version: '18'
-            ort_version: '1.16.3'
             onnx_version: '1.16.1'
             skip_tflite: 'False'
-          # - name: 'test_02'
-          #   tf_version: '2.9.0'
-          #   python_version: '3.8'
-          #   # opset_version: '15'
-          #   ort_version: '1.16.3'
-          #   onnx_version: '1.16.1'
-          #   skip_tflite: 'False'
           - name: 'py39-tf2.15'
             tf_version: '2.15.0'
             python_version: '3.9'
             # opset_version: '18'
-            ort_version: '1.16.3'
+            # ort_version: '1.16.3'
             onnx_version: '1.16.1'
             skip_tflite: 'False'
           - name: 'py310-tf2.15'
             tf_version: '2.15.0'
             python_version: '3.10'
             # opset_version: '18'
-            ort_version: '1.16.3'
+            # ort_version: '1.16.3'
             onnx_version: '1.16.1'
             skip_tflite: 'False'
           - name: 'py37-tf1.15'

From eca92fa00b3fe040958704a388873aea47556ee8 Mon Sep 17 00:00:00 2001
From: Jay Zhang <jiz@microsoft.com>
Date: Mon, 24 Jun 2024 02:15:54 +0000
Subject: [PATCH 26/32] Correct all settings.

Signed-off-by: Jay Zhang <jiz@microsoft.com>
---
 .github/workflows/unit_tests_ci.yml | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/unit_tests_ci.yml b/.github/workflows/unit_tests_ci.yml
index 34ea10a3e..6fc5b3ea2 100644
--- a/.github/workflows/unit_tests_ci.yml
+++ b/.github/workflows/unit_tests_ci.yml
@@ -25,26 +25,18 @@ jobs:
         os: ['ubuntu-latest', 'windows-2022']
         opset_version: [18, 15]
         ort_version: ['1.16.3']
+        onnx_version: ['1.16.1']
+        skip_tflite: ['False']
         include:
           - name: 'py38-tf2.9'
             tf_version: '2.9.0'
             python_version: '3.8'
-            onnx_version: '1.16.1'
-            skip_tflite: 'False'
           - name: 'py39-tf2.15'
             tf_version: '2.15.0'
             python_version: '3.9'
-            # opset_version: '18'
-            # ort_version: '1.16.3'
-            onnx_version: '1.16.1'
-            skip_tflite: 'False'
           - name: 'py310-tf2.15'
             tf_version: '2.15.0'
             python_version: '3.10'
-            # opset_version: '18'
-            # ort_version: '1.16.3'
-            onnx_version: '1.16.1'
-            skip_tflite: 'False'
           - name: 'py37-tf1.15'
             tf_version: '1.15.5'
             python_version: '3.7'

From e74e670f28463ae5d486d5031da4832212310db6 Mon Sep 17 00:00:00 2001
From: Jay Zhang <jiz@microsoft.com>
Date: Mon, 24 Jun 2024 02:50:31 +0000
Subject: [PATCH 27/32] Complete all settings.

Signed-off-by: Jay Zhang <jiz@microsoft.com>
---
 .../workflows/keras_application_test_ci.yml   | 26 ++++++++++++---
 .github/workflows/keras_unit_test_ci.yml      | 26 ++++++++++++---
 .../workflows/pretrained_model_tests_ci.yml   | 32 ++++++++++++-------
 .github/workflows/unit_tests_ci.yml           |  8 +++--
 4 files changed, 69 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/keras_application_test_ci.yml b/.github/workflows/keras_application_test_ci.yml
index 583c94162..e4d553dd3 100644
--- a/.github/workflows/keras_application_test_ci.yml
+++ b/.github/workflows/keras_application_test_ci.yml
@@ -1,4 +1,4 @@
-name: Keras2onnx Application Tests (CI)
+name: Keras2onnx App Test (CI)
 
 on:
   pull_request:
@@ -18,12 +18,28 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        tf_version: ['2.9.0', '2.13.0']
-        python_version: ['3.8', '3.9']
+        name:
+          - 'py38-tf2.9'
+          - 'py39-tf2.10'
+          - 'py39-tf2.15'
+          - 'py310-tf2.14'
+        os: ['ubuntu-latest', 'windows-2022']
         opset_version: ['18', '15']
         ort_version: ['1.16.3']
-        onnx_version: ['1.15.0']
-        os: ['ubuntu-latest', 'windows-2022']
+        onnx_version: ['1.16.1']
+        include:
+          - name: 'py38-tf2.9'
+            tf_version: '2.9.0'
+            python_version: '3.8'
+          - name: 'py39-tf2.10'
+            tf_version: '2.10.0'
+            python_version: '3.9'
+          - name: 'py39-tf2.15'
+            tf_version: '2.15.0'
+            python_version: '3.9'
+          - name: 'py310-tf2.14'
+            tf_version: '2.14.0'
+            python_version: '3.10'
 
     runs-on: ${{ matrix.os }}
 
diff --git a/.github/workflows/keras_unit_test_ci.yml b/.github/workflows/keras_unit_test_ci.yml
index cae5512fc..0defef5f2 100644
--- a/.github/workflows/keras_unit_test_ci.yml
+++ b/.github/workflows/keras_unit_test_ci.yml
@@ -1,4 +1,4 @@
-name: Keras2onnx Unit Tests (CI)
+name: Keras2onnx Unit Test (CI)
 
 on:
   pull_request:
@@ -18,12 +18,28 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        tf_version: ['2.9.0', '2.13.0']
-        python_version: ['3.8', '3.9']
+        name:
+          - 'py38-tf2.9'
+          - 'py39-tf2.10'
+          - 'py39-tf2.15'
+          - 'py310-tf2.14'
+        os: ['ubuntu-latest', 'windows-2022']
         opset_version: ['18', '15']
         ort_version: ['1.16.3']
-        onnx_version: ['1.15.0']
-        os: ['ubuntu-latest', 'windows-2022']
+        onnx_version: ['1.16.1']
+        include:
+          - name: 'py38-tf2.9'
+            tf_version: '2.9.0'
+            python_version: '3.8'
+          - name: 'py39-tf2.10'
+            tf_version: '2.10.0'
+            python_version: '3.9'
+          - name: 'py39-tf2.15'
+            tf_version: '2.15.0'
+            python_version: '3.9'
+          - name: 'py310-tf2.14'
+            tf_version: '2.14.0'
+            python_version: '3.10'
 
     runs-on: ${{ matrix.os }}
 
diff --git a/.github/workflows/pretrained_model_tests_ci.yml b/.github/workflows/pretrained_model_tests_ci.yml
index 73f5684af..cc3826c69 100644
--- a/.github/workflows/pretrained_model_tests_ci.yml
+++ b/.github/workflows/pretrained_model_tests_ci.yml
@@ -18,24 +18,34 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
+        name:
+          - 'py38-tf2.9'
+          - 'py39-tf2.9'
+          - 'py39-tf2.15'
+          - 'py310-tf2.15'
         opset_version: ['18', '15']
         ort_version: ['1.16.3']
         onnx_version: ['1.16.1']
         include:
-          - tf_version: '2.9.0'
+          - name: 'py38-tf2.9'
+            tf_version: '2.9.0'
             python_version: '3.8'
-          - tf_version: '2.9.0'
+          - name: 'py39-tf2.9'
+            tf_version: '2.9.0'
             python_version: '3.9'
-          - tf_version: '2.15.0'
+          - name: 'py39-tf2.15'
+            tf_version: '2.15.0'
             python_version: '3.9'
-          # - tf_version: '2.15.0'
-          #   python_version: '3.10'
-          # - tf_version: '1.15.5'
-          #   python_version: '3.7'
-          #   os: 'ubuntu-latest'
-          #   opset_version: '15'
-          #   ort_version: '1.14.1'
-          #   onnx_version: '1.14.1'
+          - name: 'py310-tf2.15'
+            tf_version: '2.15.0'
+            python_version: '3.10'
+          - name: 'py37-tf1.15'
+            tf_version: '1.15.5'
+            python_version: '3.7'
+            os: 'ubuntu-latest'
+            opset_version: '15'
+            ort_version: '1.14.1'
+            onnx_version: '1.14.1'
 
     runs-on: ubuntu-latest
 
diff --git a/.github/workflows/unit_tests_ci.yml b/.github/workflows/unit_tests_ci.yml
index 6fc5b3ea2..6239f8aed 100644
--- a/.github/workflows/unit_tests_ci.yml
+++ b/.github/workflows/unit_tests_ci.yml
@@ -1,4 +1,4 @@
-name: Unit Tests (CI)
+name: Unit Test (CI)
 
 on:
   pull_request:
@@ -20,10 +20,11 @@ jobs:
       matrix:
         name:
           - 'py38-tf2.9'
+          - 'py39-tf2.10'
           - 'py39-tf2.15'
           - 'py310-tf2.15'
         os: ['ubuntu-latest', 'windows-2022']
-        opset_version: [18, 15]
+        opset_version: ['18', '15']
         ort_version: ['1.16.3']
         onnx_version: ['1.16.1']
         skip_tflite: ['False']
@@ -31,6 +32,9 @@ jobs:
           - name: 'py38-tf2.9'
             tf_version: '2.9.0'
             python_version: '3.8'
+          - name: 'py39-tf2.10'
+            tf_version: '2.10.0'
+            python_version: '3.9'
           - name: 'py39-tf2.15'
             tf_version: '2.15.0'
             python_version: '3.9'

From 9d51946c89b06184513ec2781b6d00f0c8f64c87 Mon Sep 17 00:00:00 2001
From: Jay Zhang <jiz@microsoft.com>
Date: Mon, 24 Jun 2024 03:24:27 +0000
Subject: [PATCH 28/32] Limit numpy version for CI.

Signed-off-by: Jay Zhang <jiz@microsoft.com>
---
 .github/workflows/keras_application_test_ci.yml | 1 +
 .github/workflows/keras_unit_test_ci.yml        | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.github/workflows/keras_application_test_ci.yml b/.github/workflows/keras_application_test_ci.yml
index e4d553dd3..88d6465cb 100644
--- a/.github/workflows/keras_application_test_ci.yml
+++ b/.github/workflows/keras_application_test_ci.yml
@@ -84,6 +84,7 @@ jobs:
           pip install transformers==4.2.0
           pip install keras-self-attention
           pip install pytest pytest-cov pytest-runner
+          pip install numpy==1.21.6
 
           pip install -e .
 
diff --git a/.github/workflows/keras_unit_test_ci.yml b/.github/workflows/keras_unit_test_ci.yml
index 0defef5f2..052db17c9 100644
--- a/.github/workflows/keras_unit_test_ci.yml
+++ b/.github/workflows/keras_unit_test_ci.yml
@@ -67,6 +67,7 @@ jobs:
           pip install onnxruntime==${{ matrix.ort_version }}
           pip uninstall -y protobuf
           pip install "protobuf~=3.20"
+          pip install numpy==1.21.6
           pip install -e .
 
           echo "----- List all of depdencies:"

From 68f4861ece822689e9de6de85330af5419f98fad Mon Sep 17 00:00:00 2001
From: Jay Zhang <jiz@microsoft.com>
Date: Mon, 24 Jun 2024 03:26:24 +0000
Subject: [PATCH 29/32] Limit numpy version for unit test.

Signed-off-by: Jay Zhang <jiz@microsoft.com>
---
 tests/utils/setup_test_env.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/utils/setup_test_env.sh b/tests/utils/setup_test_env.sh
index c6fc03399..e9d1d1808 100755
--- a/tests/utils/setup_test_env.sh
+++ b/tests/utils/setup_test_env.sh
@@ -18,7 +18,7 @@ echo "==== ONNX version: $ONNX_VERSION"
 pip install pytest pytest-cov pytest-runner coverage graphviz requests pyyaml pillow pandas parameterized sympy coloredlogs flatbuffers timeout-decorator
 pip install onnx==$ONNX_VERSION
 pip install onnxruntime==$ORT_VERSION
-pip install numpy
+pip install numpy==1.21.6
 
 pip install onnxruntime-extensions
 pip install "tensorflow-text<=$TF_VERSION"

From b0cd2d599dc12eed262f6e0215644b852ba24649 Mon Sep 17 00:00:00 2001
From: Jay Zhang <jiz@microsoft.com>
Date: Mon, 24 Jun 2024 07:21:53 +0000
Subject: [PATCH 30/32] Update the numpy version for CI.

Signed-off-by: Jay Zhang <jiz@microsoft.com>
---
 .github/workflows/keras_application_test_ci.yml | 2 +-
 .github/workflows/keras_unit_test_ci.yml        | 3 ++-
 tests/utils/setup_test_env.sh                   | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/keras_application_test_ci.yml b/.github/workflows/keras_application_test_ci.yml
index 88d6465cb..1116d5827 100644
--- a/.github/workflows/keras_application_test_ci.yml
+++ b/.github/workflows/keras_application_test_ci.yml
@@ -84,7 +84,7 @@ jobs:
           pip install transformers==4.2.0
           pip install keras-self-attention
           pip install pytest pytest-cov pytest-runner
-          pip install numpy==1.21.6
+          pip install "numpy<2"
 
           pip install -e .
 
diff --git a/.github/workflows/keras_unit_test_ci.yml b/.github/workflows/keras_unit_test_ci.yml
index 052db17c9..f4c47eb16 100644
--- a/.github/workflows/keras_unit_test_ci.yml
+++ b/.github/workflows/keras_unit_test_ci.yml
@@ -67,7 +67,8 @@ jobs:
           pip install onnxruntime==${{ matrix.ort_version }}
           pip uninstall -y protobuf
           pip install "protobuf~=3.20"
-          pip install numpy==1.21.6
+          pip install "numpy<2"
+
           pip install -e .
 
           echo "----- List all of depdencies:"
diff --git a/tests/utils/setup_test_env.sh b/tests/utils/setup_test_env.sh
index e9d1d1808..a14828d05 100755
--- a/tests/utils/setup_test_env.sh
+++ b/tests/utils/setup_test_env.sh
@@ -18,7 +18,7 @@ echo "==== ONNX version: $ONNX_VERSION"
 pip install pytest pytest-cov pytest-runner coverage graphviz requests pyyaml pillow pandas parameterized sympy coloredlogs flatbuffers timeout-decorator
 pip install onnx==$ONNX_VERSION
 pip install onnxruntime==$ORT_VERSION
-pip install numpy==1.21.6
+pip install "numpy<2"
 
 pip install onnxruntime-extensions
 pip install "tensorflow-text<=$TF_VERSION"

From 399c8a04305a43410a59cfb15ed445246dc919d0 Mon Sep 17 00:00:00 2001
From: Jay Zhang <jiz@microsoft.com>
Date: Mon, 24 Jun 2024 08:09:09 +0000
Subject: [PATCH 31/32] Change the combination.

Signed-off-by: Jay Zhang <jiz@microsoft.com>
---
 .github/workflows/keras_application_test_ci.yml | 12 ++++++------
 .github/workflows/keras_unit_test_ci.yml        | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/keras_application_test_ci.yml b/.github/workflows/keras_application_test_ci.yml
index 1116d5827..d5bce4179 100644
--- a/.github/workflows/keras_application_test_ci.yml
+++ b/.github/workflows/keras_application_test_ci.yml
@@ -21,8 +21,8 @@ jobs:
         name:
           - 'py38-tf2.9'
           - 'py39-tf2.10'
-          - 'py39-tf2.15'
-          - 'py310-tf2.14'
+          - 'py39-tf2.14'
+          - 'py310-tf2.15'
         os: ['ubuntu-latest', 'windows-2022']
         opset_version: ['18', '15']
         ort_version: ['1.16.3']
@@ -34,11 +34,11 @@ jobs:
           - name: 'py39-tf2.10'
             tf_version: '2.10.0'
             python_version: '3.9'
-          - name: 'py39-tf2.15'
-            tf_version: '2.15.0'
-            python_version: '3.9'
-          - name: 'py310-tf2.14'
+          - name: 'py39-tf2.14'
             tf_version: '2.14.0'
+            python_version: '3.9'
+          - name: 'py310-tf2.15'
+            tf_version: '2.15.0'
             python_version: '3.10'
 
     runs-on: ${{ matrix.os }}
diff --git a/.github/workflows/keras_unit_test_ci.yml b/.github/workflows/keras_unit_test_ci.yml
index f4c47eb16..d3adb640c 100644
--- a/.github/workflows/keras_unit_test_ci.yml
+++ b/.github/workflows/keras_unit_test_ci.yml
@@ -21,8 +21,8 @@ jobs:
         name:
           - 'py38-tf2.9'
           - 'py39-tf2.10'
-          - 'py39-tf2.15'
-          - 'py310-tf2.14'
+          - 'py39-tf2.14'
+          - 'py310-tf2.15'
         os: ['ubuntu-latest', 'windows-2022']
         opset_version: ['18', '15']
         ort_version: ['1.16.3']
@@ -34,11 +34,11 @@ jobs:
           - name: 'py39-tf2.10'
             tf_version: '2.10.0'
             python_version: '3.9'
-          - name: 'py39-tf2.15'
-            tf_version: '2.15.0'
-            python_version: '3.9'
-          - name: 'py310-tf2.14'
+          - name: 'py39-tf2.14'
             tf_version: '2.14.0'
+            python_version: '3.9'
+          - name: 'py310-tf2.15'
+            tf_version: '2.15.0'
             python_version: '3.10'
 
     runs-on: ${{ matrix.os }}

From 1eddac538e2292cd1c8a03c04ad29ee9d42f5b01 Mon Sep 17 00:00:00 2001
From: Jay Zhang <jiz@microsoft.com>
Date: Mon, 24 Jun 2024 08:21:42 +0000
Subject: [PATCH 32/32] Remove one check setting.

Signed-off-by: Jay Zhang <jiz@microsoft.com>
---
 .github/workflows/keras_application_test_ci.yml | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/keras_application_test_ci.yml b/.github/workflows/keras_application_test_ci.yml
index d5bce4179..1e4554f88 100644
--- a/.github/workflows/keras_application_test_ci.yml
+++ b/.github/workflows/keras_application_test_ci.yml
@@ -21,8 +21,7 @@ jobs:
         name:
           - 'py38-tf2.9'
           - 'py39-tf2.10'
-          - 'py39-tf2.14'
-          - 'py310-tf2.15'
+          - 'py39-tf2.15'
         os: ['ubuntu-latest', 'windows-2022']
         opset_version: ['18', '15']
         ort_version: ['1.16.3']
@@ -34,12 +33,9 @@ jobs:
           - name: 'py39-tf2.10'
             tf_version: '2.10.0'
             python_version: '3.9'
-          - name: 'py39-tf2.14'
-            tf_version: '2.14.0'
-            python_version: '3.9'
-          - name: 'py310-tf2.15'
+          - name: 'py39-tf2.15'
             tf_version: '2.15.0'
-            python_version: '3.10'
+            python_version: '3.9'
 
     runs-on: ${{ matrix.os }}