Merge branch 'main' into patch-1

.github/actions/keras_application_test/action.yml

@@ -32,7 +32,7 @@ runs:
           pip install coloredlogs flatbuffers
           pip install tensorflow==${{ inputs.tf_version }}
           pip install onnxruntime==${{ inputs.ort_version }}
-          pip install Pillow==8.2.0
+          pip install pillow
           pip install opencv-python
           pip install tqdm
           pip install keras-segmentation==0.2.0

.github/workflows/keras_application_test_ci.yml

@@ -66,7 +66,7 @@ jobs:
   Test_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-latest
+    runs-on: ubuntu-22.04
 
     steps:
       - name: Checkout code
@@ -92,15 +92,15 @@ jobs:
       fail-fast: false
       matrix:
         name:
-          - 'py39-tf2.10'
+          - 'py38-tf2.13'
           - 'py39-tf2.15'
         os: ['ubuntu-latest', 'windows-2022']
         ort_version: ['1.16.3']
         onnx_version: ['1.16.1']
         include:
-          - name: 'py39-tf2.10'
-            tf_version: '2.10.0'
-            python_version: '3.9'
+          - name: 'py38-tf2.13'
+            tf_version: '2.13.0'
+            python_version: '3.8'
           - name: 'py39-tf2.15'
             tf_version: '2.15.0'
             python_version: '3.9'

.github/workflows/keras_unit_test_ci.yml

@@ -65,7 +65,7 @@ jobs:
   Test_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-latest
+    runs-on: ubuntu-22.04
 
     steps:
       - name: Checkout code

.github/workflows/pretrained_model_test_ci.yml

@@ -15,7 +15,7 @@ concurrency:
 
 jobs:
 
-  Test_min_py_with_min_tf: # Do not change this name because it is used in Ruleset of this repo.
+  Test_min_py_with_min_tf: # Do not change this name because it is used in 'publish-test-results' section below.
     strategy:
       fail-fast: false
     runs-on: ubuntu-latest
@@ -42,7 +42,7 @@ jobs:
           name: Test Results (Py38-TF2.9-18-ubuntu)
           path: ./**/test-results-*.xml
 
-  Test_max_py_with_latest_tf: # Do not change this name because it is used in Ruleset of this repo.
+  Test_max_py_with_latest_tf: # Do not change this name because it is used in 'publish-test-results' section below.
     strategy:
       fail-fast: false
     runs-on: ubuntu-latest
@@ -69,7 +69,33 @@ jobs:
           name: Test Results (Py310-TF2.15-18-ubuntu)
           path: ./**/test-results-*.xml
 
-  Extra_tests:
+  Test_py37_with_tf1_15: # Do not change this name because it is used in 'publish-test-results' section below.
+    strategy:
+      fail-fast: false
+    runs-on: ubuntu-22.04
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Run Tests (Py310-TF2.15-18)
+        uses: ./.github/actions/pretrained_model_test
+        with:
+          tf_version: '1.15.5'
+          python_version: '3.7'
+          os: 'ubuntu-22.04'  # Max ubuntu version supports python 3.7.
+          opset_version: '15'
+          ort_version: '1.14.1'
+          onnx_version: '1.14.1'
+
+      - name: Upload Test Results
+        if: always()
+        uses: actions/upload-artifact@v3
+        with:
+          name: Test Results (Py37-TF1.15-15-ubuntu)
+          path: ./**/test-results-*.xml
+
+  Extra_tests:  # Do not change this name because it is used in 'publish-test-results' section below.
     strategy:
       fail-fast: false
       matrix:
@@ -88,15 +114,7 @@ jobs:
           - name: 'py39-tf2.15'
             tf_version: '2.15.0'
             python_version: '3.9'
-          - 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
+    runs-on: ${{ matrix.os }}
 
     steps:
       - name: Checkout code
@@ -121,7 +139,7 @@ jobs:
 
   publish-test-results:
     name: "Publish Tests Results to Github"
-    needs: [Test_min_py_with_min_tf, Test_max_py_with_latest_tf, Extra_tests]
+    needs: [Test_min_py_with_min_tf, Test_max_py_with_latest_tf, Test_py37_with_tf1_15, Extra_tests]
     runs-on: ubuntu-latest
     permissions:
       checks: write

.github/workflows/unit_test_ci.yml

@@ -91,7 +91,7 @@ jobs:
           - name: 'py37-tf1.15'
             tf_version: '1.15.5'
             python_version: '3.7'
-            os: 'ubuntu-latest'
+            os: 'ubuntu-22.04'  # Max ubuntu version supports python 3.7.
             opset_version: '15'
             ort_version: '1.14.1'
             onnx_version: '1.14.1'

tf2onnx/tflite_handlers/tfl_math.py

@@ -201,12 +201,10 @@ def to_tf(cls, ctx, node, **kwargs):
         separate_fused_activation_function(ctx, node)
         utils.make_sure(node.attr['weights_format'].s == b'DEFAULT',
                         "Only default weights format supported for fully connected op")
-        utils.make_sure(node.attr['keep_num_dims'].i == 0,
-                        "Only keep_num_dims=False supported for fully connected op")
         if node.attr['asymmetric_quantize_inputs'].i == 1:
             dynamic_quantize_inputs(ctx, node)
 
-        if ctx.get_rank(node.input[0]) != 2:
+        if node.attr['keep_num_dims'].i == 0 and ctx.get_rank(node.input[0]) != 2:
             # When a fullyconnected node has keep_num_dims=0 and input[0] rank > 2, the extra dims must be compressed
             utils.make_sure(ctx.get_rank(node.input[1]) == 2, "weights for FullyConnected must have rank 2")
             weights_shape = ctx.get_shape(node.input[1])[1]