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.

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

[PHI decoupling] move several header files from fluid to phi #48415

Merged
merged 18 commits into from
Nov 28, 2022

Conversation

huangjiyi
Copy link
Member

@huangjiyi huangjiyi commented Nov 26, 2022

PR types

Others

PR changes

Others

Describe

  • [phi] Decoupled phi from fluid tracking issue #47615
  • cuda/cudnn_desc.hcuda/cudnn_helper.hrocm/miopen_desc.hrocm/miopen_helper.hgpu_dnn.hpaddle/fluid/platform/device/gpu/ 目录移动至 paddle/phi/backends/gpu 目录.
  • 这几个头文件的的依赖关系如下图所示,所以一起处理了。
    image
  • 因为 fluid 目录下还有很多文件依赖 gpu_dnn.h,所以没有移除 fluid 下的 gpu_dnn.h,同时这些文件通过 gpu_dnn.hcuda/cudnn_helper.hrocm/miopen_helper.h 的依赖则通过在 gpu_dnn.h 中使用 using 处理了。

@paddle-bot
Copy link

paddle-bot bot commented Nov 26, 2022

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

@huangjiyi huangjiyi marked this pull request as draft November 26, 2022 16:48
@paddle-bot-old paddle-bot-old bot added the contributor External developers label Nov 26, 2022
Comment on lines +23 to 24
#include "paddle/fluid/memory/memory.h"
#include "paddle/phi/backends/gpu/gpu_context.h"
Copy link
Member Author

@huangjiyi huangjiyi Nov 27, 2022

Choose a reason for hiding this comment

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

这里引入了 fluid 下的 memory.h 是因为这个文件通过 gpu_dnn.h 依赖了 memory.h,而 phi 下的 gpu_dnn.h 已经移除了对 memory.h 的依赖,而且只有这一个文件,所以我就在这里加了 memory.h,因为这样可以在后续处理 memory.h 的时候一起处理掉,更方便一些。

@huangjiyi huangjiyi marked this pull request as ready for review November 27, 2022 04:22
@huangjiyi
Copy link
Member Author

@YuanRisheng ,帮忙 review 一下

Copy link
Contributor

@YuanRisheng YuanRisheng left a comment

Choose a reason for hiding this comment

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

LGTM 👍

@huangjiyi
Copy link
Member Author

@luotao1, @XiaoguangHu01 , @ZzSean 帮忙处理一下失败的 CI

Copy link
Contributor

@ZzSean ZzSean left a comment

Choose a reason for hiding this comment

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

LGTM for CI-OP-Benchmark

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

@huangjiyi
Copy link
Member Author

@luotao1 ,PR-CI-APPROVAL 里还有需要您帮忙处理的问题

@luotao1 luotao1 merged commit fd9c91c into PaddlePaddle:develop Nov 28, 2022
@huangjiyi huangjiyi deleted the decouple_gpu_cuda branch December 9, 2022 11:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
contributor External developers
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants