【CINN】Enable AutoLayoutPass flag in train process #71891

liuruyan · 2025-03-25T07:17:15Z

PR Category

CINN

PR Types

New features

Description

CINN + d2s 训练场景下默认开启 AutoLayoutPass
推理场景再不默认开启，临时添加 enable_auto_layout_pass_in_inference 控制，测试全部通过后去除该 flag 并与训练统一交由 enable_auto_layout_pass flag进行控制
AutoLayoutPass 依赖于 FLAGS_cudnn_batchnorm_spatial_persistent，为不影响原逻辑，需添加 guard
添加 train_guards 方法，添加所有训练时需要的guard（暂时只有 AutoLayoutGuard）
AutoLayoutPass 虽强依赖 FLAGS_cudnn_batchnorm_spatial_persistent，但用户仍可手动设置 false 关闭该 flag

Pcard-67164

paddle-bot · 2025-03-25T07:17:20Z

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

SigureMo · 2025-03-25T08:17:01Z

python/paddle/jit/dy2static/pir_partial_program.py

@@ -822,7 +822,14 @@ def pass_fn(forward_program, backward_program, program_name_attr):

            # TODO(xiongkun) who to transfer the pruning program?
            infer_program = self.origin_runnable_program.clone()
-            if auto_layout_is_enabled():
+            # TODO(liujinnan) When CINN can perfectly handle Layout conversion, remove the judgment of whether to enable CINN.
+            if auto_layout_is_enabled() and not cinn_is_enabled(


注意下这里，不会再用 cinn_is_enabled，直接使用 self._backend.is_cinn()

SigureMo · 2025-03-25T08:22:11Z

python/paddle/jit/dy2static/pir_partial_program.py

+                paddle.set_flags(
+                    {"FLAGS_cudnn_batchnorm_spatial_persistent": True}
+                )


这个 flag 影响的是运行时还是编译期 pass 呢？是否可以用 paddle.base.framework.flag_guard 限定只影响局部呢？不然会让这个影响扩散到动转静之外

会影响运行时，已添加 Gurad

… enable_flag

SigureMo · 2025-03-25T09:17:49Z

python/paddle/jit/dy2static/pir_partial_program.py

+            bn_flag = os.getenv(
+                "FLAGS_cudnn_batchnorm_spatial_persistent", True
+            )


用 paddle.get_flags("FLAGS_cudnn_batchnorm_spatial_persistent")["FLAGS_cudnn_batchnorm_spatial_persistent"]，不建议用 os.getenv 访问 C++ flag，可以参考 #71817

等下，这个 if 是不是不太对 😂，没命中直接 run_program 也不跑了么？

按我理解是

original_bn_flag = paddle.get_flags("FLAGS_cudnn_batchnorm_spatial_persistent")["FLAGS_cudnn_batchnorm_spatial_persistent"] bn_flag = True if auto_layout_is_enabled() and not self._backend.is_cinn() else original_bn_flag with flag_guard("FLAGS_cudnn_batchnorm_spatial_persistent", bn_flag): _C_ops.run_program(...)

push上去后我也发现那个if确实不太对劲，已经修改😂

original_bn_flag也需要区分是用户设置的还是默认值，如果用户直接指定false，guard中应该与用户期望保持一致，也为false，因此使用了os.getenv来区分是否为用户输入，

因此较新的一版实现改为用户定义就按照用户定义走，否则开启layout且未开cinn，设置为True，其余情况使用paddle.get_flags获取默认值

user_bn_flag = os.getenv( "FLAGS_cudnn_batchnorm_spatial_persistent", None ) if ( user_bn_flag is None and auto_layout_is_enabled() and not self._backend.is_cinn() ): bn_flag = True else: bn_flag = ( user_bn_flag if user_bn_flag is not None else paddle.get_flags( "FLAGS_cudnn_batchnorm_spatial_persistent" )["FLAGS_cudnn_batchnorm_spatial_persistent"] ) with paddle.base.framework.flag_guard( "FLAGS_cudnn_batchnorm_spatial_persistent", bn_flag ):

感觉上述代码冗余复杂，不具备美感，因此尝试使用如下方案：

guard_creators = [] if auto_layout_is_enabled() and not self._backend.is_cinn(): # AutoLayoutPass may change layout of bn to NHWC, if not enable `FLAGS_cudnn_batchnorm_spatial_persistent`, it will revert to NCHW. So if the user does not set this Flag, we set it to True. guard_creators.append( lambda: paddle.base.framework.flag_guard( "FLAGS_cudnn_batchnorm_spatial_persistent", os.getenv("FLAGS_cudnn_batchnorm_spatial_persistent", True), ) ) with compose_guards(*guard_creators)():

可能条件里得再加一个 paddle.is_compiled_with_cuda() 😂

SigureMo

LGTMeow

… enable_flag

paddle-ci-bot · 2025-04-06T02:52:56Z

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

liuruyan · 2025-04-13T15:55:48Z

/re-run sot

liuruyan · 2025-04-13T16:02:09Z

/re-run all-failed

SigureMo

LGTMeow

一些命名建议，不影响合入

SigureMo · 2025-04-14T08:06:56Z

python/paddle/jit/dy2static/utils.py

@@ -745,6 +745,36 @@ def is_api_in_module_helper(obj, module_prefix):
    return m is not None and m.__name__.startswith(module_prefix)


+def auto_layout_guard(backend, guard_creators):


这个为啥要叫 guard 呢？或许应该叫 add_auto_layout_guard？

thx，将下一个PR中进行修复。

SigureMo · 2025-04-14T08:08:17Z

python/paddle/jit/dy2static/utils.py

+
+
+@contextmanager
+def train_guards(backend):


run_program_op 在 train 和 eval 模式都会跑，train_guards 是否不太合适？或许应该叫 runtime_guard？

thx，将下一个PR中进行修复。

* enable flag * use guard * fix bug * polish code * add paddle.is_compiled_with_cuda() * remove error env flag set * fix invalid use of getenv * enable flag in cinn * polish code * add infer flag * polish code

enable flag

3dd291b

SigureMo reviewed Mar 25, 2025

View reviewed changes

liuruyan added 3 commits March 25, 2025 08:50

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

c0f50b5

… enable_flag

use guard

a642e3d

fix bug

8387ef4

SigureMo reviewed Mar 25, 2025

View reviewed changes

liuruyan added 4 commits March 25, 2025 09:32

polish code

440e28b

add paddle.is_compiled_with_cuda()

83720e7

remove error env flag set

01cc9ca

fix invalid use of getenv

8da3223

SigureMo previously approved these changes Mar 25, 2025

View reviewed changes

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

a482fe3

… enable_flag

enable flag in cinn

fefb064

liuruyan dismissed SigureMo’s stale review via fefb064 April 9, 2025 06:22

liuruyan added 3 commits April 9, 2025 06:27

polish code

d0fd224

add infer flag

f1b21b6

polish code

f0da52e

liuruyan changed the title ~~enable flag~~ 【CINN】Enable AutoLayoutPass flag in train process Apr 14, 2025

SigureMo approved these changes Apr 14, 2025

View reviewed changes

phlrain self-requested a review April 15, 2025 06:54

phlrain approved these changes Apr 15, 2025

View reviewed changes

zyfncg merged commit 2de7752 into PaddlePaddle:develop Apr 15, 2025
39 of 44 checks passed

		@@ -745,6 +745,36 @@ def is_api_in_module_helper(obj, module_prefix):
		return m is not None and m.__name__.startswith(module_prefix)


		def auto_layout_guard(backend, guard_creators):

【CINN】Enable AutoLayoutPass flag in train process #71891

【CINN】Enable AutoLayoutPass flag in train process #71891

Uh oh!

Conversation

liuruyan commented Mar 25, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

PR Category

PR Types

Description

Uh oh!

paddle-bot bot commented Mar 25, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

liuruyan Mar 25, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

SigureMo left a comment

Choose a reason for hiding this comment

Uh oh!

paddle-ci-bot bot commented Apr 6, 2025

Uh oh!

liuruyan commented Apr 13, 2025

Uh oh!

liuruyan commented Apr 13, 2025

Uh oh!

SigureMo left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

liuruyan commented Mar 25, 2025 •

edited

Loading

liuruyan Mar 25, 2025 •

edited

Loading