【Hackathon 5th No.105】move fusion_gru/fusion_seqconv_eltadd_relu/fusion_seqexpand_concat_fc to phi #57881

zeroRains · 2023-10-06T06:33:43Z

PR types

Others

PR changes

Others

Description

move fusion_gru/fusion_seqconv_eltadd_relu/fusion_seqexpand_concat_fc to phi
#57262

paddle-bot · 2023-10-06T06:33:48Z

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

…n gru_op

zeroRains · 2023-10-07T10:26:31Z

额，这个输出在fluid的OpMaker中有一个.AsIntermediate()描述，我在处理的时候当他不存在了，但是下面的报错告诉我应该是不能忽略的，想问问研发大哥这个描述应该怎么处理呢？@yuanlehome

…usion_gru_op

yuanlehome · 2023-10-09T11:37:48Z

额，这个输出在fluid的OpMaker中有一个.AsIntermediate()描述，我在处理的时候当他不存在了，但是下面的报错告诉我应该是不能忽略的，想问问研发大哥这个描述应该怎么处理呢？

AsIntermediate表示这个输出仅仅用于反向，不会作为其他算子的输入，参考这个

luotao1 · 2023-10-10T06:34:18Z

需要解决下冲突

zeroRains · 2023-10-15T07:44:11Z

需要解决下冲突

Done

zeroRains · 2023-10-15T11:16:09Z

迁移了fusion_gru_op.cc之后，使得fusion_gru_mkldnn_op单测不过，但是这个单测调用的kernel应该在fusion_gru_mkldnn_op.cc文件中，我都没有修改过，仔细看了一下和fusion_gru_op.cc也没有调用关系。实在看不出来为什么会出现这个错误。

@yuanlehome

yuanlehome · 2023-10-16T03:56:23Z

迁移了fusion_gru_op.cc之后，使得fusion_gru_mkldnn_op单测不过，但是这个单测调用的kernel应该在fusion_gru_mkldnn_op.cc文件中，我都没有修改过，仔细看了一下和fusion_gru_op.cc也没有调用关系。实在看不出来为什么会出现这个错误。

@yuanlehome

fusion_gru_mkldnn_op和fusion_gru_op使用的是同一个op名字“fusion_gru”，只是后端不同，看起来需要把fusion_gru_mkldnn_op也一并迁到phi里去才可以

yuanlehome · 2023-10-16T03:57:59Z

迁移了fusion_gru_op.cc之后，使得fusion_gru_mkldnn_op单测不过，但是这个单测调用的kernel应该在fusion_gru_mkldnn_op.cc文件中，我都没有修改过，仔细看了一下和fusion_gru_op.cc也没有调用关系。实在看不出来为什么会出现这个错误。
@yuanlehome

fusion_gru_mkldnn_op和fusion_gru_op使用的是同一个op名字“fusion_gru”，只是后端不同，看起来需要把fusion_gru_mkldnn_op也一并迁到phi里去才可以。还需要关注下 paddle/fluid/operators/fused/fusion_gru_op.h

zeroRains · 2023-10-16T05:59:14Z

迁移了fusion_gru_op.cc之后，使得fusion_gru_mkldnn_op单测不过，但是这个单测调用的kernel应该在fusion_gru_mkldnn_op.cc文件中，我都没有修改过，仔细看了一下和fusion_gru_op.cc也没有调用关系。实在看不出来为什么会出现这个错误。
@yuanlehome

fusion_gru_mkldnn_op和fusion_gru_op使用的是同一个op名字“fusion_gru”，只是后端不同，看起来需要把fusion_gru_mkldnn_op也一并迁到phi里去才可以。还需要关注下 paddle/fluid/operators/fused/fusion_gru_op.h

我迁移fusion_gru_mkldnn_op试试

yuanlehome · 2023-10-19T02:36:14Z

部分单测仍然会挂掉，需要再看一下

zeroRains · 2023-10-19T02:46:42Z

部分单测仍然会挂掉，需要再看一下

嗯嗯，我看到了，我后面检查一下

paddle/phi/api/yaml/op_compat.yaml

zeroRains · 2023-10-21T13:09:31Z

部分单测仍然会挂掉，需要再看一下

嗯嗯，我看到了，我后面检查一下

额，请问这些单侧的文件在哪里呢，我在本地直接执行，好像没找到

zeroRains · 2023-10-21T13:11:07Z

请问开启FLAGS_enable_new_ir_in_executor=1后，出现定义的输出和实际输出的数量不对应的情况，这种一般会是什么原因呢？

zeroRains · 2023-10-21T13:15:16Z

调试中写的这些输出好像也没发挥作用，(:з」∠)

yuanlehome · 2023-10-25T14:11:13Z

paddle/phi/api/yaml/fused_ops.yaml

@@ -208,7 +208,7 @@
    data_type : x

 - op : fusion_gru
