[NewIR] Support Ir run program node #56791

2742195759 · 2023-08-30T03:30:45Z

PR types

New features

PR changes

Others

Description

support dy2static in new ir api mode.

目前这个PR只是一个基础PR，还有很多的分支没有支持：

Parameter 还没有支持，但是对于组合算子进行试验，足够了。
输入输出的裁剪逻辑还没有适配，后续会尝试将 x、output、middle 都统一作为 RunProgramGrad 的输入。
pass 逻辑， fp16， amp 等逻辑没有适配。

PCard-66972

paddle-bot · 2023-08-30T03:30:49Z

你的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/fluid/operators/run_program_op.cc

paddle/fluid/pybind/static_op_function.cc

paddle/fluid/eager/to_static/run_program_op_node.h

Aurelius84 · 2023-08-30T08:34:50Z

paddle/fluid/eager/to_static/run_program_op_node.h

+
+  VLOG(4) << "global_inner_scope:" << global_inner_scope;
+
+  auto input_values =


这些 fx、fo、fm 是什么？建议取个更可读的名字

好，后续会更换，这个只是最初的版本。

paddle/fluid/eager/to_static/run_program_op_node.h

Aurelius84 · 2023-08-30T08:36:22Z

paddle/fluid/eager/to_static/run_program_op_node.h

+
+  auto output_grad_values =
+      PADDLE_GET_CONST(std::vector<::ir::Value>, attrs.at("bo_g"));
+  auto forward_input_values =


paddle/fluid/framework/framework.proto

Aurelius84 · 2023-08-31T08:50:44Z

python/paddle/jit/dy2static/newir_partial_program.py

@@ -0,0 +1,1150 @@
+# Copyright (c) 2020 PaddlePaddle Authors. All Rights Reserved.


这里建立一个exprimental_ir 目录，统一放新IR的适配逻辑，类似 partial_program.py 的文件都可以是同名的，后续我们切换上线时，可以统一替换，然后删除ir目录就可以了

目前影响可控，等后面如果发现有大量的侵入代码，会换其他的策略来方便后续的替换。

python/paddle/jit/dy2static/newir_partial_program.py

Aurelius84 · 2023-08-31T09:04:10Z

python/paddle/jit/dy2static/program_translator.py

