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

Code merge | Merge CINN into Paddle #54749

Merged
merged 14 commits into from
Jun 27, 2023
Merged

Code merge | Merge CINN into Paddle #54749

merged 14 commits into from
Jun 27, 2023

Conversation

6clc
Copy link
Contributor

@6clc 6clc commented Jun 19, 2023 •
edited
Loading

PR types

Breaking changes

PR changes

Others

Description

Pcard-72384

规划见 #54405

编译命令

  1. CINN的相关编译选项变化
WITH_CUDA      -> WITH_GPU
WITH_CUDNN     -> CINN_WITH_CUDNN
WITH_MKL_CBLAS -> WITH_MKL
WITH_MKLDNN    -> cmake自动判定是否支持
  1. 只编译CINN
# CPU版
> cmake .. -DCINN_ONLY=ON -DWITH_CINN=ON -DWITH_GPU=OFF -DWITH_TESTING=ON -DWITH_MKL=ON -DPY_VERSION=3.8
# GPU版
> cmake .. -DCINN_ONLY=ON -DWITH_CINN=ON -DWITH_GPU=ON  -DWITH_TESTING=ON -DWITH_MKL=ON -DPY_VERSION=3.8
# GPU版不用CUDNN
> cmake .. -DCINN_ONLY=ON -DWITH_CINN=ON -DWITH_GPU=ON  -DCINN_WITH_CUDNN=OFF -DWITH_TESTING=ON -DWITH_MKL=ON -DPY_VERSION=3.8
  1. 编译PaddleWitCinn

和只编译CINN类似，将CINN_ONLY设置为OFF

> cmake .. -DCINN_ONLY=OFF -DWITH_CINN=ON ...

CINN迁入后目录变化

CINN/cinn -> Paddle/paddle/cinn
CINN/python/cinn -> Paddle/python/cinn
CINN/tests -> Paddle/test/cpp/cinn
CINN/python/tests -> Paddle/test/cinn
CINN/infrt # 不移动，主框架已删除，属于废弃代码
CINN/cmake -> Paddle/cmake/cinn
CINN/tools -> Paddle/tools/cinn
CINN/docs,tutorials -> docs/cinn # 应该统一移到docs repo

@paddle-bot
Copy link

paddle-bot bot commented Jun 19, 2023

你的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.

@6clc 6clc changed the title Lc merge cinn Code merge | Merge CINN into Paddl Jun 26, 2023
zhhsplendid
zhhsplendid approved these changes Jun 26, 2023
View reviewed changes
Copy link
Member

@zhhsplendid zhhsplendid left a comment

Choose a reason for hiding this comment

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

LGTM

@6clc 6clc changed the title Code merge | Merge CINN into Paddl Code merge | Merge CINN into Paddle Jun 26, 2023
chenwhql
chenwhql approved these changes Jun 26, 2023
View reviewed changes
Copy link
Contributor

@chenwhql chenwhql left a comment

Choose a reason for hiding this comment

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

先合入一个初版，后续再逐步完善

Aurelius84
Aurelius84 approved these changes Jun 26, 2023
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

@Aurelius84 Aurelius84 merged commit 67c69dc into PaddlePaddle:develop Jun 27, 2023
This was referenced Jun 28, 2023
Closed
Closed
@Ligoml Ligoml mentioned this pull request Jul 24, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@zhhsplendid zhhsplendid zhhsplendid approved these changes

@Aurelius84 Aurelius84 Aurelius84 approved these changes

@chenwhql chenwhql chenwhql approved these changes

@tianshuo78520a tianshuo78520a tianshuo78520a approved these changes

@raindrops2sea raindrops2sea raindrops2sea approved these changes

@zhangbo9674 zhangbo9674 zhangbo9674 approved these changes

@XiaoguangHu01 XiaoguangHu01 Awaiting requested review from XiaoguangHu01 XiaoguangHu01 is a code owner

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@6clc @zhhsplendid @Aurelius84 @chenwhql @tianshuo78520a @raindrops2sea @zhangbo9674