Skip to content

Fix passes of fuse matmul/transpose test cases #186

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 1, 2025
Merged

Fix passes of fuse matmul/transpose test cases #186

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
12b1633
Fix passes of fuse matmul/transpose test cases
take-cheeze Jun 5, 2025
c011ca4
Merge branch 'main' into fix_test_pass
justinchuby Jun 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 5 additions & 10 deletions onnxoptimizer/test/optimizer_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1150,7 +1150,6 @@ def test_fuse_transpose(self): # type: () -> None
# Transpose
assert len(optimized_model.graph.node[3].attribute[0].g.node) == 1

@pytest.mark.xfail
def test_fuse_transpose_default_graph_output(self): # type: () -> None
add = helper.make_node("Add", ["X", "Y"], ["A"])
trans1 = helper.make_node("Transpose", ["A"], ["B"])
Expand All @@ -1165,15 +1164,14 @@ def test_fuse_transpose_default_graph_output(self): # type: () -> None
[helper.make_tensor_value_info("C", TensorProto.FLOAT, (2, 3))],
)
# The existence of shape infos of graoh outputs is checked in _optimized
optimized_model = self._optimized(graph, ["fuse_consecutive_transposes"])
optimized_model = self._optimized(graph, ["fuse_consecutive_transposes", "eliminate_deadend"])

def check_transpose(node): # type: (NodeProto) -> None
assert node.op_type != "Transpose"

self._visit_all_nodes_recursive(optimized_model.graph, check_transpose)
assert len(optimized_model.graph.node) == 1

@pytest.mark.xfail
def test_fuse_transpose_default(self): # type: () -> None
identity1 = helper.make_node("Identity", ["A"], ["X"])
trans1 = helper.make_node("Transpose", ["X"], ["Y"])
Expand All @@ -1185,7 +1183,7 @@ def test_fuse_transpose_default(self): # type: () -> None
[helper.make_tensor_value_info("A", TensorProto.FLOAT, (2, 3, 4))],
[helper.make_tensor_value_info("B", TensorProto.FLOAT, (2, 3, 4))],
)
optimized_model = self._optimized(graph, ["fuse_consecutive_transposes"])
optimized_model = self._optimized(graph, ["fuse_consecutive_transposes", "eliminate_deadend"])

assert len(list(optimized_model.graph.node)) == 2
assert optimized_model.graph.node[0].op_type == "Identity"
Expand Down Expand Up @@ -1468,7 +1466,6 @@ def test_fuse_add_bias_into_conv_squeeze_4d_bias_no_fuse(self):
assert optimized_model.graph.node[0].op_type == "Conv"
assert optimized_model.graph.node[1].op_type == "Add"

@pytest.mark.xfail
def test_fuse_matmul_add_bias_into_gemm(self): # type: () -> None
matmul = helper.make_node("MatMul", ["X", "Y"], ["Z"])
add = helper.make_node("Add", ["Z", "B"], ["A"])
Expand All @@ -1482,12 +1479,11 @@ def test_fuse_matmul_add_bias_into_gemm(self): # type: () -> None
],
[helper.make_tensor_value_info("A", TensorProto.FLOAT, (32, 16))],
)
optimized_model = self._optimized(graph, ["fuse_matmul_add_bias_into_gemm"])
optimized_model = self._optimized(graph, ["fuse_matmul_add_bias_into_gemm", "eliminate_deadend"])

assert len(list(optimized_model.graph.node)) == 1
assert optimized_model.graph.node[0].op_type == "Gemm"

@pytest.mark.xfail
def test_fuse_matmul_add_bias_into_gemm_2d_bias(self): # type: () -> None
matmul = helper.make_node("MatMul", ["X", "Y"], ["Z"])
add = helper.make_node("Add", ["Z", "B"], ["A"])
Expand All @@ -1501,13 +1497,12 @@ def test_fuse_matmul_add_bias_into_gemm_2d_bias(self): # type: () -> None
],
[helper.make_tensor_value_info("A", TensorProto.FLOAT, (32, 16))],
)
optimized_model = self._optimized(graph, ["fuse_matmul_add_bias_into_gemm"])
optimized_model = self._optimized(graph, ["fuse_matmul_add_bias_into_gemm", "eliminate_deadend"])

assert len(list(optimized_model.graph.node)) == 1
assert optimized_model.graph.node[0].op_type == "Gemm"

# type: () -> None
@pytest.mark.xfail
def test_fuse_matmul_add_bias_into_gemm_2d_bias_same_shape(self):
matmul = helper.make_node("MatMul", ["X", "Y"], ["Z"])
add = helper.make_node("Add", ["Z", "B"], ["A"])
Expand All @@ -1521,7 +1516,7 @@ def test_fuse_matmul_add_bias_into_gemm_2d_bias_same_shape(self):
],
[helper.make_tensor_value_info("A", TensorProto.FLOAT, (32, 16))],
)
optimized_model = self._optimized(graph, ["fuse_matmul_add_bias_into_gemm"])
optimized_model = self._optimized(graph, ["fuse_matmul_add_bias_into_gemm", "eliminate_deadend"])

assert len(list(optimized_model.graph.node)) == 1
assert optimized_model.graph.node[0].op_type == "Gemm"
Expand Down
Loading