[GLCC]Part-1: Add pylayer op to Support @to_static #56108

MarioLulab · 2023-08-09T07:31:07Z

PR types

New features

PR changes

Others

Description

Original requirements

It is expected that the PyLayer mechanism in the dynamic graph of the Paddle can interoperate with the @to_static of the Paddle's dynamic to static, supporting the custom layer of the PyLayer in the model to be perceived by the @to_static and correctly generating the static graph Program, and supporting the training of the dynamic to static and the exporting for inference.
So our main objective is to Enable PyLayer to Support @to_static. In this PR, we do some fundamental work for our objective, adding an operator called pylayer.

Related issues

【Feature Request】 PyLayer 功能支持动转静 @to_static 🚀: #54120

Project Records

https://github.com/MarioLulab/GLCC2023-Paddle-Record

Main works

Add a static op called pylayer which can excute block user-defined block when forward and backward.
Add some testcases for pylayer op
Add python api for pylayer op, which help users use pylayer op easily.

TO-DO works:

Enable @to_static to sense and handle the computational logic in the forward() and backward() functions in dynamic PyLayer.
Combine @to_static with pylayer op to achive the goal.

paddle-bot · 2023-08-09T07:31:12Z

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

CLAassistant · 2023-08-09T07:31:13Z

All committers have signed the CLA.

Aurelius84

Nice work!

paddle/fluid/framework/op_compatible_info.cc

paddle/fluid/operators/controlflow/CMakeLists.txt

paddle/fluid/operators/controlflow/conditional_block_op_helper.cc

paddle/fluid/operators/controlflow/conditional_block_op_helper.h

paddle/fluid/operators/controlflow/static_pylayer_op.h

paddle/fluid/operators/controlflow/static_pylayer_op.cc

python/paddle/jit/dy2static/convert_call_func.py

MarioLulab

reply

paddle/fluid/framework/op_compatible_info.cc

MarioLulab · 2023-08-11T07:15:45Z

paddle/fluid/operators/controlflow/static_pylayer_op.cc

+
+#include "paddle/fluid/operators/controlflow/static_pylayer_op.h"
+
+#include "paddle/fluid/framework/new_executor/standalone_executor.h"


有道理。目前只需要依赖 interpretercore.h

paddle/fluid/operators/controlflow/static_pylayer_op.cc

paddle/fluid/operators/controlflow/CMakeLists.txt

paddle/fluid/operators/controlflow/conditional_block_op_helper.cc

paddle/fluid/operators/controlflow/conditional_block_op_helper.h

MarioLulab · 2023-08-11T10:13:37Z

paddle/fluid/operators/controlflow/static_pylayer_op.h

+#include <vector>
+
+#include "paddle/fluid/framework/executor.h"
+#include "paddle/fluid/framework/new_executor/standalone_executor.h"


确实这两个头文件依赖不是必须的，后续将移除

Aurelius84

LGTM overall

…static_pylayer

zoooo0820

LGTM for fluid change

XiaoguangHu01

LGTM

sunzhongkai588

LGTM for docs

sunzhongkai588 · 2023-08-21T05:26:13Z

python/paddle/static/nn/static_pylayer.py

+    Returns:
+        Variable|list(Variable)|tuple(Variable): returns the output of ``forward_fn(inputs)``
+
+    Examples:


代码示例的写法，正逐步改成google style样式，参考 PaddlePaddle/docs#6096 ，

之后若有涉及到写代码示例，请采用新的写法。

好的了解了，这个之后的 pr 还会继续修改该 api，会在之后的 pr 中修改成 google style 样式

@MarioLulab 嗷对了，请同步补充一下中文文档，在 docs repo下。

另外.. code-block:: python 是两个冒号，下个pr同步修改下吧～

好的了解了，下个 pr 完善这个 api 后会一起修改

zyfncg · 2023-08-21T06:41:54Z

paddle/fluid/operators/controlflow/pylayer_op.h

一般OpMaker和Op类都放在.cc文件中，这个头文件目前看上去也没有专门使用的需要，是否可以去掉？

好的了解了，之后的 pr 还会继续修改该 api 和算子，会在之后的 pr 中将 OpMaker 放在 .cc 文件中

paddle-bot bot added contributor External developers status: proposed labels Aug 9, 2023

MarioLulab force-pushed the luqi/dev_static_pylayer branch from b8c2e37 to 1567e93 Compare August 9, 2023 08:14

MarioLulab added 8 commits August 9, 2023 08:47

complete static_pylayer op

aa91de8

finish static_pylayer op context manager

ea5798f

finish single test

a82cb65

append import path

e239421

maybe modify test/ir/inference

18501b7

percept static_pylayer op in dy2st

e7a0ee6

pre-commit code

3387842

fix python bug

fabfa33

MarioLulab force-pushed the luqi/dev_static_pylayer branch from 1567e93 to fabfa33 Compare August 9, 2023 08:48

luotao1 assigned luotao1 and Aurelius84 Aug 10, 2023

Aurelius84 reviewed Aug 11, 2023

View reviewed changes

MarioLulab added 4 commits August 11, 2023 07:19

Add base func CreateInterpreter

8e0c64a

replace forward_block and backward_block by blocks

7ee08a4

remove compile dependency of static_pylayer

47ddb57

modify header file includings

022a3ba

MarioLulab commented Aug 14, 2023

View reviewed changes

MarioLulab added 8 commits August 16, 2023 03:01

revert dy2st about pylayer

69656cf

delete debug info

1e88901

add doc for static pylayer api

1172c6e

move the logic of renaming into conttext manager

4cfe0b8

add check in python api

48415aa

