【PIR】fused_elemwise_add_activation #57827

yangguohao · 2023-09-27T18:03:05Z

PR types

Others

PR changes

OPs

Description

add fused_elemwise_add_activation in PIR

paddle-bot · 2023-09-27T18:03:09Z

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

paddle/phi/api/yaml/fused_ops.yaml

kangguangli · 2023-09-28T06:57:05Z

单测可以先测试下 test_fuse_elewise_add_act_pass 能否通过

paddle-ci-bot · 2023-10-05T03:14:25Z

Sorry to inform you that cf20183's CIs have passed for more than 7 days. To prevent PR conflicts, you need to re-run all CIs manually.

kangguangli · 2023-10-30T07:09:13Z

可以仿照这个PR #57655 把 test_fuse_elewise_add_act_pass 也加到CI里监控起来

test/legacy_test/CMakeLists.txt

paddle/fluid/ir_adaptor/translator/op_translator.cc

kangguangli · 2023-11-13T06:25:50Z

paddle/fluid/pir/transforms/pd_op_to_kernel_pass.cc

+  if (op->isa<paddle::dialect::FusedElemwiseAddActivationOp>() ||
+      op->isa<paddle::dialect::FusedElemwiseAddActivationGradOp>()) {
+    if (kernel_key.backend() == phi::Backend::GPUDNN) {
+      return true;
+    }
+  }


为什么要fallBack回GPU呢？

kangguangli · 2023-11-13T06:40:00Z

paddle/phi/infermeta/backward.h

+void FusedElemwiseAddActivationGradInferMeta(
+    const MetaTensor& x,
+    const MetaTensor& y,
+    const MetaTensor& out,
+    const MetaTensor& intermediate_out,
+    const MetaTensor& out_grad,
+    const std::vector<std::string>& functor_list,
+    float scale,
+    int axis,
+    bool save_intermediate_out,
+    MetaTensor* x_grad,
+    MetaTensor* y_grad);
+


这个函数放到 paddle/phi/infermeta/multiary.h 或者 paddle/phi/infermeta/fusion.h比较合适吧， @zyfncg 看下哪个更好呢？

放到fusion.h中吧

zyfncg · 2023-11-13T08:26:41Z

paddle/fluid/pir/dialect/operator/ir/ops_backward.yaml

+    func: FusedElemwiseAddActivationGradInferMeta
+  kernel:
+    func: fused_elemwise_add_activation_grad
+  optional : x, intermediate_out


x和intermediate_out 为什么是optional的？

x, intermediate_out 都可以为空

前向不为空，反向可以为空，这个逻辑感觉是有问题的，是不是再梳理下这里面的逻辑？

这个属于之前的反向 OpMaker 里就存在的，有 InputXCanBeAbsent 的判断，intermediate_out 也当 save_intermediate_out 为 false 时就没有这个中间输出。

这里应该还是是不是要以FusedElemwiseActivationGradMaker为准吧，里面在创建fused_elemwise_add_activation_grad应该是必然创建x和intermediate_out的。
如下：

//这里应该设置了X for (auto &input_param : this->InputNames()) { grad_op->SetInput(input_param, this->Input(input_param)); grad_op->SetOutput(framework::GradVarName(input_param), this->InputGrad(input_param, true)); } //这里应该设置了IntermediateOut if (PADDLE_GET_CONST(bool, grad_op->GetAttr("save_intermediate_out"))) { // PADDLE_ENFORCE_NE(Output("IntermediateOut").size(), 0); grad_op->SetInput("IntermediateOut", this->Output("IntermediateOut")); grad_op->SetOutput(framework::GradVarName("IntermediateOut"), this->OutputGrad("IntermediateOut")); } else { grad_op->SetInput("IntermediateOut", this->EmptyOutput()); grad_op->SetOutput(framework::GradVarName("IntermediateOut"), this->EmptyOutputGrad()); }

但是个别时候得到的OpDesc可能确实不符合这里的GradOpMaker，因为fused_elemwise_add_activation_grad可能是被pass创建的，没有经过这里的GradOpMaker， @yangguohao 可以发下具体的单测或者检查下相关pass的代码中在创建 fused_elemwise_add_activation_grad时是否会有不创建这两个输入的可能。

IntermediateOut 和 X 为空

zyfncg · 2023-11-13T08:28:43Z

paddle/phi/infermeta/backward.cc

+  // if (intermediate_out_grad) {
+  //   // For Unary(Binary(X, Y)), IntermediateOut should not be empty.
+  //   if (IsUnaryCompound(functor_list)) {
+  //     intermediate_out_grad->set_dims(out_grad.dims());
+  //     intermediate_out_grad->share_lod(out_grad);
+  //   } else {
+  //     intermediate_out_grad->set_dims(y.dims());
+  //     intermediate_out_grad->share_lod(y);
+  //   }
+  // }


这里的注释是否还有用？

之后还需要添加 intermediate_out_grad。

zyfncg · 2023-11-13T08:28:58Z

paddle/phi/infermeta/backward.cc

+    y_grad->set_dims(y.dims());
+    y_grad->share_lod(y);


需要设置 dtype

zyfncg · 2023-11-13T08:29:26Z

