fused_multi_transformer/fused_multi_transformer_int8 to phi #61529
Conversation
This file contains 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
zrr1999
changed the title
|
代码冲突了，辛苦fix下~ |
zrr1999
force-pushed
the
incubate_fused
branch
from
3779df7
to
23125c6
Compare
|
zrr1999
force-pushed
the
incubate_fused
branch
from
edb2f5f
to
bd88caa
Compare
0x45f
reviewed
Feb 19, 2024
| #include "paddle/phi/api/include/tensor.h" | ||
| #include "paddle/phi/backends/dynload/nccl.h" |
There was a problem hiding this comment.
这个头文件是不是应该放在下面 #if defined(PADDLE_WITH_NCCL) || defined(PADDLE_WITH_RCCL) 里面？
| @@ -41,16 +34,16 @@ limitations under the License. */ | |||
|
|
|||
| #if defined(PADDLE_WITH_NCCL) || defined(PADDLE_WITH_RCCL) | |||
| #include "paddle/fluid/distributed/collective/process_group.h" | |||
| // #include "paddle/fluid/distributed/collective/process_group_nccl.h" | |||
There was a problem hiding this comment.
这里的include还有上面的一些include头文件为什么要删除呢？是没有用的头文件嘛？
There was a problem hiding this comment.
这里如果加上额外的头文件，会有一些报错，类似下面这种
YuanRisheng
reviewed
Feb 19, 2024
Comment on lines
-1
to
-5
| backend/generated/*.cc | ||
| backend/generated/*.h | ||
| primitive/generated_primitive.h | ||
| rule/vjp/generated/generated_vjp.h | ||
| rule/vjp/generated/generated_vjp.cc |
There was a problem hiding this comment.
这部分之前有几个 pr 迁移到了 build 下，不删掉在比较老的版本更新过来可能会报错查不出问题
Comment on lines
19
to
20
| #include "paddle/fluid/operators/fused/quant_dequant_kernel.h" | ||
| #include "paddle/fluid/platform/device/gpu/gpu_info.h" |
There was a problem hiding this comment.
phi下不能引入fluid头文件，需要找phi下的等价替换头文件或者是移到phi目录下
| @@ -0,0 +1,664 @@ | |||
| /* Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved. | |||
| @@ -0,0 +1,1381 @@ | |||
| /* Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved. | |||
Comment on lines
36
to
38
| #include "paddle/fluid/distributed/collective/process_group.h" | ||
| // #include "paddle/fluid/distributed/collective/process_group_nccl.h" | ||
| #include "paddle/fluid/platform/collective_helper.h" |
zrr1999
changed the title
0x45f
reviewed
Feb 21, 2024
| @@ -12,7 +12,7 @@ | |||
| // See the License for the specific language governing permissions and | |||
| // limitations under the License. | |||
|
|
|||
| #include "paddle/fluid/distributed/collective/process_group.h" | |||
| #include "paddle/phi/core/distributed/collective/process_group.h" | |||
There was a problem hiding this comment.
我把 process_group.h 移动到了 phi目录，这部分是同步修改的
28 tasks
Closed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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 types
Others
PR changes
Others
Description
fused_multi_transformer/fused_multi_transformer_int8 to phi
合入内容见：#62049