【Hackathon No.89】 Remove circle import Part2 #51199

Liyulingyue · 2023-03-04T14:09:14Z

PR types

Others

PR changes

Others

Describe

【PaddlePaddle Hackathon 4】核心框架开源贡献其他任务合集 #50663 (comment)

Details

根据核心框架开源贡献赛道——其他 #50711 将jit下的import移动到文件头部
python\paddle\jit\dy2static\call_transformer.py
- from paddle.jit.dy2static.convert_call_func import is_builtin 直接移动到文件头
python\paddle\jit\dy2static\convert_call_func.py
- import six：PASS
- from paddle.nn import Sequential：未处理
- from paddle.jit.dy2static.program_translator import (
  StaticFunction,
  convert_to_static,
  unwrap_decorators,
  )：移动CONVERSION_OPTIONS的声明到program_translator，统一import program_translator
python\paddle\jit\dy2static\convert_operators.py
- from paddle.fluid.dygraph.base import in_declarative_mode：暂不处理
- from paddle.static.nn.control_flow import Assert：暂不处理
python\paddle\jit\dy2static\partial_program.py
- from paddle.incubate.autograd.primapi import to_prim：暂不处理
- from paddle.amp.auto_cast import _in_amp_guard, _in_pure_fp16_guard：暂不处理
python\paddle\jit\dy2static\program_translator.py
- from paddle.static import InputSpec：暂不处理
- from paddle.incubate.autograd.primapi import to_prim：暂不处理
- from paddle.fluid.dygraph.base import switch_declarative_mode_guard：暂不处理
- from paddle.jit.dy2static.program_translator import (
  ProgramTranslator,
  )：直接删除
python\paddle\jit\dy2static\utils.py
- from paddle.jit.dy2static.return_transformer import (
  RETURN_NO_VALUE_MAGIC_NUM,
  )：将声明迁移到utils
- import paddle # noqa: F401
- import paddle.fluid as fluid # noqa: F401
- import paddle.fluid.dygraph as dygraph # noqa: F401
- import paddle.fluid.layers as layers # noqa: F401
- import paddle.jit.dy2static as _jst # noqa: F401
- from paddle import to_tensor # noqa: F401
- from paddle.fluid.dygraph import to_variable # noqa: F401
- import numpy as np # noqa: F401：上述均暂不修改
- from .static_analysis import StaticAnalysisVisitor：暂不处理，在下个PR中解决
- from paddle.jit.dy2static.static_analysis import NodeVarType：暂不处理，在下个PR中解决，这两个对static_analysis的引用可能都需要迁移logging和static中的实现，可能需要修改_init_.py
- from paddle.jit.dy2static.ifelse_transformer import (
  FALSE_FUNC_PREFIX,
  TRUE_FUNC_PREFIX,
  )：将声明移动到utils
- from paddle.jit.dy2static.loop_transformer import (
  FOR_BODY_PREFIX,
  FOR_CONDITION_PREFIX,
  WHILE_BODY_PREFIX,
  )：将声明移动到utils

…m_translator.py

paddle-bot · 2023-03-04T14:09: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.

Aurelius84 · 2023-03-08T03:52:16Z

python/paddle/jit/dy2static/convert_call_func.py

 from typing import Any, List

 import numpy

 from paddle.fluid.dygraph.layers import Layer
 from paddle.jit.dy2static.logging_utils import TranslatorLogger
-from paddle.jit.dy2static.utils import is_paddle_func, unwrap
+from paddle.jit.dy2static.utils import is_builtin, is_paddle_func, unwrap


后续 from paddle.jit.dy2static.xxx 可以考虑优化为 from .xxx 么？

Aurelius84 · 2023-03-08T03:53:58Z

python/paddle/jit/dy2static/return_transformer.py

@@ -44,7 +44,6 @@
 # should return.

 # Assign not support float64, use float32 value as magic number.
-RETURN_NO_VALUE_MAGIC_NUM = 1.77113e27
 RETURN_NO_VALUE_VAR_NAME = "__no_value_return_var"


RETURN_NO_VALUE_VAR_NAME 是否也可以考虑到utils.py里，与RETURN_NO_VALUE_MAGIC_NUM这个magic number放一起？

Aurelius84 · 2023-03-08T03:55:42Z

python/paddle/jit/dy2static/utils.py

+FALSE_FUNC_PREFIX = 'false_fn'
+
+WHILE_BODY_PREFIX = 'while_body'
+FOR_CONDITION_PREFIX = 'for_loop_condition'


可否将这些全局的config字段统一放到文件import 语句后面？

Liyulingyue · 2023-03-09T00:12:51Z

@Aurelius84 根据上述的建议修改了本PR涉及的内容。codestyle那块没法过去，因为对应的包是通过执行字符串的形式使用的，所以必须保留引用~

python/paddle/jit/dy2static/call_transformer.py