paddle/phi/infermeta/backward.h

+void FusedElemwiseAddActivationGradInferMeta(
+    const MetaTensor& x,
+    const MetaTensor& y,
+    const MetaTensor& out,
+    const MetaTensor& intermediate_out,
+    const MetaTensor& out_grad,
+    const std::vector<std::string>& functor_list,
+    float scale,
+    int axis,
+    bool save_intermediate_out,
+    MetaTensor* x_grad,
+    MetaTensor* y_grad);
+


放到fusion.h中吧

paddle/phi/infermeta/multiary.cc

kangguangli

LGTM

* add fused_elemwise_add_activation * fix * fix scale attribute add intermediate_out_grad warning * fix * fix 2023-11-06 * modified test file * fix 2023-11-07 * revert * fix windows inference * fix * fix 2023-11-14

paddle-bot bot added the contributor External developers label Sep 27, 2023

kangguangli reviewed Sep 28, 2023

View reviewed changes

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

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

yangguohao mentioned this pull request Oct 17, 2023

【PIR】Dygraph_to_static 下需要修复 PIR 的用例。 #56607

Closed

yangguohao force-pushed the PIR_build_strategy branch from cf20183 to 4be6756 Compare October 30, 2023 05:46

add fused_elemwise_add_activation

c666f6b

yangguohao force-pushed the PIR_build_strategy branch 3 times, most recently from 45fc433 to e494a13 Compare October 31, 2023 11:59

fix

682550a

yangguohao force-pushed the PIR_build_strategy branch from 8063553 to 682550a Compare November 3, 2023 02:18

yangguohao and others added 9 commits November 3, 2023 11:56

Merge branch 'PaddlePaddle:develop' into PIR_build_strategy

98c1df7

Merge branch 'develop' into PIR_build_strategy

186a985

fix scale attribute add intermediate_out_grad warning

f7b0c59

fix

99c0fad

Merge branch 'develop' into PIR_build_strategy

695400f

Merge branch 'develop' into PIR_build_strategy

5bd2a24

Merge branch 'PaddlePaddle:develop' into PIR_build_strategy

e037f0a

fix 2023-11-06

0be59b8

modified test file

7b36da5

kangguangli reviewed Nov 6, 2023

View reviewed changes

test/legacy_test/CMakeLists.txt Outdated Show resolved Hide resolved

paddle/fluid/ir_adaptor/translator/op_translator.cc Outdated Show resolved Hide resolved

yangguohao and others added 4 commits November 7, 2023 07:46

fix 2023-11-07

7fbffff

revert

046b3da

fix windows inference

bb0eacf

Merge branch 'develop' into PIR_build_strategy

b1cf6d9

kangguangli reviewed Nov 13, 2023

View reviewed changes

zyfncg reviewed Nov 13, 2023

View reviewed changes

yangguohao and others added 5 commits November 13, 2023 19:46

Merge branch 'PaddlePaddle:develop' into PIR_build_strategy

385b9ae

Merge branch 'develop' into PIR_build_strategy

07d7da1

fix

3b01441

Merge branch 'develop' into PIR_build_strategy

9787867

fix 2023-11-14

ac45952

kangguangli approved these changes Nov 15, 2023

View reviewed changes

kangguangli requested review from zyfncg and zhangbo9674 November 15, 2023 03:35

zyfncg approved these changes Nov 15, 2023

View reviewed changes

zhangbo9674 approved these changes Nov 15, 2023

View reviewed changes

kangguangli merged commit 3ac5e69 into PaddlePaddle:develop Nov 15, 2023
28 checks passed

yangguohao mentioned this pull request Nov 30, 2023

[WeeklyReports] 2023.11.08~2023.11.21 周报汇总 PFCCLab/Camp#77

Closed

21 tasks

yangguohao deleted the PIR_build_strategy branch December 1, 2023 08:53

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

【PIR】fused_elemwise_add_activation #57827

【PIR】fused_elemwise_add_activation #57827

yangguohao commented Sep 27, 2023

paddle-bot bot commented Sep 27, 2023

kangguangli commented Sep 28, 2023

paddle-ci-bot bot commented Oct 5, 2023

kangguangli commented Oct 30, 2023

kangguangli Nov 13, 2023

kangguangli Nov 13, 2023

zyfncg Nov 13, 2023

yangguohao Nov 13, 2023

zyfncg Nov 13, 2023

yangguohao Nov 13, 2023

zyfncg Nov 14, 2023

yangguohao Nov 14, 2023

kangguangli Nov 14, 2023

yangguohao Nov 14, 2023

zyfncg Nov 13, 2023

yangguohao Nov 13, 2023

zyfncg Nov 13, 2023

yangguohao Nov 13, 2023

zyfncg Nov 13, 2023

kangguangli left a comment

【PIR】fused_elemwise_add_activation #57827

【PIR】fused_elemwise_add_activation #57827

Conversation

yangguohao commented Sep 27, 2023

PR types

PR changes

Description

paddle-bot bot commented Sep 27, 2023

kangguangli commented Sep 28, 2023

paddle-ci-bot bot commented Oct 5, 2023

kangguangli commented Oct 30, 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

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

kangguangli left a comment

Choose a reason for hiding this comment