【Hackathon 5th No.103】move fc to phi -part #58777

zeroRains · 2023-11-07T12:27:28Z

PR types

Others

PR changes

Others

Description

move fc to phi
#57262

CLAassistant · 2023-11-07T12:27:34Z

All committers have signed the CLA.

zeroRains · 2023-11-07T12:34:39Z

在执行test_onednn_fc_activation_fuse_pass这个单测时，会调用到fc，出问题的地方在fluid源文件的185行，AppendActivation函数里，具体问题见图。

比较麻烦的一个点就是按照phi的方法是把所有用到的参数都作为函数的参数了，所以有没有什么方法，像他一样获取ctx.HasAttr("fuse_activation")这个属性呢？

move fc to phi try to fix bug

yuanlehome · 2023-11-08T06:00:43Z

在执行test_onednn_fc_activation_fuse_pass这个单测时，会调用到fc，出问题的地方在fluid源文件的185行，AppendActivation函数里，具体问题见图。

比较麻烦的一个点就是按照phi的方法是把所有用到的参数都作为函数的参数了，所以有没有什么方法，像他一样获取ctx.HasAttr("fuse_activation")这个属性呢？

ctx提供的接口都在xxx_context.h里，比如onednn是paddle/phi/backends/onednn/onednn_context.h，里面有你需要的接口

zeroRains · 2023-11-08T06:01:59Z

在执行test_onednn_fc_activation_fuse_pass这个单测时，会调用到fc，出问题的地方在fluid源文件的185行，AppendActivation函数里，具体问题见图。
比较麻烦的一个点就是按照phi的方法是把所有用到的参数都作为函数的参数了，所以有没有什么方法，像他一样获取ctx.HasAttr("fuse_activation")这个属性呢？

ctx提供的接口都在xxx_context.h里，比如onednn是paddle/phi/backends/onednn/onednn_context.h，里面有你需要的接口

好的

zeroRains · 2023-11-08T06:55:31Z

怪了，之前还能编译的

… 103_fc

zeroRains · 2023-11-13T02:15:35Z

fc 的单测和带FLAG的单测均通过

yuanlehome · 2023-11-13T02:50:51Z

fc 的单测和带FLAG的单测均通过

👍，我来处理下CI和找同事reivew哈～

yuanlehome · 2023-11-13T02:57:49Z

paddle/phi/api/yaml/fused_ops.yaml

@@ -109,6 +109,16 @@
    func : fast_where_xpu
    data_type : x

+- op : fc
+  args : (Tensor input, Tensor w, Tensor bias, int in_num_col_dims = 1, str activation_type = "", bool use_mkldnn = false, bool padding_weights = false, bool use_quantizer = false, str mkldnn_data_type = "float32", float scale_in = 1.0f, float[] scale_weights = {1.0f}, float scale_out = 1.0f, bool force_fp32_output = false)


Tensor input, Tensor w, Tensor bias, int in_num_col_dims = 1, 只保留这四个，其他全挪到extra里

float[] scale_weights = {1.0f}这个移到extra里会报错[]和{}无法解析

加个引号

emm，全部移到extra里之后，算子的InferShape会对应不上，如果删掉其他在InferShape的参数属性，就不能对这些属性进行检查了。。。

感觉是不能填入args中没有声明的属性

只填名字呢

如果解决不了，就先这样吧～

如果解决不了，就先这样吧～

好吧~

只填名字也会报错

zyfncg · 2023-11-13T04:31:13Z

paddle/phi/kernels/fc_kernel.h