Co-authored-by: Aurelius84 <zhangliujie@baidu.com>

python/paddle/jit/dy2static/call_transformer.py

Aurelius84

LGTM

luotao1 · 2023-03-10T02:25:30Z

@Liyulingyue 请解决下冲突

paddle-bot · 2023-03-10T06:14:46Z

很抱歉，经过我们的反复讨论，你的PR暂未达到合入标准，请阅读飞桨原生算子开发规范，你可以重新提交新的PR，我们先将此PR关闭，感谢你的贡献。
Sorry to inform you that through our discussion, your PR fails to meet the merging standard (Reference: Paddle Custom Operator Design Doc). You can also submit an new one. Thank you.

Aurelius84

LGTM

Liyulingyue added 3 commits March 4, 2023 21:12

fix the only one circle import in call_transformer.py

ad91bf7

move define of CONVERSION_OPTIONS from convert_call_func.py to progra…

af67b6a

…m_translator.py

delete the self import of program_translator.py

702091a

paddle-bot bot added contributor External developers status: proposed labels Mar 4, 2023

Liyulingyue added 6 commits March 4, 2023 22:32

fix import failed problem

b2e4b17

define variable in utils.py

54208b6

move is_builtin to utils.py

20c2979

move is_builtin to utils.py

bf00483

fix import errors

c85b164

fix import errors

8d19f34

luotao1 assigned luotao1, 2742195759, Ligoml and Aurelius84 Mar 6, 2023

Aurelius84 reviewed Mar 8, 2023

View reviewed changes

fix something

39cf334

Liyulingyue requested a review from Aurelius84 March 8, 2023 21:46

Aurelius84 reviewed Mar 9, 2023

View reviewed changes

python/paddle/jit/dy2static/call_transformer.py Outdated Show resolved Hide resolved

Update python/paddle/jit/dy2static/call_transformer.py

b837d3e

Co-authored-by: Aurelius84 <zhangliujie@baidu.com>

Liyulingyue commented Mar 9, 2023

View reviewed changes

python/paddle/jit/dy2static/call_transformer.py Outdated Show resolved Hide resolved

Update python/paddle/jit/dy2static/call_transformer.py

415555a

Aurelius84 previously approved these changes Mar 9, 2023

View reviewed changes

Liyulingyue mentioned this pull request Mar 9, 2023

【Hackathon No.89】 Remove circle import Part3 #51433

Merged

Merge branch 'develop' into circle_import_2

abd4bc7

Liyulingyue dismissed Aurelius84’s stale review via abd4bc7 March 10, 2023 04:52

Liyulingyue requested a review from Aurelius84 March 10, 2023 06:12

Liyulingyue closed this Mar 10, 2023

paddle-bot bot removed the status: proposed label Mar 10, 2023

Liyulingyue reopened this Mar 10, 2023

paddle-bot bot added the status: not progressed label Mar 10, 2023

Merge branch 'PaddlePaddle:develop' into circle_import_2

68713e2

Aurelius84 approved these changes Mar 13, 2023

View reviewed changes

Aurelius84 merged commit 34358de into PaddlePaddle:develop Mar 13, 2023

Liyulingyue deleted the circle_import_2 branch March 23, 2023 11:05

Ligoml mentioned this pull request Apr 3, 2023

【PaddlePaddle Hackathon 第四期】任务总览 #51281

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

【Hackathon No.89】 Remove circle import Part2 #51199

【Hackathon No.89】 Remove circle import Part2 #51199

Liyulingyue commented Mar 4, 2023 •

edited

paddle-bot bot commented Mar 4, 2023

Aurelius84 Mar 8, 2023

Aurelius84 Mar 8, 2023

Aurelius84 Mar 8, 2023

Liyulingyue commented Mar 9, 2023 •

edited

Aurelius84 left a comment

luotao1 commented Mar 10, 2023

paddle-bot bot commented Mar 10, 2023

Aurelius84 left a comment

【Hackathon No.89】 Remove circle import Part2 #51199

【Hackathon No.89】 Remove circle import Part2 #51199

Conversation

Liyulingyue commented Mar 4, 2023 • edited

PR types

PR changes

Describe

Details

paddle-bot bot commented Mar 4, 2023

Aurelius84 Mar 8, 2023

Choose a reason for hiding this comment

Aurelius84 Mar 8, 2023

Choose a reason for hiding this comment

Aurelius84 Mar 8, 2023

Choose a reason for hiding this comment

Liyulingyue commented Mar 9, 2023 • edited

Aurelius84 left a comment

Choose a reason for hiding this comment

luotao1 commented Mar 10, 2023

paddle-bot bot commented Mar 10, 2023

Aurelius84 left a comment

Choose a reason for hiding this comment

Liyulingyue commented Mar 4, 2023 •

edited

Liyulingyue commented Mar 9, 2023 •

edited