add check between inside_grads and outside_grads

b12d59d

add test cases

1416b87

fix bugs in api and add testcase

821b3e6

delete debug files

1ae0bc8

MarioLulab marked this pull request as ready for review August 18, 2023 02:29

MarioLulab added 2 commits August 18, 2023 06:45

replace "static_pylayer" with "pylayer" in cpp

d86890d

add some notes and add import from backward.py

aa245e8

Aurelius84 previously approved these changes Aug 18, 2023

View reviewed changes

move helper function into control_flow_op_helper.h

fb0a2f9

MarioLulab dismissed Aurelius84’s stale review via fb0a2f9 August 18, 2023 11:02

Merge branch 'develop' of github.com:MarioLulab/Paddle into luqi/dev_…

a7946f3

…static_pylayer

MarioLulab changed the title ~~GLCC Enable PyLayer to Support @to_static~~ GLCC Add pylayer op Aug 18, 2023

fix code style

47856d5

Aurelius84 changed the title ~~GLCC Add pylayer op~~ [GLCC]Part-1: Add pylayer op to Support @to_static Aug 21, 2023

Aurelius84 approved these changes Aug 21, 2023

View reviewed changes

zoooo0820 approved these changes Aug 21, 2023

View reviewed changes

Aurelius84 requested a review from XiaoguangHu01 August 21, 2023 03:35

XiaoguangHu01 approved these changes Aug 21, 2023

View reviewed changes

Aurelius84 requested review from XiaoguangHu01 and sunzhongkai588 August 21, 2023 05:02

sunzhongkai588 approved these changes Aug 21, 2023

View reviewed changes

tianshuo78520a approved these changes Aug 21, 2023

View reviewed changes

Aurelius84 requested a review from zyfncg August 21, 2023 06:08

zyfncg reviewed Aug 21, 2023

View reviewed changes

zyfncg approved these changes Aug 21, 2023

View reviewed changes

Aurelius84 merged commit 7577a67 into PaddlePaddle:develop Aug 21, 2023

MarioLulab mentioned this pull request Aug 22, 2023

[GLCC]Part-2: @to_static support for PyLayer #56531

Merged

MarioLulab mentioned this pull request Sep 7, 2023

[GLCC]Part-3: Support jit.save and jit.load for pylayer op #57066

Merged

BeingGod pushed a commit to BeingGod/Paddle that referenced this pull request Sep 9, 2023

[GLCC]Part-1: Add pylayer op to Support @to_static (PaddlePaddle#56108)

47b2f84

MarioLulab mentioned this pull request Sep 22, 2023

[GLCC]Part-4: fix testcases for dy2st PyLayer #57633

Merged

MarioLulab deleted the luqi/dev_static_pylayer branch October 7, 2023 08:39

MarioLulab mentioned this pull request Dec 5, 2023

WAVE SUMMIT+2023下半年飞桨开源之星评选-信息征集 PaddlePaddle/community#765

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[GLCC]Part-1: Add pylayer op to Support @to_static #56108

[GLCC]Part-1: Add pylayer op to Support @to_static #56108

MarioLulab commented Aug 9, 2023 •

edited

Loading

paddle-bot bot commented Aug 9, 2023

CLAassistant commented Aug 9, 2023 •

edited

Loading

Aurelius84 left a comment

MarioLulab left a comment

MarioLulab Aug 11, 2023

MarioLulab Aug 11, 2023

Aurelius84 left a comment

zoooo0820 left a comment

XiaoguangHu01 left a comment

sunzhongkai588 left a comment

sunzhongkai588 Aug 21, 2023

MarioLulab Aug 21, 2023

sunzhongkai588 Aug 21, 2023 •

edited

Loading

MarioLulab Aug 21, 2023

zyfncg Aug 21, 2023

MarioLulab Aug 21, 2023


		#include "paddle/fluid/operators/controlflow/static_pylayer_op.h"

		#include "paddle/fluid/framework/new_executor/standalone_executor.h"

[GLCC]Part-1: Add pylayer op to Support @to_static #56108

[GLCC]Part-1: Add pylayer op to Support @to_static #56108

Conversation

MarioLulab commented Aug 9, 2023 • edited Loading

PR types

PR changes

Description

Original requirements

Related issues

Project Records

Main works

TO-DO works:

paddle-bot bot commented Aug 9, 2023

CLAassistant commented Aug 9, 2023 • edited Loading

Aurelius84 left a comment

Choose a reason for hiding this comment

MarioLulab left a comment

Choose a reason for hiding this comment

MarioLulab Aug 11, 2023

Choose a reason for hiding this comment

MarioLulab Aug 11, 2023

Choose a reason for hiding this comment

Aurelius84 left a comment

Choose a reason for hiding this comment

zoooo0820 left a comment

Choose a reason for hiding this comment

XiaoguangHu01 left a comment

Choose a reason for hiding this comment

sunzhongkai588 left a comment

Choose a reason for hiding this comment

sunzhongkai588 Aug 21, 2023

Choose a reason for hiding this comment

MarioLulab Aug 21, 2023

Choose a reason for hiding this comment

sunzhongkai588 Aug 21, 2023 • edited Loading

Choose a reason for hiding this comment

MarioLulab Aug 21, 2023

Choose a reason for hiding this comment

zyfncg Aug 21, 2023

Choose a reason for hiding this comment

MarioLulab Aug 21, 2023

Choose a reason for hiding this comment

MarioLulab commented Aug 9, 2023 •

edited

Loading

CLAassistant commented Aug 9, 2023 •

edited

Loading

sunzhongkai588 Aug 21, 2023 •

edited

Loading