+namespace phi {
+namespace fusion {
+template <typename T, typename Context>
+void FCKernel(const Context& dev_ctx,


fuse类算子不需要头文件声明

yuanlehome

LGTM

ZzSean

LGTM for CI-OP-Benchmark

yuanlehome · 2023-11-29T11:15:24Z

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:44Z

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

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

zeroRains mentioned this pull request Nov 7, 2023

【Hackathon 5th No.103】move skip_layernorm/fused_bias_dropout_residual_layer_norm to phi #58396

Merged

paddle-bot bot added the contributor label Nov 7, 2023

luotao1 mentioned this pull request Nov 8, 2023

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

Closed

luotao1 added the PaddlePaddle Hackathon label Nov 8, 2023

luotao1 assigned luotao1 and yuanlehome Nov 8, 2023

move fc to phi and try to fix bug

106aa29

move fc to phi try to fix bug

zeroRains force-pushed the 103_fc branch from f1b9a33 to 106aa29 Compare November 8, 2023 05:22

zeroRains added 2 commits November 8, 2023 05:24

try to fix bug

a66375b

fix bugh

c26753c

zeroRains added 5 commits November 9, 2023 04:18

fix the bug

6ae202a

fix the conflict

3320499

Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…

fd76ff9

… 103_fc

fix bug

85cb62e

add the attr

47e103b

luotao1 changed the title ~~【Hackathon 5th No.103】move fc to phi~~ 【Hackathon 5th No.103】move fc to phi -part Nov 13, 2023

yuanlehome reviewed Nov 13, 2023

View reviewed changes

zyfncg reviewed Nov 13, 2023

View reviewed changes

remove .h file

7b1048a

yuanlehome approved these changes Nov 15, 2023

View reviewed changes

zyfncg approved these changes Nov 15, 2023

View reviewed changes

phlrain self-requested a review November 15, 2023 09:13

phlrain approved these changes Nov 15, 2023

View reviewed changes

ZzSean approved these changes Nov 15, 2023

View reviewed changes

luotao1 merged commit 4adac36 into PaddlePaddle:develop Nov 15, 2023

zeroRains deleted the 103_fc branch November 24, 2023 14:33

SecretXV pushed a commit to SecretXV/Paddle that referenced this pull request Nov 28, 2023

【Hackathon 5th No.103】move fc to phi -part (PaddlePaddle#58777)

4156cf1

zeroRains mentioned this pull request Nov 29, 2023

【Hackathon 5th No.103】 fix the bug in moving fc_mkldnn to phi -part #59531

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

【Hackathon 5th No.103】move fc to phi -part #58777

【Hackathon 5th No.103】move fc to phi -part #58777

zeroRains commented Nov 7, 2023

CLAassistant commented Nov 7, 2023 •

edited

Loading

zeroRains commented Nov 7, 2023

yuanlehome commented Nov 8, 2023

zeroRains commented Nov 8, 2023

zeroRains commented Nov 8, 2023

zeroRains commented Nov 13, 2023

yuanlehome commented Nov 13, 2023

yuanlehome Nov 13, 2023

zeroRains Nov 13, 2023

yuanlehome Nov 13, 2023

zeroRains Nov 13, 2023

zeroRains Nov 13, 2023

zeroRains Nov 14, 2023

zeroRains Nov 14, 2023 •

edited

Loading

yuanlehome Nov 14, 2023

yuanlehome Nov 14, 2023

zeroRains Nov 14, 2023

zyfncg Nov 13, 2023

yuanlehome left a comment

ZzSean left a comment

yuanlehome commented Nov 29, 2023

yuanlehome commented Nov 29, 2023

【Hackathon 5th No.103】move fc to phi -part #58777

【Hackathon 5th No.103】move fc to phi -part #58777

Conversation

zeroRains commented Nov 7, 2023

PR types

PR changes

Description

CLAassistant commented Nov 7, 2023 • edited Loading

zeroRains commented Nov 7, 2023

yuanlehome commented Nov 8, 2023

zeroRains commented Nov 8, 2023

zeroRains commented Nov 8, 2023

zeroRains commented Nov 13, 2023

yuanlehome commented Nov 13, 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

zeroRains Nov 14, 2023 • edited Loading

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 left a comment

Choose a reason for hiding this comment

ZzSean left a comment

Choose a reason for hiding this comment

yuanlehome commented Nov 29, 2023

yuanlehome commented Nov 29, 2023

CLAassistant commented Nov 7, 2023 •

edited

Loading

zeroRains Nov 14, 2023 •

edited

Loading