-  args : (Tensor x, Tensor h0, Tensor weight_x, Tensor weight_h, Tensor bias, str activation = "tanh", str gate_activation = "sigmoid", bool is_reverse = false, bool use_seq = true, bool origin_mode = false, bool use_mkldnn = false, str mkldnn_data_type = "float32", float scale_data = 1.0f, float shift_data = 0.0f, float[] scale_weights = {1.0f}, bool force_fp32_output = false)
+  args : (Tensor x, Tensor h0, Tensor weight_x, Tensor weight_h, Tensor bias, str activation = "tanh", str gate_activation = "sigmoid", bool is_reverse = false, bool use_seq = true, bool origin_mode = false, bool use_onednn = false, str onednn_data_type = "float32", float scale_data = 1.0f, float shift_data = 0.0f, float[] scale_weights = {1.0f}, bool force_fp32_output = false)


op的属性改为onednn字样还需要评估下，会不会导致一些不兼容的问题

额，那我改回来_(:з)∠)_

这个不用改回来，下面那个改回来吧

yuanlehome · 2023-10-25T14:11:28Z

paddle/phi/kernels/fusion/onednn/fusion_gru_kernel.cc

-                     DenseTensor* batched_input,
-                     DenseTensor* batched_out,
-                     DenseTensor* hidden) {
+void FusionGRUOneDNNKernel(const Context& dev_ctx,


这个kernel名字就没要加OneDNN字样了吧？

yuanlehome · 2023-10-26T03:25:48Z

paddle/phi/api/yaml/op_compat.yaml

@@ -1332,15 +1325,51 @@
  extra :
    attrs : [str data_format = "AnyLayout"]

- op : fusion_transpose_flatten_concat


为什么把fusion_transpose_flatten_concat给删掉了？它的输入输出不是不一致吗？

这个没有删掉啊，之前解决冲突的时候被我换了个位置然后用pre-commit的时候位置调整了一下，他现在在1368行

yuanlehome · 2023-10-26T03:57:30Z

另外确认下，迁移完后相关的几个单测都是跑通的对吧？

zeroRains · 2023-10-26T05:29:17Z

另外确认下，迁移完后相关的几个单测都是跑通的对吧？

不开启FLAGS_enable_new_ir_in_executor=1的时候，是可以跑通的

yuanlehome

LGTM

zyfncg · 2023-10-26T06:11:50Z

paddle/phi/infermeta/fusion.cc

+  out->set_dims({x_dims[0], w_dims[1]});
+  col_mat->set_dims({x_dims[0], w_dims[0]});


一般dtype也需要进行设置，这几个InferMeta函数可以再提个PR补一下

@zeroRains 直接在这个PR补上吧～

之前合入的那个PR好像也没有设置，也一并加上吧～

zeroRains · 2023-10-27T00:45:13Z

额。。Corverage超时了。。。我还没权限重跑

heavyrain-lzy · 2023-10-27T07:05:21Z

paddle/phi/api/yaml/op_compat.yaml

  attrs :
-    trans_axis : trans_axis
-    flatten_axis : flatten_axis
-    concat_axis : concat_axis


这里为什么将原来的删除了？会不会存在兼容性问题

不会的，name一样不需要添加映射

名称一致所以删掉

heavyrain-lzy

LGTM for YAML

XiaoguangHu01

LGTM

sunzhongkai588

LGTM. No doc changes

…on_seqexpand_concat_fc to phi (PaddlePaddle#57881) * add a part of fusion_gru * add some code * move the fusion_seqconv_eltadd_relu_op to phi but have the same bug in gru_op * move fusion_seqexpand_concat_fc_op to phi, but have the same bug in fusion_gru_op * fix the intermediate bug * fix the conflict * pass the fusion_seqconv in new ir * try to move fusion_gru_mkldnn_kernel to phi * move fusion_gru_mkldnn to phi, pass the test but some bug in new iR * change some discribe * fix conflict * fix bug * fix the bug in getInputName * remove some describe * add the set_dtype

yuanlehome · 2023-11-29T11:16:12Z

hi同学，这几个kernel的迁移到phi存在问题，需要提PR修复下哈，mkldnn相关的参数不需要写到yaml中，也不需要在kernel、infermata的签名中体现。
参数传入的方法可参考：https://github.com/PaddlePaddle/Paddle/blob/develop/paddle/fluid/framework/operator.cc#L3545
kernel中取参数可参考：https://github.com/PaddlePaddle/Paddle/blob/develop/paddle/phi/kernels/onednn/matmul_kernel.cc#L109

yuanlehome · 2023-11-29T11:17:59Z

hi同学，这几个kernel的迁移到phi存在问题，需要提PR修复下哈，mkldnn相关的参数不需要写到yaml中，也不需要在kernel、infermata的签名中体现。参数传入的方法可参考：https://github.com/PaddlePaddle/Paddle/blob/develop/paddle/fluid/framework/operator.cc#L3545 kernel中取参数可参考：https://github.com/PaddlePaddle/Paddle/blob/develop/paddle/phi/kernels/onednn/matmul_kernel.cc#L109

修复前后，与之前的验证方法一样哈

add a part of fusion_gru

c6273cb

paddle-bot bot added the contributor External developers label Oct 6, 2023

add some code

26941da

Ligoml mentioned this pull request Oct 7, 2023

【PaddlePaddle Hackathon 5th】开源贡献个人挑战赛 #57262

Closed

move the fusion_seqconv_eltadd_relu_op to phi but have the same bug i…

7af5f5e

…n gru_op

move fusion_seqexpand_concat_fc_op to phi, but have the same bug in f…

f98c8ee

…usion_gru_op

luotao1 added the PaddlePaddle Hackathon label Oct 9, 2023

luotao1 assigned luotao1 and yuanlehome Oct 9, 2023

fix the intermediate bug

65b18b9

zeroRains added 3 commits October 15, 2023 04:29

fix conflict

46894bd

fix the conflict

dd18959

pass the fusion_seqconv in new ir

801a26d

zeroRains added 2 commits October 17, 2023 04:13

try to move fusion_gru_mkldnn_kernel to phi

a8a289f

move fusion_gru_mkldnn to phi, pass the test but some bug in new iR

ab31228

yuanlehome reviewed Oct 19, 2023

View reviewed changes

paddle/phi/api/yaml/op_compat.yaml Outdated Show resolved Hide resolved

fix the bug in getInputName

1a622bf

yuanlehome reviewed Oct 25, 2023

View reviewed changes

remove some describe

25a3817

yuanlehome reviewed Oct 26, 2023

View reviewed changes

yuanlehome previously approved these changes Oct 26, 2023

View reviewed changes

zyfncg previously approved these changes Oct 26, 2023

View reviewed changes

add the set_dtype

187fb27

zeroRains dismissed stale reviews from zyfncg and yuanlehome via 187fb27 October 26, 2023 10:57

yuanlehome approved these changes Oct 27, 2023

View reviewed changes

heavyrain-lzy reviewed Oct 27, 2023

View reviewed changes

heavyrain-lzy approved these changes Oct 27, 2023

View reviewed changes

chenwhql approved these changes Oct 27, 2023

View reviewed changes

phlrain self-requested a review October 27, 2023 08:27

XiaoguangHu01 approved these changes Oct 27, 2023

View reviewed changes

phlrain approved these changes Oct 27, 2023

View reviewed changes

sunzhongkai588 approved these changes Oct 27, 2023

View reviewed changes

yuanlehome merged commit 2157c07 into PaddlePaddle:develop Oct 27, 2023

zeroRains deleted the 105 branch October 27, 2023 09:21

PaddlePaddle deleted a comment from zeroRains Nov 29, 2023

zeroRains mentioned this pull request Dec 1, 2023

【Hackathon 5th No.105】 fix the bug in moving fusion_gru_mkldnn to phi -part #59601

Merged

luotao1 changed the title ~~【Hackathon 5th No.105】move fusion_gru/fusion_seqconv_eltadd_relu/fusion_seqexpand_concat_fc to phi~~ 【Hackathon 5th No.105】move fusion_gru/fusion_seqconv_eltadd_relu/fusion_seqexpand_concat_fc to phi -part Dec 22, 2023

luotao1 changed the title ~~【Hackathon 5th No.105】move fusion_gru/fusion_seqconv_eltadd_relu/fusion_seqexpand_concat_fc to phi -part~~ 【Hackathon 5th No.105】move fusion_gru/fusion_seqconv_eltadd_relu/fusion_seqexpand_concat_fc to phi Jan 29, 2024

		out->set_dims({x_dims[0], w_dims[1]});
		col_mat->set_dims({x_dims[0], w_dims[0]});

【Hackathon 5th No.105】move fusion_gru/fusion_seqconv_eltadd_relu/fusion_seqexpand_concat_fc to phi #57881

【Hackathon 5th No.105】move fusion_gru/fusion_seqconv_eltadd_relu/fusion_seqexpand_concat_fc to phi #57881

Conversation

zeroRains commented Oct 6, 2023

PR types

PR changes

Description

paddle-bot bot commented Oct 6, 2023

zeroRains commented Oct 7, 2023 • edited Loading

yuanlehome commented Oct 9, 2023

luotao1 commented Oct 10, 2023

zeroRains commented Oct 15, 2023

zeroRains commented Oct 15, 2023 • edited Loading

yuanlehome commented Oct 16, 2023

yuanlehome commented Oct 16, 2023

zeroRains commented Oct 16, 2023

yuanlehome commented Oct 19, 2023

zeroRains commented Oct 19, 2023

zeroRains commented Oct 21, 2023

zeroRains commented Oct 21, 2023

zeroRains commented Oct 21, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

yuanlehome commented Oct 26, 2023

zeroRains commented Oct 26, 2023

yuanlehome left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

zeroRains commented Oct 27, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

heavyrain-lzy left a comment

Choose a reason for hiding this comment

XiaoguangHu01 left a comment

Choose a reason for hiding this comment

sunzhongkai588 left a comment

Choose a reason for hiding this comment

yuanlehome commented Nov 29, 2023

yuanlehome commented Nov 29, 2023

zeroRains commented Oct 7, 2023 •

edited

Loading

zeroRains commented Oct 15, 2023 •

edited

Loading