[CINN] Python DSL of CINN IR #56393

6clc · 2023-08-17T08:55:36Z

PR types

Others

PR changes

Others

Description

Pcard-72423

支持通过Python DSL定制CINN Lower Level IR的主PR。

单测目录： test/cinn/ir/
e2e测试目录： test/cinn/runtime

修改IRCompare，支持对比IR的结构是否相同 cinn(py-dsl): add ir context used in python dsl #57515
封装一些需要上下文信息才能构建的IR。cinn(py-dsl): add ir context used in python dsl #57515
C++ 和 Python 通信接口。 cinn(py-dsl): add pybind interface to python #57644
解析python dsl的compute定义。 cinn(py-dsl): parse compute of python dsl #57731
解析python dsl的schedule定义。cinn(py-dsl): parse schedule of python dsl #57981
实现python dsl RunTime模块。cinn(py-dsl): add runtime module to python dsl #58009

以element wise add为例

import cinn
import numpy as np
from cinn import to_cinn_llir
from cinn.runtime.data_array import DataArray

# python dsl构造elementwise add
@to_cinn_llir
def add_kernel(X, Y, Z, N):
    for idx in range(N):
        Z[idx] = X[idx] + Y[idx]


def test_launch():
    N = 32
    X_np = np.random.random(N).astype(np.float32)
    Y_np = np.random.random(N).astype(np.float32)
    Z_np = np.zeros((N), dtype=np.float32)
    target = cinn.common.DefaultNVGPUTarget()
    
    # 构造数据
    X = DataArray.from_numpy(X_np, target)
    Y = DataArray.from_numpy(Y_np, target)
    Z = DataArray.from_numpy(Z_np, target)

    # compile and run
    add_kernel[target](X, Y, Z, N)
    
    pred = Z.to_numpy()
    gt = np.add(X_np, Y_np)
    np.testing.assert_allclose(pred, gt)

paddle-bot · 2023-08-17T08:55:40Z

你的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-08-17T08:55:42Z

✅ This PR's description meets the template requirements!
Please wait for other CI results.

zhhsplendid · 2023-08-25T03:13:22Z

paddle/cinn/ir/ir.cc

@@ -268,6 +268,27 @@ Expr For::Make(Var loop_var,

  return Expr(node);
 }
+Expr For::Make(Var loop_var, Expr min, Expr extent, Expr body) {
+  auto node = make_shared<For>();
+  CHECK(loop_var.defined());


Please add message for CHECK failure. Now we would like every error message can be user-friendly.

Reference: https://github.com/PaddlePaddle/Paddle/wiki/Paddle-Error-Message-Writing-Specification

zhhsplendid · 2023-08-25T03:17:35Z

paddle/cinn/ir/ir.cc

+  BindInfo bind_info = BindInfo();
+  node->set_bind_info(BindInfo());
+
+  if (node->is_vectorized()) CHECK(node->vectorize_info().valid());


Line 286\287, put any controlled statements inside blocks (i.e. use curly braces).

Reference: https://google.github.io/styleguide/cppguide.html#Formatting_Looping_Branching

zhhsplendid · 2023-08-25T03:22:20Z

paddle/cinn/ir/lowered_func.h

+  //! kInput: arg is input
+  //! kOutput: arg is output
+  //! kUnknown: arg maybe input or output
+  enum class IO { kInput = 0, kOutput = 1, kUnknown = 2 };


Is IO a good name? Because IO is also related to print\file\hardware\network, can we name it as InputOutputType? ArgInOutType or something else?

Indeed, this name is not very good, but so many modules of the current CINN have relied on this IO. It is too troublesome to modify. This is an enum property in ir::Argument, the ambiguity doesn't seem too serious.

zhhsplendid · 2023-08-25T03:23:07Z

paddle/cinn/ir/tensor.cc

+                      const std::vector<Expr> &shape,
+                      const std::vector<Expr> &domain,
+                      const std::vector<Var> &reduce_axis) {
+  CHECK(!name.empty()) << "Tensor name is set empty";


"Cannot set empty Tensor name in Tensor::Make"

zhhsplendid · 2023-08-25T03:26:40Z

python/cinn/runtime/cinn_jit.py

+T = TypeVar('T')
+
+
+class CINNLowerLevelIRJIT(Generic[T]):


CinnLowerLevelIrJit is a better name

zhhsplendid · 2023-08-25T03:27:50Z

python/cinn/runtime/data_array.py

+
+
+class DataArray:
+    """ """


Why is here empty comment?

zhhsplendid · 2023-08-25T03:31:44Z

python/cinn/compiler/compute_code_generator.py

+        ), f"{node.id} is not defined in context"
+        return self.local_variables[node.id]
+
+    def visit_BinOp(self, node):


Is this a temporary function?

I asked because it only handled Add here, and BinOp can potentially not only Load. So I guess it may not be correct?

The code about visit_XXX will be re-written by new commit

zhhsplendid · 2023-08-25T03:33:55Z

python/cinn/compiler/compute_code_generator.py

+        llir_var_expr = ir.Expr(llir_var)
+        self.set_value(node.target.id, llir_var_expr)
+
+        llir_for_min = ir.Expr(ast_min)


I guess LLIR For doesn't support step? Should we report error to users if user has step in for range?

step has already been checked in the previous code, almost at line 109.

assert ( len(iter_args) <= 2 ), "CINN Low Level IR does not support setting the range step"

paddle-ci-bot · 2023-09-05T03:04:41Z

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

CLAassistant · 2023-09-19T23:50:40Z

Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you sign our Contributor License Agreement before we can accept your contribution.
_{You have signed the CLA already but the status is still pending? Let us recheck it.}

CLAassistant · 2023-09-19T23:50:40Z

Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
1 out of 2 committers have signed the CLA.

✅ 6clc
❌ liuchao

liuchao seems not to be a GitHub user. You need a GitHub account to be able to sign the CLA. If you have already a GitHub account, please add the email address used for this commit to your account.
_{You have signed the CLA already but the status is still pending? Let us recheck it.}

拆分新特性：CINN Python DSL 单测和e2e测试在主开发PR上，详细见主开发PR描述 #56393 修改了IRCompare，支持对比IR的结构是否相同封装了一些需要上下文信息才能构建的IR。封装为IRContext类，开放出C++接口给Python层调用。包括下面的IR

此PR封装了Python DSL需要的C++和Python层的接口单测和e2e测试见主PR： #56393

paddle-ci-bot · 2023-09-30T03:07:20Z

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

拆分新特性：CINN Python DSL，主PR和单测见：#56393 此PR只负责解析python dsl中的compute定义 1. 装饰器@to_cinn_ir封装cinn的function kernel： CinnLowerLevelIrJit支持从Jit运行时中数据类型、target类型、python ast。后续解析compute的信息都会从CinnLowerLevelIrJit这个类中获取。 CinnLowerLevelIrJit也支持静态获取上述信息，通过python的annotation来填充。 2. compute 语义解析将整个AST分为三种类型： stmts： Function, For, If, With ，对应封装上下文IR的PR: #57515 Assign：表达式"lhs = rhs"的类型，Assign类型构成了stmts。 python/cinn/compiler/expr_executor.py中的exec_expr方法将rhs解析成cinn ir Expr python/cinn/compiler/expr_executor.py中的exec_assign方法，将lhs=rhs表达的assign语义存储在局部变量表中。 Expr：组成Assign中的rhs。 3. 变量管理 python/cinn/compiler/utils.py中的class VariableTable:用于管理Python DSL中定义的变量，主要是下面两个功能。每次Enter新的Context，会复制当前的变量表每次Exit Context，会删除当前Context增加的变量，恢复上一轮Context的变量表。

拆分新特性：CINN Python DSL，主PR和单测见：#56393 此PR只负责解析python dsl中的schedule定义

拆分新特性：CINN Python DSL 单测和e2e测试在主开发PR上，详细见主开发PR描述 PaddlePaddle#56393 修改了IRCompare，支持对比IR的结构是否相同封装了一些需要上下文信息才能构建的IR。封装为IRContext类，开放出C++接口给Python层调用。包括下面的IR

此PR封装了Python DSL需要的C++和Python层的接口单测和e2e测试见主PR： PaddlePaddle#56393

拆分新特性：CINN Python DSL，主PR和单测见：PaddlePaddle#56393 此PR只负责解析python dsl中的compute定义 1. 装饰器@to_cinn_ir封装cinn的function kernel： CinnLowerLevelIrJit支持从Jit运行时中数据类型、target类型、python ast。后续解析compute的信息都会从CinnLowerLevelIrJit这个类中获取。 CinnLowerLevelIrJit也支持静态获取上述信息，通过python的annotation来填充。 2. compute 语义解析将整个AST分为三种类型： stmts： Function, For, If, With ，对应封装上下文IR的PR: PaddlePaddle#57515 Assign：表达式"lhs = rhs"的类型，Assign类型构成了stmts。 python/cinn/compiler/expr_executor.py中的exec_expr方法将rhs解析成cinn ir Expr python/cinn/compiler/expr_executor.py中的exec_assign方法，将lhs=rhs表达的assign语义存储在局部变量表中。 Expr：组成Assign中的rhs。 3. 变量管理 python/cinn/compiler/utils.py中的class VariableTable:用于管理Python DSL中定义的变量，主要是下面两个功能。每次Enter新的Context，会复制当前的变量表每次Exit Context，会删除当前Context增加的变量，恢复上一轮Context的变量表。

拆分新特性：CINN Python DSL，主PR和单测见：PaddlePaddle#56393 此PR只负责解析python dsl中的schedule定义

拆分新特性：CINN Python DSL 单测和e2e测试在主开发PR上，详细见主开发PR描述 PaddlePaddle#56393 修改了IRCompare，支持对比IR的结构是否相同封装了一些需要上下文信息才能构建的IR。封装为IRContext类，开放出C++接口给Python层调用。包括下面的IR

此PR封装了Python DSL需要的C++和Python层的接口单测和e2e测试见主PR： PaddlePaddle#56393

拆分新特性：CINN Python DSL，主PR和单测见：PaddlePaddle#56393 此PR只负责解析python dsl中的compute定义 1. 装饰器@to_cinn_ir封装cinn的function kernel： CinnLowerLevelIrJit支持从Jit运行时中数据类型、target类型、python ast。后续解析compute的信息都会从CinnLowerLevelIrJit这个类中获取。 CinnLowerLevelIrJit也支持静态获取上述信息，通过python的annotation来填充。 2. compute 语义解析将整个AST分为三种类型： stmts： Function, For, If, With ，对应封装上下文IR的PR: PaddlePaddle#57515 Assign：表达式"lhs = rhs"的类型，Assign类型构成了stmts。 python/cinn/compiler/expr_executor.py中的exec_expr方法将rhs解析成cinn ir Expr python/cinn/compiler/expr_executor.py中的exec_assign方法，将lhs=rhs表达的assign语义存储在局部变量表中。 Expr：组成Assign中的rhs。 3. 变量管理 python/cinn/compiler/utils.py中的class VariableTable:用于管理Python DSL中定义的变量，主要是下面两个功能。每次Enter新的Context，会复制当前的变量表每次Exit Context，会删除当前Context增加的变量，恢复上一轮Context的变量表。

拆分新特性：CINN Python DSL，主PR和单测见：PaddlePaddle#56393 此PR只负责解析python dsl中的schedule定义

拆分新特性：CINN Python DSL，主PR和单测见：#56393 此PR只负责给python dsl封装cinn ir的Runtime

拆分新特性：CINN Python DSL，主PR和单测见：PaddlePaddle#56393 此PR只负责给python dsl封装cinn ir的Runtime

拆分新特性：CINN Python DSL 单测和e2e测试在主开发PR上，详细见主开发PR描述 PaddlePaddle#56393 修改了IRCompare，支持对比IR的结构是否相同封装了一些需要上下文信息才能构建的IR。封装为IRContext类，开放出C++接口给Python层调用。包括下面的IR

此PR封装了Python DSL需要的C++和Python层的接口单测和e2e测试见主PR： PaddlePaddle#56393

拆分新特性：CINN Python DSL，主PR和单测见：PaddlePaddle#56393 此PR只负责解析python dsl中的compute定义 1. 装饰器@to_cinn_ir封装cinn的function kernel： CinnLowerLevelIrJit支持从Jit运行时中数据类型、target类型、python ast。后续解析compute的信息都会从CinnLowerLevelIrJit这个类中获取。 CinnLowerLevelIrJit也支持静态获取上述信息，通过python的annotation来填充。 2. compute 语义解析将整个AST分为三种类型： stmts： Function, For, If, With ，对应封装上下文IR的PR: PaddlePaddle#57515 Assign：表达式"lhs = rhs"的类型，Assign类型构成了stmts。 python/cinn/compiler/expr_executor.py中的exec_expr方法将rhs解析成cinn ir Expr python/cinn/compiler/expr_executor.py中的exec_assign方法，将lhs=rhs表达的assign语义存储在局部变量表中。 Expr：组成Assign中的rhs。 3. 变量管理 python/cinn/compiler/utils.py中的class VariableTable:用于管理Python DSL中定义的变量，主要是下面两个功能。每次Enter新的Context，会复制当前的变量表每次Exit Context，会删除当前Context增加的变量，恢复上一轮Context的变量表。

拆分新特性：CINN Python DSL，主PR和单测见：PaddlePaddle#56393 此PR只负责解析python dsl中的schedule定义

拆分新特性：CINN Python DSL，主PR和单测见：PaddlePaddle#56393 此PR只负责给python dsl封装cinn ir的Runtime

6clc force-pushed the cinn-ir-ast branch 2 times, most recently from 483ef5f to daaa0d4 Compare August 24, 2023 01:44

zhhsplendid reviewed Aug 25, 2023

View reviewed changes

6clc force-pushed the cinn-ir-ast branch from da6b637 to d82f3bd Compare September 6, 2023 07:56

6clc force-pushed the cinn-ir-ast branch 2 times, most recently from 8950eaf to f293535 Compare September 20, 2023 01:23

6clc mentioned this pull request Sep 20, 2023

cinn(py-dsl): add ir context used in python dsl #57515

Merged

6clc force-pushed the cinn-ir-ast branch from b52d0ec to 41e6637 Compare September 21, 2023 05:53

all to one

0f87e8c

6clc force-pushed the cinn-ir-ast branch from 41e6637 to 0f87e8c Compare September 22, 2023 08:16

6clc mentioned this pull request Sep 22, 2023

cinn(py-dsl): add pybind interface to python #57644

Merged

zhhsplendid pushed a commit that referenced this pull request Sep 26, 2023