@@ -1156,6 +1166,106 @@ def __init__(
        self.name_generator = name_generator
        self.kwargs = kwargs

+    @staticmethod
+    @switch_to_static_graph
+    def newir_from_func_spec(


这个函数定义是不是也可以放到 exprimental_ir 里，通过动态patch 的形式来实现新旧ir的切换？

zhangbo9674

LGTM for print

Aurelius84

LGTM overall，由于下游工作的强依赖，可以考虑特殊先合入，但请尽快提后续的Fix TODO 的优化PR，包括：

避免引入过多缩写的Attribute，解耦run_program_op Maker
部分函数名称需要优化下，并按照「大写+驼峰」的规则，且为动宾结构
VLOG的级别要提升，避免任何时候都会打印输出
函数代码中不应该出现 newir，现在已经正式化为 pir了

Aurelius84 · 2023-09-13T07:31:38Z

paddle/fluid/eager/to_static/run_program_op_func.h

@@ -174,3 +175,107 @@ inline void run_program_ad_func(
    egr::EagerUtils::SetHistory(&p_autograd_outs, grad_node);
  }
 }
+
+inline void newir_run_program_ad_func(


Suggested change

inline void newir_run_program_ad_func(

inline void pir_run_program_ad_func(

Aurelius84 · 2023-09-13T07:31:49Z

paddle/fluid/eager/to_static/run_program_op_func.h

+    std::vector<paddle::Tensor*>& dout,                  // NOLINT
+    const paddle::framework::AttributeMap& attrs) {
+  // Prepare Autograd Meta
+  VLOG(2) << "start run newir run_program ad function.";


Suggested change

VLOG(2) << "start run newir run_program ad function.";

VLOG(2) << "start run pir run_program ad function.";

Aurelius84 · 2023-09-13T10:55:28Z

paddle/fluid/eager/to_static/run_program_op_func.h

+
+  // Create Middle Output for GradNode.
+  auto middle_size =
+      PADDLE_GET_CONST(std::vector<::pir::Value>, attrs.at("fm")).size();


这里后续需要解耦run_program_op maker

Aurelius84 · 2023-09-13T10:56:31Z

paddle/fluid/eager/to_static/run_program_op_func.h

+
+  if (require_any_grad) {
+    // Create GradOpNode (1 means [out_grad], 2 means [x_grad, paramx_grad])
+    grad_node = std::make_shared<NewIRGradNodeRunProgram>(1, 2);


Suggested change

grad_node = std::make_shared<NewIRGradNodeRunProgram>(1, 2);

grad_node = std::make_shared<GradNodeRunProgramPir>(1, 2);

这里或许可以使用namespace 来隔离，pir::GradNodeRunProgram

Aurelius84 · 2023-09-13T10:58:15Z

paddle/fluid/eager/to_static/run_program_op_node.h

+      name =
+          op->attributes().at("name").dyn_cast<pir::StrAttribute>().AsString();
+      value2name[op->results()[0].Value::impl()] = name;
+    } else if (op->name() == "builtin.set_parameter") {


Suggested change

} else if (op->name() == "builtin.set_parameter") {

} else if (op->isa<pir::SetParameterOp) {

Aurelius84 · 2023-09-13T11:03:31Z

paddle/fluid/pybind/ir.cc

+  return middle_values;
+}
+
+void mapping_value(const std::vector<pir::Value> &origin,


Aurelius84 · 2023-09-13T11:04:27Z

paddle/fluid/pybind/ir.cc

+  return pir::OpResult(nullptr);
+}
+
+SplitedResult ForwardBackwardSplit(


函数命名应该是「动宾」结构，如SplitForwardBackward

Aurelius84 · 2023-09-13T11:04:45Z

paddle/fluid/pybind/ir.cc

+                   auto *cloned_op = BuildOpFrom(op, forward_value_map);
+                   forward_program->block()->push_back(cloned_op);
+                 });
+  VLOG(1) << "After Forward Construct.";


建议 VLOG(4)

Aurelius84 · 2023-09-13T11:05:27Z

python/paddle/jit/dy2static/function_spec.py

@@ -170,6 +172,34 @@ def args_to_input_spec(self, args, kwargs):

        return args_with_spec, kwargs_with_spec

+    @switch_to_static_graph
+    def newir_to_static_inputs_with_spec(self, input_with_spec, main_program):


Suggested change

def newir_to_static_inputs_with_spec(self, input_with_spec, main_program):

def pir_to_static_inputs_with_spec(self, input_with_spec, main_program):

Aurelius84 · 2023-09-13T11:06:01Z

test/ir/new_ir/test_new_ir_to_static.py

+        def run_function(to_static=True):
+            import paddle
+
+            # 设置随机种子


代码里不应该出现中文

XiaoguangHu01

LGTM

This reverts commit 97442d3.

* support build model in python * fix ci bugs * fix ci bugs * fix compile bugs * fix ci bugs * add infermeta for data * fix ci bugs * fix ci bugs * fix ci bugs * fix bugs when run ir program mutiple times * perfect code * frontend demo debugging * support program split and go into run program node. * simple run the dy2static test in newir_api mode. * remove frame.proto changes * merge * fix ir-run-program-node * fix some code * fix output error * fix some errors * fix * fix * fix * fix conflict * fix files * fix some errors * merge and solve conflict --------- Co-authored-by: YuanRisheng <yuanrisheng@baidu.com>

* [NewIR] Support Ir run program node (#56791) * support build model in python * fix ci bugs * fix ci bugs * fix compile bugs * fix ci bugs * add infermeta for data * fix ci bugs * fix ci bugs * fix ci bugs * fix bugs when run ir program mutiple times * perfect code * frontend demo debugging * support program split and go into run program node. * simple run the dy2static test in newir_api mode. * remove frame.proto changes * merge * fix ir-run-program-node * fix some code * fix output error * fix some errors * fix * fix * fix * fix conflict * fix files * fix some errors * merge and solve conflict --------- Co-authored-by: YuanRisheng <yuanrisheng@baidu.com> * new pr * fix * fix * fix segment error * fix * add dependences * fix * fix link error. * fix some cmake problem * fix * fix * fix dependecy * fix * fix * fix circle dependence * fix * fix * fix rocm * fix * add python library * fix cmake * merge * fix * fix * fix conflict --------- Co-authored-by: YuanRisheng <yuanrisheng@baidu.com>

* [NewIR] Support Ir run program node (PaddlePaddle#56791) * support build model in python * fix ci bugs * fix ci bugs * fix compile bugs * fix ci bugs * add infermeta for data * fix ci bugs * fix ci bugs * fix ci bugs * fix bugs when run ir program mutiple times * perfect code * frontend demo debugging * support program split and go into run program node. * simple run the dy2static test in newir_api mode. * remove frame.proto changes * merge * fix ir-run-program-node * fix some code * fix output error * fix some errors * fix * fix * fix * fix conflict * fix files * fix some errors * merge and solve conflict --------- Co-authored-by: YuanRisheng <yuanrisheng@baidu.com> * new pr * fix * fix * fix segment error * fix * add dependences * fix * fix link error. * fix some cmake problem * fix * fix * fix dependecy * fix * fix * fix circle dependence * fix * fix * fix rocm * fix * add python library * fix cmake * merge * fix * fix * fix conflict --------- Co-authored-by: YuanRisheng <yuanrisheng@baidu.com>

* support build model in python * fix ci bugs * fix ci bugs * fix compile bugs * fix ci bugs * add infermeta for data * fix ci bugs * fix ci bugs * fix ci bugs * fix bugs when run ir program mutiple times * perfect code * frontend demo debugging * support program split and go into run program node. * simple run the dy2static test in newir_api mode. * remove frame.proto changes * merge * fix ir-run-program-node * fix some code * fix output error * fix some errors * fix * fix * fix * fix conflict * fix files * fix some errors * merge and solve conflict --------- Co-authored-by: YuanRisheng <yuanrisheng@baidu.com>

…ddlePaddle#57345) This reverts commit 97442d3.

* [NewIR] Support Ir run program node (PaddlePaddle#56791) * support build model in python * fix ci bugs * fix ci bugs * fix compile bugs * fix ci bugs * add infermeta for data * fix ci bugs * fix ci bugs * fix ci bugs * fix bugs when run ir program mutiple times * perfect code * frontend demo debugging * support program split and go into run program node. * simple run the dy2static test in newir_api mode. * remove frame.proto changes * merge * fix ir-run-program-node * fix some code * fix output error * fix some errors * fix * fix * fix * fix conflict * fix files * fix some errors * merge and solve conflict --------- Co-authored-by: YuanRisheng <yuanrisheng@baidu.com> * new pr * fix * fix * fix segment error * fix * add dependences * fix * fix link error. * fix some cmake problem * fix * fix * fix dependecy * fix * fix * fix circle dependence * fix * fix * fix rocm * fix * add python library * fix cmake * merge * fix * fix * fix conflict --------- Co-authored-by: YuanRisheng <yuanrisheng@baidu.com>

YuanRisheng and others added 21 commits August 15, 2023 09:28

support build model in python

2430d99

deal with conflict

096cd0d

fix ci bugs

ba9fb53

fix ci bugs

c0d9558

merge develop

da6fd48

fix compile bugs

6eb1893

fix ci bugs

68d1613

add infermeta for data

1a56b7d

Merge branch 'develop' of github.com:YuanRisheng/Paddle into bind_ir

d84506c

fix ci bugs

bb36572

deal with conflict

840f93e

deal with conflict

00ccd45

fix ci bugs

2c8df4a

fix ci bugs

dac0b24

deal with conflict

a7cba09

fix bugs when run ir program mutiple times

9e05e8e

perfect code

464b253

frontend demo debugging

2c7419a

merge rishen

903a663

support program split and go into run program node.

be3d209

simple run the dy2static test in newir_api mode.

6cecc00

Merge

97c68bb

2742195759 commented Aug 30, 2023

View reviewed changes

paddle/fluid/operators/run_program_op.cc Outdated Show resolved Hide resolved

cyber-pioneer reviewed Aug 30, 2023

View reviewed changes

paddle/fluid/pybind/static_op_function.cc Outdated Show resolved Hide resolved

Aurelius84 reviewed Aug 30, 2023

View reviewed changes

2742195759 added 3 commits August 30, 2023 15:16

remove frame.proto changes

0f61410

merge

5550797

fix ir-run-program-node

4a0815a

Aurelius84 reviewed Aug 31, 2023

View reviewed changes

2742195759 added 10 commits September 8, 2023 05:46

fix

a195b67

merge

b11b829

fix

af98cb8

Merge remote-tracking branch 'upstream/develop' into ir-run-program-node

0a97e32

fix

751829e

merge

f9890fb

fix conflict

78c80f9

fix files

0f42e6f

fix some errors

4de0215

fix conflict

b912fac

zhangbo9674 previously approved these changes Sep 13, 2023

View reviewed changes

2742195759 added 2 commits September 13, 2023 03:22

Merge remote-tracking branch 'upstream/develop' into ir-run-program-node

7575338

merge and solve conflict

18c08f8

2742195759 dismissed zhangbo9674’s stale review via 18c08f8 September 13, 2023 06:29

Aurelius84 approved these changes Sep 13, 2023

View reviewed changes

phlrain self-requested a review September 14, 2023 07:25

phlrain approved these changes Sep 14, 2023

View reviewed changes

XiaoguangHu01 approved these changes Sep 14, 2023

View reviewed changes

2742195759 merged commit 97442d3 into PaddlePaddle:develop Sep 14, 2023
27 checks passed

risemeup1 added a commit that referenced this pull request Sep 14, 2023

Revert "[NewIR] Support Ir run program node (#56791)"

7cbad27

This reverts commit 97442d3.

risemeup1 mentioned this pull request Sep 14, 2023

Revert "[NewIR] Support Ir run program node" #57345

Merged

risemeup1 added a commit that referenced this pull request Sep 14, 2023

Revert "[NewIR] Support Ir run program node (#56791)" (#57345)

2b56203

This reverts commit 97442d3.

danleifeng pushed a commit to danleifeng/Paddle that referenced this pull request Nov 14, 2023

Revert "[NewIR] Support Ir run program node (PaddlePaddle#56791)" (Pa…

5a64329

…ddlePaddle#57345) This reverts commit 97442d3.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[NewIR] Support Ir run program node #56791

[NewIR] Support Ir run program node #56791

2742195759 commented Aug 30, 2023 •

edited

Loading

paddle-bot bot commented Aug 30, 2023

Aurelius84 Aug 30, 2023

2742195759 Sep 13, 2023

Aurelius84 Aug 30, 2023

Aurelius84 Aug 31, 2023

2742195759 Sep 13, 2023

Aurelius84 Aug 31, 2023

zhangbo9674 left a comment

Aurelius84 left a comment •

edited

Loading

Aurelius84 Sep 13, 2023

Aurelius84 Sep 13, 2023

Aurelius84 Sep 13, 2023

Aurelius84 Sep 13, 2023

Aurelius84 Sep 13, 2023

Aurelius84 Sep 13, 2023

Aurelius84 Sep 13, 2023

Aurelius84 Sep 13, 2023

Aurelius84 Sep 13, 2023

Aurelius84 Sep 13, 2023

XiaoguangHu01 left a comment


		VLOG(4) << "global_inner_scope:" << global_inner_scope;

		auto input_values =

		@@ -0,0 +1,1150 @@
		# Copyright (c) 2020 PaddlePaddle Authors. All Rights Reserved.

	inline void newir_run_program_ad_func(
	inline void pir_run_program_ad_func(

	VLOG(2) << "start run newir run_program ad function.";
	VLOG(2) << "start run pir run_program ad function.";

	grad_node = std::make_shared<NewIRGradNodeRunProgram>(1, 2);
	grad_node = std::make_shared<GradNodeRunProgramPir>(1, 2);

	} else if (op->name() == "builtin.set_parameter") {
	} else if (op->isa<pir::SetParameterOp) {

	def newir_to_static_inputs_with_spec(self, input_with_spec, main_program):
	def pir_to_static_inputs_with_spec(self, input_with_spec, main_program):

[NewIR] Support Ir run program node #56791

[NewIR] Support Ir run program node #56791

Conversation

2742195759 commented Aug 30, 2023 • edited Loading

PR types

PR changes

Description

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

zhangbo9674 left a comment

Choose a reason for hiding this comment

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

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

XiaoguangHu01 left a comment

Choose a reason for hiding this comment

2742195759 commented Aug 30, 2023 •

edited

Loading

Aurelius84 left a comment •

edited

Loading