add cinn graph symbolization #36417

thisjiang · 2021-10-13T11:40:36Z

PR types

New features

PR changes

APIs

Describe

增加CINN子图符号化函数类，该类接收一个通过BuildCinnPass类筛选出的CINN子图，并逐一运行拓扑排序后的每个op，最终返回一个::cinn::frontend::Program对象。

前置PR

Paddle desc与CINN desc相互转换函数：Add transformer of paddle desc and cinn desc #36100
Paddle和CINN联编PR

当前状态

前置PR均未merge，且由于依赖文件较多，本地编译也不成功。

流程

输入：CINN子图graph，子图idgraph_id，feed列表feed_targets

利用graph_id构造出一个唯一的NetBuilder
构造::cinn::frontend::OpMapperContext
遍历feed列表，利用tensor的shape和type创建相应的CINN variable并保存到context中，这样子图的输入var就准备好了
拓扑排序graph并返回排序后的op列表
将拓扑排序列表中每个OpDesc转换为CINN中的OpDesc
对每个op，查找::cinn::frontend::OpMapperRegistry，找到对应的mapper函数，一一运行该函数
调用builder.Build()函数返回相应的::cinn::frontend::Program对象

paddle-bot-old · 2021-10-13T11:42:03Z

Thanks for your contribution!
Please wait for the result of CI firstly. See Paddle CI Manual for details.

… build cinn pass

wzzju · 2021-10-15T08:06:25Z

paddle/fluid/framework/paddle2cinn/CMakeLists.txt

