fix eye rewriter

Author: RandySheriffH

tests/test_backend.py

@@ -202,7 +202,6 @@ def test_expand_dims_more_unknown_rank(self):
             self._test_expand_dims_more_unknown_rank(i)
 
     @check_opset_min_version(9, "ConstantOfShape")
-    @check_opset_after_tf_version("2.2", 12, "MatrixDiag")
     def test_eye_non_const1(self):
         # tf.eye(num_rows), num_rows is not const here
         x_val = np.array(5, dtype=np.int32)
@@ -224,7 +223,6 @@ def func(x):
 
     @check_tf_min_version("1.11", "eye has bug when version is below 1.11")
     @check_opset_min_version(9, "ConstantOfShape")
-    @check_opset_after_tf_version("2.2", 12, "MatrixDiag")
     def test_eye_non_const2(self):
         # tf.eye(num_rows), num_rows is not const here
         for np_dtype in [np.int32, np.int64, np.float32, np.float64]:

tf2onnx/rewriter/eye_rewriter.py

@@ -79,8 +79,38 @@ def rewrite_eye(g, ops):
                 OpTypePattern("Const", name="fill_value"),
             ]),
         ])
+    pattern5 = \
+        OpTypePattern("MatrixDiagV3", name="output_eye_matrix", inputs=[
+            OpTypePattern("Fill", inputs=[
+                OpTypePattern("ConcatV2", inputs=[
+                    "*",
+                    OpTypePattern("ExpandDims", inputs=[
+                        OpTypePattern("Minimum|Cast", name="min_or_cast"),
+                        "*"
+                    ]),
+                    "*",
+                ]),
+                OpTypePattern("Const", name="fill_value"),
+            ]),
+            "*", "*", "*", "*",
+        ])
+    pattern6 = \
+        OpTypePattern("MatrixSetDiagV3", name="output_eye_matrix", inputs=[
+            OpTypePattern("Fill"),
+            OpTypePattern("Fill", inputs=[
+                OpTypePattern("ConcatV2", inputs=[
+                    "*",
+                    OpTypePattern("ExpandDims", inputs=[
+                        OpTypePattern("Minimum|Cast", name="min_or_cast"),
+                        "*"
+                    ]),
+                    "*",
+                ]),
+                OpTypePattern("Const", name="fill_value"),
+            ]), "*"
+        ])
 
-    for pattern in [pattern1, pattern2, pattern3, pattern4]:
+    for pattern in [pattern1, pattern2, pattern3, pattern4, pattern5, pattern6]:
         matcher = GraphMatcher(pattern, allow_reorder=True)
         match_results = list(matcher.match_ops(ops))
         for match_result in match_results: