[XPU] fix conflict of float16.h #66238
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
你的PR提交成功，感谢你对开源项目的贡献! |
…j04/Paddle into 20240719-fix-float16-include
risemeup1
approved these changes
Jul 19, 2024
co63oc
pushed a commit
to co63oc/Paddle
that referenced
this pull request
Jul 22, 2024
* [XPU] fix conflict of float16.h * [XPU] fix conflict of float16.h
lixcli
pushed a commit
to lixcli/Paddle
that referenced
this pull request
Jul 22, 2024
* [XPU] fix conflict of float16.h * [XPU] fix conflict of float16.h
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
PR Category
Custom Device
PR Types
Bug fixes
Description
这个PR #66126 里面的新增代码使用了
paddle/fluid/platform/float16.h，而这个PR #66121 删除了这个头文件，导致出现了冲突。本PR修复了此问题，改成引用新的头文件。