cinn(py-dsl): add pybind interface to python (#57644)

4ac172c

此PR封装了Python DSL需要的C++和Python层的接口单测和e2e测试见主PR： #56393

6clc mentioned this pull request Sep 27, 2023

cinn(py-dsl): parse compute of python dsl #57731

Merged

6clc mentioned this pull request Oct 10, 2023

cinn(py-dsl): parse schedule of python dsl #57981

Merged

zhhsplendid pushed a commit that referenced this pull request Oct 11, 2023

cinn(py-dsl): parse schedule of python dsl (#57981)

20d5a5a

拆分新特性：CINN Python DSL，主PR和单测见：#56393 此PR只负责解析python dsl中的schedule定义

6clc mentioned this pull request Oct 11, 2023

cinn(py-dsl): add runtime module to python dsl #58009

Merged

Frida-a pushed a commit to Frida-a/Paddle that referenced this pull request Oct 14, 2023

cinn(py-dsl): add pybind interface to python (PaddlePaddle#57644)

85941bc

此PR封装了Python DSL需要的C++和Python层的接口单测和e2e测试见主PR： PaddlePaddle#56393

Frida-a pushed a commit to Frida-a/Paddle that referenced this pull request Oct 14, 2023

cinn(py-dsl): parse schedule of python dsl (PaddlePaddle#57981)

9a221c0

拆分新特性：CINN Python DSL，主PR和单测见：PaddlePaddle#56393 此PR只负责解析python dsl中的schedule定义

jiahy0825 pushed a commit to jiahy0825/Paddle that referenced this pull request Oct 16, 2023

cinn(py-dsl): add pybind interface to python (PaddlePaddle#57644)

a63bfd6

此PR封装了Python DSL需要的C++和Python层的接口单测和e2e测试见主PR： PaddlePaddle#56393

jiahy0825 pushed a commit to jiahy0825/Paddle that referenced this pull request Oct 16, 2023

cinn(py-dsl): parse schedule of python dsl (PaddlePaddle#57981)

6630b62

拆分新特性：CINN Python DSL，主PR和单测见：PaddlePaddle#56393 此PR只负责解析python dsl中的schedule定义

zhhsplendid pushed a commit that referenced this pull request Oct 16, 2023

cinn(py-dsl): add runtime module to python dsl (#58009)

4cd952e

拆分新特性：CINN Python DSL，主PR和单测见：#56393 此PR只负责给python dsl封装cinn ir的Runtime

6clc closed this Oct 17, 2023

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

cinn(py-dsl): add pybind interface to python (PaddlePaddle#57644)

ef03257

此PR封装了Python DSL需要的C++和Python层的接口单测和e2e测试见主PR： PaddlePaddle#56393

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

cinn(py-dsl): parse schedule of python dsl (PaddlePaddle#57981)

1618f15

拆分新特性：CINN Python DSL，主PR和单测见：PaddlePaddle#56393 此PR只负责解析python dsl中的schedule定义

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[CINN] Python DSL of CINN IR #56393

[CINN] Python DSL of CINN IR #56393

6clc commented Aug 17, 2023 •

edited

Loading

paddle-bot bot commented Aug 17, 2023

paddle-bot bot commented Aug 17, 2023 •

edited

Loading

zhhsplendid Aug 25, 2023

6clc Aug 25, 2023

zhhsplendid Aug 25, 2023

6clc Aug 25, 2023

zhhsplendid Aug 25, 2023

6clc Aug 25, 2023

zhhsplendid Aug 25, 2023

6clc Aug 25, 2023

zhhsplendid Aug 25, 2023

6clc Aug 25, 2023

zhhsplendid Aug 25, 2023

6clc Aug 25, 2023

zhhsplendid Aug 25, 2023

6clc Aug 25, 2023 •

edited

Loading

zhhsplendid Aug 25, 2023

6clc Aug 25, 2023

paddle-ci-bot bot commented Sep 5, 2023

CLAassistant commented Sep 19, 2023 •

edited

Loading

CLAassistant commented Sep 19, 2023

paddle-ci-bot bot commented Sep 30, 2023

[CINN] Python DSL of CINN IR #56393

[CINN] Python DSL of CINN IR #56393

Conversation

6clc commented Aug 17, 2023 • edited Loading

PR types

PR changes

Description

paddle-bot bot commented Aug 17, 2023

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

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

6clc Aug 25, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

paddle-ci-bot bot commented Sep 5, 2023

CLAassistant commented Sep 19, 2023 • edited Loading

CLAassistant commented Sep 19, 2023

paddle-ci-bot bot commented Sep 30, 2023

6clc commented Aug 17, 2023 •

edited

Loading

paddle-bot bot commented Aug 17, 2023 •

edited

Loading

6clc Aug 25, 2023 •

edited

Loading

CLAassistant commented Sep 19, 2023 •

edited

Loading