[NewIR]Change feed list to variable list && support GPU #55401

phlrain · 2023-07-13T07:25:47Z

PR types

Bug fixes

PR changes

Others

Description

本pr有两个大的升级，

将feedlist换成一个单个的variable，方便share variable
引入shaddow feed kernel，在GPU场景，在feed 和后继op之间做数据copy

Others

Pcard-67164

… add_feed_with_place_op

…e/Paddle into change_feed_list_to_variable_list

… change_feed_list_to_variable_list

paddle-bot · 2023-07-13T07:25:51Z

你的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-bot · 2023-07-13T07:25:53Z

❌ The PR is not created using PR's template. You can refer to this Demo.
Please use PR's template, it helps save our maintainers' time so that more developers get helped.

… change_feed_list_to_variable_list

…e/Paddle into change_feed_list_to_variable_list

… change_feed_list_to_variable_list

YuanRisheng · 2023-07-19T03:27:07Z

paddle/fluid/framework/feed_fetch_method.cc

-  if (index >= feed_inputs.size()) {
-    feed_inputs.resize(index + 1);
+  if (FLAGS_enable_new_ir_in_executor) {
+    VLOG(3) << "SetFeedVariable name=" << var_name << " index=" << index;


可以把这行log放到if外，else里的log就可以删了

YuanRisheng · 2023-07-19T03:37:01Z

paddle/phi/kernels/cpu/feed_with_place_kernel.cc

+namespace phi {
+
+template <typename T, typename Context>
+void FeedWithPlaceKernel(const Context& ctx,


既然有了shadow feed，那feedwithplace是啥作用

这个feed with place是跟动转静场景用的，动转静的时候，tensor的place是已知的，需要将这个place 提供给AOT pass

YuanRisheng · 2023-07-19T03:37:52Z

paddle/phi/kernels/impl/feed_with_place_impl.h

+namespace phi {
+
+template <typename T, typename Context>
+void ShaddowFeedKernel(const Context& ctx,


ShadowFeedKernel？或者直接改叫FeedKernel？

是可以改的，但是改了和op 的名称对不上，还得做一层的映射

这里说的op名称是指的pd_op.yaml配置的名称吗，那个是可以改的吧，主要是现在这个名字拼写错误，看着有点难受

… change_feed_list_to_variable_list

Aurelius84 · 2023-07-20T06:21:55Z

paddle/fluid/ir/dialect/pd_op.yaml

@@ -227,3 +227,30 @@
  inplace: null
  view: null
  backward: null
+
+
+- name: shaddow_feed


Suggested change

- name: shaddow_feed

- name: shadow_feed

我查了下，应该是shadow？

我改一下

Aurelius84 · 2023-07-20T06:28:33Z

paddle/fluid/ir/transforms/pd_op_to_kernel_pass.cc

+          phi::TransToPhiPlace(shaddow_key.backend()),
+          (*it)->result(0).type().dyn_cast<dialect::DenseTensorType>());
+
+      ir::Operation* shaddow_op =


从这里代码看来，我们还是希望有类似 ir::shadow(xxx) C++端API的，这样能简洁很多代码

Aurelius84 · 2023-07-20T06:29:34Z

paddle/fluid/ir/transforms/pd_op_to_kernel_pass.h


 namespace paddle {
 namespace dialect {

-std::unique_ptr<ir::Program> PdOpLowerToKernelPass(ir::Program* prog);
+std::unique_ptr<ir::Program> PdOpLowerToKernelPass(
+    ir::Program* prog, phi::Place place = phi::CPUPlace());


这里是不是可以不加默认的Place值？

是需要的，我后续调整下

Aurelius84 · 2023-07-20T06:30:55Z

paddle/phi/kernels/cpu/feed_with_place_kernel.cc

-PD_REGISTER_KERNEL(feed_with_place,
+
+PD_REGISTER_KERNEL(
+    feed_with_place, CPU, ALL_LAYOUT, phi::FeedWithPlaceKernel, float) {}


原来feed_with_place 注册了4种类型，这里为什么只保留了1种？

当前的验证，只用到了float，是需要补全的

Aurelius84 · 2023-07-20T06:32:01Z

paddle/phi/kernels/impl/feed_with_place_impl.h

+  ctx.template Alloc<T>(out);
+  if (x.place() == out->place()) {
+    out->ShareDataWith(x);
+    out->set_lod(x.lod());


这个OP自带inplace策略是吧？属于kernel内inplace

是的，这个是一个特殊的op

Aurelius84

LGTM overall

…#55401) * add feed with place op * remove useless unitest * udpate mkldnn * update * new ir support builtin slice op * fix phi kernel adaptor bug * add enable_static * remove useless test case * change feed list to single variable * support gpu * fix bug * remove template * add more data type * fix cimpile bug

phlrain added 16 commits July 11, 2023 14:26

add feed with place op

e762fbd

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

f316d37

… add_feed_with_place_op

remove useless unitest

a0a8860

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

3b0bd59

… add_feed_with_place_op

udpate mkldnn

407fa01

update

def81b7

new ir support builtin slice op

f0c12cd

fix phi kernel adaptor bug

69ebc87

add enable_static

aa40caf

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

27ffdc0

… add_feed_with_place_op

remove useless test case

8220386

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

bf97e13

… add_feed_with_place_op

Merge commit 'refs/pull/55381/head' of https://github.com/PaddlePaddl…

2b114ba

…e/Paddle into change_feed_list_to_variable_list

change feed list to single variable

7da618d

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

46a30b8

… change_feed_list_to_variable_list

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

f2a74ef

… change_feed_list_to_variable_list

phlrain added 7 commits July 17, 2023 09:21

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

8dd9292

… change_feed_list_to_variable_list

Merge commit 'refs/pull/55343/head' of https://github.com/PaddlePaddl…

5fc76f1

…e/Paddle into change_feed_list_to_variable_list

support gpu

0e9f279

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

c6eaf29

… change_feed_list_to_variable_list

fix bug

8248344

remove template

a84895a

add more data type

4eb6b15

YuanRisheng reviewed Jul 19, 2023

View reviewed changes

phlrain added 3 commits July 19, 2023 05:33

fix cimpile bug

4d8707e

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

4feb7fc

… change_feed_list_to_variable_list

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

d8be6ec

… change_feed_list_to_variable_list

phlrain changed the title ~~Change feed list to variable list~~ [NewIR]Change feed list to variable list && support GPU Jul 20, 2023

Aurelius84 reviewed Jul 20, 2023

View reviewed changes

Aurelius84 approved these changes Jul 20, 2023

View reviewed changes

phlrain merged commit 7551784 into PaddlePaddle:develop Jul 20, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[NewIR]Change feed list to variable list && support GPU #55401

[NewIR]Change feed list to variable list && support GPU #55401

phlrain commented Jul 13, 2023 •

edited

Loading

paddle-bot bot commented Jul 13, 2023

paddle-bot bot commented Jul 13, 2023

YuanRisheng Jul 19, 2023

phlrain Jul 19, 2023

YuanRisheng Jul 19, 2023

phlrain Jul 19, 2023

YuanRisheng Jul 19, 2023

phlrain Jul 19, 2023

YuanRisheng Jul 20, 2023

Aurelius84 Jul 20, 2023

phlrain Jul 20, 2023

Aurelius84 Jul 20, 2023

phlrain Jul 20, 2023

Aurelius84 Jul 20, 2023

phlrain Jul 20, 2023

Aurelius84 Jul 20, 2023

phlrain Jul 20, 2023

Aurelius84 Jul 20, 2023

phlrain Jul 20, 2023

Aurelius84 left a comment

[NewIR]Change feed list to variable list && support GPU #55401

[NewIR]Change feed list to variable list && support GPU #55401

Conversation

phlrain commented Jul 13, 2023 • edited Loading

PR types

PR changes

Description

Others

paddle-bot bot commented Jul 13, 2023

paddle-bot bot commented Jul 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

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

Aurelius84 left a comment

Choose a reason for hiding this comment

phlrain commented Jul 13, 2023 •

edited

Loading