merge conflicts

Signed-off-by: xadupre <xadupre@microsoft.com>

Author: xadupre

.github/workflows/keras_application_test_ci.yml

@@ -24,19 +24,19 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
 
-      - name: Run Tests (Py38-TF2.9)
+      - name: Run Tests (Py39-TF2.9)
         uses: ./.github/actions/keras_application_test
         with:
           tf_version: '2.9.0'
-          python_version: '3.8'
+          python_version: '3.9'
           ort_version: '1.16.3'
           onnx_version: '1.16.1'
 
       - name: Upload Test Results
         if: always()
         uses: actions/upload-artifact@v4
         with:
-          name: Test Results (Py38-TF2.9-ubuntu)
+          name: Test Results (Py39-TF2.9-ubuntu)
           path: ./**/test-results-*.xml
 
   Test1_py310_tf2_19: # Do not change this name because it is used in Ruleset of this repo.

.github/workflows/keras_unit_test_ci.yml

@@ -23,19 +23,19 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
 
-      - name: Run Tests (Py38-TF2.9)
+      - name: Run Tests (Py39-TF2.9)
         uses: ./.github/actions/keras_unit_test
         with:
           tf_version: '2.9.0'
-          python_version: '3.8'
+          python_version: '3.9'
           ort_version: '1.16.3'
           onnx_version: '1.16.1'
 
       - name: Upload Test Results
         if: always()
         uses: actions/upload-artifact@v4
         with:
-          name: Test Results (Py38-TF2.9-ubuntu)
+          name: Test Results (Py39-TF2.9-ubuntu)
           path: ./**/test-results-*.xml
 
   Test2_py310_tf2_19: # Do not change this name because it is used in Ruleset of this repo.

.github/workflows/pretrained_model_test_ci.yml

@@ -24,12 +24,12 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
 
-      - name: Run Tests (Py38-TF2.9-18)
+      - name: Run Tests (Py39-TF2.9-18)
         uses: ./.github/actions/pretrained_model_test
         with:
           os: 'ubuntu-latest'
           tf_version: '2.9.0'
-          python_version: '3.8'
+          python_version: '3.9'
           ort_version: '1.16.3'
           onnx_version: '1.16.1'
           opset_version: '18'
@@ -39,7 +39,7 @@ jobs:
         if: always()
         uses: actions/upload-artifact@v4
         with:
-          name: Test Results (Py38-TF2.9-18-ubuntu)
+          name: Test Results (Py39-TF2.9-18-ubuntu)
           path: ./**/test-results-*.xml
 
   Test3_py310_tf2_19: # Do not change this name because it is used in 'publish-test-results' section below.

.github/workflows/unit_test_ci.yml

@@ -24,12 +24,12 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
 
-      - name: Run Tests (Py38-TF2.9-18)
+      - name: Run Tests (Py39-TF2.9-18)
         uses: ./.github/actions/unit_test
         with:
           os: 'ubuntu-latest'
           tf_version: '2.9.0'
-          python_version: '3.8'
+          python_version: '3.9'
           ort_version: '1.16.3'
           onnx_version: '1.16.1'
           opset_version: '18'
@@ -39,7 +39,7 @@ jobs:
         if: always()
         uses: actions/upload-artifact@v4
         with:
-          name: Test Results (Py38-TF2.9-18-ubuntu)
+          name: Test Results (Py39-TF2.9-18-ubuntu)
           path: ./**/test-results-*.xml
 
   Test4_py310_tf2_19: # Do not change this name because it is used in Ruleset of this repo.
@@ -101,29 +101,13 @@ jobs:
       fail-fast: false
       matrix:
         name:
-          - 'py38-tf2.13'
           - 'py39-tf2.15'
           - 'py310-tf2.19'
           - 'py311-tf2.19'
         os: ['ubuntu-latest', 'windows-2022']
         opset_version: ['18', '15']
         skip_tflite: ['False']
         include:
-          - name: 'py311-tf2.19'
-            tf_version: '2.19.0'
-            python_version: '3.11'
-            ort_version: '1.20.1'
-            onnx_version: '1.17.0'
-          - name: 'py310-tf2.19'
-            tf_version: '2.19.0'
-            python_version: '3.10'
-            ort_version: '1.20.1'
-            onnx_version: '1.17.0'
-          - name: 'py38-tf2.13'
-            tf_version: '2.13.0'
-            python_version: '3.8'
-            ort_version: '1.16.3'
-            onnx_version: '1.16.1'
           - name: 'py39-tf2.15'
             tf_version: '2.15.0'
             python_version: '3.9'

README.md

@@ -1,4 +1,8 @@
-<!--- SPDX-License-Identifier: Apache-2.0 -->
+<!--
+Copyright (c) ONNX Project Contributors
+
+SPDX-License-Identifier: Apache-2.0
+-->
 
 # tf2onnx - Convert TensorFlow, Keras, Tensorflow.js and Tflite models to ONNX.
 
@@ -17,8 +21,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.11 | 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.11 | 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) | |
+| Unit Test - Basic | Linux, Windows | 3.7-3.12 | 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.12 | 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
@@ -42,7 +46,11 @@ You can install tf2onnx on top of tf-1.x or tf-2.x.
 
 ### Python
 
+<<<<<<< HEAD
 We support Python ```3.7-3.11```.
+=======
+We support Python ```3.7-3.12```.
+>>>>>>> c34ac1d751427cf5d98023a21cce4c82b0cf96a1
 
 ## Prerequisites
 

setup.py

@@ -95,10 +95,8 @@ def run(self):
         'Topic :: Software Development :: Libraries',
         'Topic :: Software Development :: Libraries :: Python Modules',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.7',
-        'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3.9',
-        'Programming Language :: Python :: 3.10', 
-        'Programming Language :: Python :: 3.11', 
-    ]
+        'Programming Language :: Python :: 3.10',
+        'Programming Language :: Python :: 3.11',
+        'Programming Language :: Python :: 3.12']
 )

tf2onnx/tfonnx.py

@@ -74,7 +74,7 @@ def rewrite_constant_fold(g, ops):
     func_map = {
         "Add": np.add,
         "GreaterEqual": np.greater_equal,
-        "Cast": lambda x, dtype: x.astype(dtype),
+        "Cast": np.asarray,
         "ConcatV2": np.concatenate,
         "Less": np.less,
         "ListDiff": np.setdiff1d,
@@ -107,7 +107,7 @@ def rewrite_constant_fold(g, ops):
                     if op.type == "Cast":
                         dst = op.get_attr_int("to")
                         np_type = tf2onnx.utils.map_onnx_to_numpy_type(dst)
-                        val = np.cast[np_type](*inputs)
+                        val = np.asarray(*inputs, dtype=np_type)
                     elif op.type == "ConcatV2":
                         axis = inputs[-1]
                         values = inputs[:-1]