Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
21 changes: 18 additions & 3 deletions paddle/cinn/operator_fusion/policy/relative_judge_policy.cc
Original file line number Diff line number Diff line change
Expand Up @@ -218,9 +218,24 @@ bool RelativeJudgePolicy::ReduceTreeGrownCanMerge(
}
const auto& [related, _UNUSED] =
SplitFirstIfRelatedBySecond(downstream_reduce_dims, upstream_output_dims);
auto res = (related.size() == 0);
VLOG(4) << "ReduceTreeGrownCanMerge: " << res;
return res;
if (related.size() > 0) {
return false;
}

auto upstream_reduce_op = upstream_tree.GetRootPattern().GetReduceOp();
const auto& [upstream_reduce_dims, _unused_dims] = SplitReduceDims(
axes_info_.GetSignature(upstream_reduce_op), upstream_reduce_op);
if (upstream_reduce_dims.size() != downstream_reduce_dims.size()) {
return false;
}
for (size_t i = 0; i < upstream_reduce_dims.size(); ++i) {
if (upstream_reduce_dims[i].GetSymbolicDim() !=
downstream_reduce_dims[i].GetSymbolicDim()) {
return false;
}
}

return true;
}

bool RelativeJudgePolicy::ReducePlusTrivialCanMerge(
Expand Down
25 changes: 25 additions & 0 deletions test/ir/pir/cinn/test_reduce_fusion.py
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,31 @@ def init():

self.compare_result(func, None, init)

def test_reduce_fusion_without_axis_reuse(self):
# R
# / \
# T T
# \ /
# T
# |
# B
# |
# R
def func(x):
b = paddle.max(x, axis=-1)
c = b * 2
d = b / 2
e = c + d
f = paddle.expand(e, [96, 32, 32])
g = paddle.sum(f, axis=0)
return g

def init():
x = paddle.rand((32, 32, 128))
return (x,)

self.compare_result(func, None, init)


if __name__ == "__main__":
unittest.main()