simplify two tests'

Signed-off-by: xadupre <[email protected]>

Author: xadupre

.github/workflows/keras_application_test_ci.yml

@@ -15,30 +15,6 @@ concurrency:
 
 jobs:
 
-  Test1_py38_tf2_9: # Do not change this name because it is used in Ruleset of this repo.
-    strategy:
-      fail-fast: false
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Run Tests (Py39-TF2.9)
-        uses: ./.github/actions/keras_application_test
-        with:
-          tf_version: '2.9.0'
-          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 (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.
     strategy:
       fail-fast: false
@@ -63,30 +39,6 @@ jobs:
           name: Test Results (Py310-TF2.19-ubuntu)
           path: ./**/test-results-*.xml
 
-  Test1_py37_with_tf1_15: # Do not change this name because it is used in Ruleset of this repo.
-    strategy:
-      fail-fast: false
-    runs-on: ubuntu-22.04
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Run Tests (Py37-TF1.15)
-        uses: ./.github/actions/keras_application_test
-        with:
-          tf_version: '1.15.5'
-          python_version: '3.7'
-          ort_version: '1.14.1'
-          onnx_version: '1.14.1'
-
-      - name: Upload Test Results
-        if: always()
-        uses: actions/upload-artifact@v4
-        with:
-          name: Test Results (Py37-TF1.15-ubuntu)
-          path: ./**/test-results-*.xml
-
   Extra_tests1:
     strategy:
       fail-fast: false
@@ -140,7 +92,7 @@ jobs:
 
   publish-test-results:
     name: "Publish Tests Results to Github"
-    needs: [Test1_py38_tf2_9, Test1_py310_tf2_19, Test1_py37_with_tf1_15, Extra_tests1]
+    needs: [Test1_py310_tf2_19, Extra_tests1]
     runs-on: ubuntu-latest
     permissions:
       checks: write

tests/keras2onnx_unit_tests/test_subclassing.py

@@ -86,18 +86,6 @@ def get_save_spec(model, dynamic_batch=False):
     return specs
 
 
-class SimpleWrapperModel(tf.keras.Model):
-    def __init__(self, func):
-        super(SimpleWrapperModel, self).__init__()
-        self.func = func
-
-    def call(self, inputs, **kwargs):
-        return self.func(inputs)
-
-    def _get_save_spec(self, dynamic_batch=False):
-        return get_save_spec(self, dynamic_batch=dynamic_batch)
-
-
 def test_lenet(runner):
     tf.keras.backend.clear_session()
     lenet = LeNet()
@@ -127,7 +115,11 @@ def op_func(arg_inputs):
         x = x - tf.cast(tf.expand_dims(r, axis=0), tf.float32)
         return x
 
-    dm = SimpleWrapperModel(op_func)
+    class Model(tf.keras.Model):
+        def call(self, inputs, **kwargs):
+            return op_func(inputs)
+
+    dm = Model()
     inputs = [tf.random.normal((3, 2, 20)), tf.random.normal((3, 2, 20))]
     expected = dm.predict(inputs)
     oxml = convert_keras(dm)
@@ -235,7 +227,11 @@ def _tf_where(input_0):
         c = tf.logical_or(tf.cast(a, tf.bool), tf.cast(b, tf.bool))
         return c
 
-    swm = SimpleWrapperModel(_tf_where)
+    class Model(tf.keras.Model):
+        def call(self, inputs, **kwargs):
+            return _tf_where(inputs)
+
+    swm = Model()
     const_in = [np.array([2, 4, 6, 8, 10]).astype(np.int32)]
     expected = swm(const_in)
     if hasattr(swm, "_set_input"):