Skip to content
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

Jump to bottom

[CINN / Fusion] Support fusion of Pattern with multi downstream #66034

Merged
merged 130 commits into from
Aug 5, 2024
Merged

[CINN / Fusion] Support fusion of Pattern with multi downstream #66034

merged 130 commits into from
Aug 5, 2024

Conversation

huangjiyi
Copy link
Member

@huangjiyi huangjiyi commented Jul 15, 2024 •
edited
Loading

PR Category

CINN

PR Types

Improvements

Description

Pcard-76996

Done in this PR

  • AnchorFusion 多下游融合方案实现（目前只支持只有 ElementWiseOp 的子图）
  • 实现 FusionTracker 记录前端算子融合的过程，用于指导后端 IR 融合以保证前后端 Fusion 过程的一致性
  • 优化算子融合代码

Todo

  • 完善多下游融合实现，待支持包含 Transpose、BroadCast、Slice、Reduce 等 Op 的子图的多下游融合

jiahy0825 and others added 30 commits April 11, 2024 09:56
@jiahy0825
[CINN] Support horizontal fusion
0922d8d
@jiahy0825
Change data type
e219ce3
@jiahy0825
Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…
f6bae91 
… support-horizontal-fusion
@jiahy0825
Support horizontal fusion
a3bb64b
@jiahy0825
Fix compile error
2c0d754
@2742195759
Merge commit 'refs/pull/63415/head' of https://github.com/PaddlePaddl…
e586c0e 
…e/Paddle into HEAD
@2742195759
add topo sort in backend fusion
278effd
@feifei-111
update
06fb22c
reorder yield_store op adding
ee3e694
rename fusion to group
0752aa1
remove IsNotOutputNodeMatcher
770f496
@feifei-111
Merge pull request PaddlePaddle#10 from Fridge003/multi-down
fec3505 
Reorder add_store_in_fusion_op pass and group_cluster pass
@feifei-111
update
f9f7f94
@feifei-111
Merge branch 'multi_downstream' of https://github.com/feifei-111/Paddle…
37c55e2 
… into multi_downstream
@feifei-111
merge upstream
b65bdd3
@feifei-111
update
0d0097f
@feifei-111
update
d634fe5
@feifei-111
update policy manager
1ccbfb5
@feifei-111
update
e39186c
add reverse topo search algorithm for op fusion
7d2e686
@feifei-111
Merge pull request PaddlePaddle#11 from Fridge003/multi-down
18c5f51 
add reverse topo search algorithm for op fusion
@2742195759
horizontal support dynamic shape and enhance fusion ability
2a98eea
@2742195759
fix
7ffbdf8
@2742195759
fix
c30917a
@2742195759
xx
3a5ff20
move logic of reverse topo sort to pattern_graph.cc
9745be1
@feifei-111
Merge pull request PaddlePaddle#12 from Fridge003/multi-down
4eda8bc
@2742195759
fix some bugs
303a766
@2742195759
Merge
0c56af5
@feifei-111
update
3b74908
@paddle-bot Paddle-bot
Copy link

paddle-bot bot commented Jul 15, 2024

你的PR提交成功，感谢你对开源项目的贡献!
请关注后续CI自动化测试结果，详情请参考Paddle-CI手册。
Your PR has been submitted. Thanks for your contribution!
Please wait for the result of CI firstly. See Paddle CI Manual for details.

@paddle-bot paddle-bot bot added the contributor External developers label Jul 15, 2024
@huangjiyi huangjiyi force-pushed the fix-anchor-fusion branch from 8a29727 to 486d511 Compare July 16, 2024 08:32
@huangjiyi huangjiyi force-pushed the fix-anchor-fusion branch 2 times, most recently from b38e004 to 49bc25a Compare August 4, 2024 14:32
@huangjiyi huangjiyi changed the title [CINN / Fusion] Fix anchor fusion [CINN / Fusion] Support fusion of Pattern with multi downstream Aug 5, 2024
2742195759
2742195759 approved these changes Aug 5, 2024
View reviewed changes
Copy link
Contributor

@2742195759 2742195759 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

2742195759
2742195759 reviewed Aug 5, 2024
View reviewed changes
paddle/cinn/operator_fusion/graph_transformer/matcher.h
count += is_elementwise;
}
}
return (count <= 1);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

这里应该是 T -> (T, T, T, B) 的场景还是会因为后端不支持报错。所以判断应该是 count < len(downstreams)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

下个 PR 修复

2742195759
2742195759 approved these changes Aug 5, 2024
View reviewed changes
Copy link
Contributor

@2742195759 2742195759 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

SigureMo
SigureMo approved these changes Aug 5, 2024
View reviewed changes
Copy link
Member

@SigureMo SigureMo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTMeow 🐾 for print usage

test/ir/pir/cinn/test_anchor_fusion.py
x = paddle.rand((32, 32, 128))
return (x,)

print("feifeifei")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

之后 PR 删一下～

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Get

XiaoguangHu01
XiaoguangHu01 approved these changes Aug 5, 2024
View reviewed changes
Copy link
Contributor

@XiaoguangHu01 XiaoguangHu01 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Aurelius84
Aurelius84 approved these changes Aug 5, 2024
View reviewed changes
Copy link
Contributor

@Aurelius84 Aurelius84 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@2742195759 2742195759 merged commit 55629f8 into PaddlePaddle:develop Aug 5, 2024
31 checks passed
@huangjiyi huangjiyi mentioned this pull request Aug 5, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@risemeup1 risemeup1 risemeup1 approved these changes

@XiaoguangHu01 XiaoguangHu01 XiaoguangHu01 approved these changes

@SigureMo SigureMo SigureMo approved these changes

@2742195759 2742195759 2742195759 approved these changes

@Aurelius84 Aurelius84 Aurelius84 approved these changes

Assignees
No one assigned
Labels
contributor External developers
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@huangjiyi @Aurelius84 @2742195759 @SigureMo @XiaoguangHu01 @risemeup1 @jiahy0825 @feifei-111