@@ -2,8 +2,10 @@ cc_library(cinn_cache_key SRCS cinn_cache_key.cc DEPS boost graph graph_helper l
 cc_library(cinn_compiled_object SRCS cinn_compiled_object.cc DEPS feed_fetch_method graph lod_tensor proto_desc)
 cc_library(cinn_runner SRCS cinn_runner.cc DEPS cinn_cache_key cinn_compiled_object feed_fetch_method graph lod_tensor scope)
 cc_library(build_cinn_pass SRCS build_cinn_pass.cc DEPS pass subgraph_detector)
+cc_library(cinn_graph_symbolization SRCS cinn_graph_symbolization.cc DEPS lod_tensor graph transform_desc cinnapi.so)


为什么要加.so后缀？

按照其它cmake上的方法改成了：

cc_library(cinn_graph_symbolization SRCS cinn_graph_symbolization.cc DEPS lod_tensor graph transform_desc) target_link_libraries(cinn_graph_symbolization cinnapi.so)

wzzju · 2021-10-15T08:27:57Z

paddle/fluid/framework/paddle2cinn/cinn_graph_symbolization.h

+namespace paddle2cinn {
+
+// An executor accept subgraph which is generated by BuildCinnPass,
+// run each op's CINN Op Mapper, finally return the graph's CINN NetBuilder.


Suggested change

// run each op's CINN Op Mapper, finally return the graph's CINN NetBuilder.

// run each op's CINN Op Mapper, finally return a frontend::Program object corresponding to the subgraph.

wzzju · 2021-10-15T08:29:25Z

paddle/fluid/framework/paddle2cinn/cinn_graph_symbolization.h

+  ::cinn::frontend::Program operator()() const;
+
+  // return the internal variable map
+  const auto& var_map() const { return var_map_; }


返回值尽量不要使用auto类型，比较难读懂。

改为了明确类型

wzzju · 2021-10-15T08:29:35Z

paddle/fluid/framework/paddle2cinn/cinn_graph_symbolization.h

+  const auto& var_map() const { return var_map_; }
+
+  // return the map from the variable name in paddle model to cinn program.
+  const auto& var_model_to_program_map() const {


wzzju · 2021-10-15T08:33:15Z

paddle/fluid/framework/paddle2cinn/cinn_graph_symbolization.cc

+  builder_name.append(std::to_string(graph_id_));
+  builder_name.append("_of_");
+  static uint64_t unique_invoke_number = 0;
+  builder_name.append(std::to_string(unique_invoke_number++));


unique_invoke_number的意义是什么？这里永远都是0？

的确，这里之前想着的是Symbolization对象通用，参数都放在operator()函数参数里，这样每调用一次生成的NetBuilder名称都是唯一的，现在这样写参数都放在构造函数里，每个图都生成一个对象，也只会调用一次operator()函数

wzzju · 2021-10-15T08:35:04Z

paddle/fluid/framework/paddle2cinn/cinn_graph_symbolization.cc

+}  // namespace utils
+
+// get the graph's op input Parameter var name set
+auto CinnGraphSymbolization::GetGraphInputParameterNames() const {


不要返回auto，看起来真心不易读。

wzzju · 2021-10-15T08:40:49Z

paddle/fluid/framework/paddle2cinn/cinn_graph_symbolization.cc

+
+  ::cinn::frontend::NetBuilder builder(builder_name);
+
+  auto target = ::cinn::common::DefaultHostTarget();


这里就确定target？这个应该是外面传进来的。

已修改为通过构造函数传入

wzzju · 2021-10-15T08:43:43Z

paddle/fluid/framework/paddle2cinn/cinn_graph_symbolization.cc

+
+    TransformOpDescToCinn(node->Op(), cinn_desc.get());
+  }
+  return std::move(cinn_op_descs_);


不用加move。

wzzju · 2021-10-15T08:50:28Z

paddle/fluid/framework/paddle2cinn/cinn_graph_symbolization.cc

+auto CinnGraphSymbolization::TransformAllGraphOpToCinn() const {
+  std::vector<std::unique_ptr<CinnOpDesc>> cinn_op_descs_;
+
+  const auto& sorted_ops = TopoSortGraph();


拓扑排序建议使用现有的代码：

Paddle/paddle/fluid/framework/ir/graph_helper.h

Line 62 in 145cdb5

std::vector<ir::Node *> TopologySortOperations(const Graph &graph);

wzzju · 2021-10-15T09:09:49Z

paddle/fluid/framework/paddle2cinn/build_cinn_pass.cc

  // the subgraph is independently, so here we only need link
  // to the node in new subgraph, and discard the link to
  // out-graph.
  for (auto* op : cluster) {
    for (auto* var : op->inputs) {
      if (cluster_internals.count(var)) {
        old_op2new_op[op]->inputs.emplace_back(old_var2new_var[var]);
+      } else if (cluster_inputs.count(var)) {
+        if (var->Var()->IsParameter()) {


Suggested change

if (var->Var()->IsParameter()) {

if (!var->Var()->IsParameter()) {

wzzju · 2021-10-15T17:22:27Z

paddle/fluid/framework/paddle2cinn/build_cinn_pass.cc

+    // link feed var to cluster op
+    for (auto* old_op : node->outputs) {
+      if (cluster.count(old_op)) {
+        var->outputs.emplace_back(old_op2new_op[old_op]);


old_op的输入应该去掉node，加上var。

… add_cinn_graph_symbolization

wzzju · 2021-10-19T02:41:02Z

paddle/fluid/framework/paddle2cinn/cinn_graph_symbolization.cc

+
+std::vector<std::unique_ptr<CinnOpDesc>>
+CinnGraphSymbolization::TransformAllGraphOpToCinn() const {
+  std::vector<std::unique_ptr<CinnOpDesc>> cinn_op_descs_;


局部变量名称的结尾不要加下划线。

wzzju · 2021-10-19T02:41:41Z

paddle/fluid/framework/paddle2cinn/cinn_graph_symbolization.cc

+}
+
+void CinnGraphSymbolization::RunGraph(const OpMapperContext& ctx) const {
+  auto cinn_op_descs_ = TransformAllGraphOpToCinn();


… add_cinn_graph_symbolization

chenwhql

LGTM for PADDLE_ENFORCE

wzzju

LGTM

add cinn graph symbolization

1e96ef6

thisjiang added 5 commits October 13, 2021 12:02

fix some bug

f775779

add paddle scope to cinn scope

ac23d17

fix conflict

5bec7a8

add paddle scope to CINN scope in Symbolization, and add feed op when…

0d01f3e

… build cinn pass

fix some bug

c85696e

wzzju reviewed Oct 15, 2021

View reviewed changes

thisjiang added 4 commits October 18, 2021 02:44

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

64210e1

… add_cinn_graph_symbolization

fix some bug by review advices

5df7f48

optimize code problem

5f9535d

revert build_cinn_pass and move the change to PaddlePaddle#36503

47478d3

wzzju reviewed Oct 19, 2021

View reviewed changes

thisjiang added 11 commits October 19, 2021 04:13

fix some bug after co-compilation

96075e3

perfect single test script

2d1abd9

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

b25bdea

… add_cinn_graph_symbolization

remove scope and rename feed_target to input_tensor

2d9a34c

using std::unordered_map instead of absl::flat_hash_map

7ed7efe

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

cdc9904

… add_cinn_graph_symbolization

fix single test bug

a2a68ce

revert to preverion for WITH_CINN has add in later PR

6428c7b

full error information for CI

4b795f9

full enfore information for CI pass

9f269c4

Merge branch 'develop' into add_cinn_graph_symbolization

467a903

chenwhql approved these changes Oct 23, 2021

View reviewed changes

wzzju approved these changes Oct 23, 2021

View reviewed changes

thisjiang merged commit bbd4bd7 into PaddlePaddle:develop Oct 23, 2021

thisjiang deleted the add_cinn_graph_symbolization branch October 23, 2021 13:55

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

add cinn graph symbolization #36417

add cinn graph symbolization #36417

thisjiang commented Oct 13, 2021

paddle-bot-old bot commented Oct 13, 2021

wzzju Oct 15, 2021

thisjiang Oct 18, 2021

wzzju Oct 15, 2021

thisjiang Oct 18, 2021

wzzju Oct 15, 2021

thisjiang Oct 18, 2021

wzzju Oct 15, 2021

thisjiang Oct 18, 2021

wzzju Oct 15, 2021

thisjiang Oct 18, 2021

wzzju Oct 15, 2021

thisjiang Oct 18, 2021

wzzju Oct 15, 2021

thisjiang Oct 18, 2021

wzzju Oct 15, 2021

thisjiang Oct 18, 2021

wzzju Oct 15, 2021

thisjiang Oct 18, 2021

wzzju Oct 15, 2021

thisjiang Oct 18, 2021

wzzju Oct 15, 2021

wzzju Oct 15, 2021 •

edited

Loading

thisjiang Oct 18, 2021

wzzju Oct 19, 2021

wzzju Oct 19, 2021

chenwhql left a comment

wzzju left a comment

	// run each op's CINN Op Mapper, finally return the graph's CINN NetBuilder.
	// run each op's CINN Op Mapper, finally return a frontend::Program object corresponding to the subgraph.


		::cinn::frontend::NetBuilder builder(builder_name);

		auto target = ::cinn::common::DefaultHostTarget();

	if (var->Var()->IsParameter()) {
	if (!var->Var()->IsParameter()) {

add cinn graph symbolization #36417

add cinn graph symbolization #36417

Conversation

thisjiang commented Oct 13, 2021

PR types

PR changes

Describe

前置PR

当前状态

流程

paddle-bot-old bot commented Oct 13, 2021

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

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

wzzju Oct 15, 2021 • 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

chenwhql left a comment

Choose a reason for hiding this comment

wzzju left a comment

Choose a reason for hiding this comment

wzzju Oct 15, 2021 •

edited

Loading