[Prim][NewIR] Support forward decomposition in new IR #55480
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
你的PR提交成功，感谢你对开源项目的贡献! |
cyber-pioneer
changed the title
cxxly
reviewed
Jul 24, 2023
python/paddle/primitive/lowering.py
Outdated
| map_output_for_composite, | ||
| prepare_python_api_arguments, | ||
| ) | ||
|
|
cxxly
reviewed
Jul 24, 2023
python/paddle/primitive/lowering.py
Outdated
| block, | ||
| blacklist=frozenset(), | ||
| whitelist=frozenset(), | ||
| ): |
cxxly
reviewed
Jul 24, 2023
python/paddle/primitive/lowering.py
Outdated
| blacklist = prim_config["forward_blacklist"] | blacklist | ||
|
|
||
| with framework.program_guard(main_program): | ||
| _prim_logger.info("Decompose composite forward ops begin...") |
There was a problem hiding this comment.
use debug level for logging readonly info.
cxxly
reviewed
Jul 24, 2023
python/paddle/primitive/lowering.py
Outdated
|
|
||
| _prim_logger = get_logger( | ||
| "prim", logging.INFO, fmt='%(asctime)s-%(levelname)s: %(message)s' | ||
| ) |
There was a problem hiding this comment.
follow python logging best pratices, use module-level logger https://docs.python.org/3/howto/logging.html
cxxly
reviewed
Jul 24, 2023
python/paddle/primitive/lowering.py
Outdated
|
|
||
|
|
||
| def _decom_execute(block, op_filter): | ||
| """The operators in block wich satisfy the filter conditon will be decomposed into primitives.""" |
There was a problem hiding this comment.
decom_execute is still unreadable，consider how to spilit into different function.
cyber-pioneer
force-pushed
the
new_ir
branch
5 times, most recently
from
b745302
to
ac20305
Compare
cyber-pioneer
force-pushed
the
new_ir
branch
4 times, most recently
from
8535195
to
1c9c228
Compare
cyber-pioneer
changed the title
cyber-pioneer
force-pushed
the
new_ir
branch
5 times, most recently
from
10cb89a
to
5ea6561
Compare
cxxly
reviewed
Aug 7, 2023
| import typing | ||
|
|
||
| from paddle import ir | ||
| from paddle.fluid import core |
There was a problem hiding this comment.
fluid 逻辑已经迁移，使用paddle.framework.core
cxxly
reviewed
Aug 7, 2023
| from paddle.fluid import core | ||
| from paddle.fluid.libpaddle.ir import Block, Program | ||
|
|
||
| from .utils import get_decomp_rule |
There was a problem hiding this comment.
遵循pep8 import 规范， 非必要情况不直接import 函数/类，import模块，并通过xx.xx形式访问
cxxly
reviewed
Aug 7, 2023
| logging.debug(f"Decompose composite forward ops finish: {replace_ops}") | ||
|
|
||
|
|
||
| def _decompose_subgraph(block, op_filter): |
There was a problem hiding this comment.
加注释解释下 op_filter 功能，或者使用type_hints注明 filter是函数类型
cxxly
reviewed
Aug 7, 2023
|
|
||
| if lower: | ||
| change = True | ||
| core.prim_config["composite_ops_record"].add(op_name) |
There was a problem hiding this comment.
注意到这个信息只是给记录日志使用，是否做成无状态更好，避免使用全局变量
There was a problem hiding this comment.
decompose会在程序里调用多次，需要用使用全局变量记录所有已拆解算子的信息
cxxly
reviewed
Aug 7, 2023
| for item in block: | ||
| _decompose_subgraph(item, op_filter) | ||
| return | ||
| raise TypeError |
cxxly
reviewed
Aug 7, 2023
| # limitations under the License. | ||
|
|
||
| from .primitive_op import * # noqa: F403 | ||
| from .utils import register_decomp |
cxxly
reviewed
Aug 7, 2023
| """define composite rule of op mean""" | ||
| x_shape = x.shape | ||
| axes = axis or list(range(0, len(x_shape))) | ||
| axes = [axes] if isinstance(axes, int) else axes |
cxxly
reviewed
Aug 7, 2023
| def mean_decomp(x, axis, keepdim): | ||
| """define composite rule of op mean""" | ||
| x_shape = x.shape | ||
| axes = axis or list(range(0, len(x_shape))) |
cxxly
reviewed
Aug 7, 2023
python/paddle/primitive/utils.py
Outdated
| def register(self, op_type, rule): | ||
| assert ( | ||
| op_type not in self.rules | ||
| ), f'name "{op_type}" should not be registered before.' |
|
python中，代码组织通过目录树路径，一般文件中不再需要包名信息，建议文件命名去掉包名前缀 |
cxxly
reviewed
Aug 7, 2023
python/paddle/primitive/utils.py
Outdated
| def _decomp(*args): | ||
| return f(*args) | ||
|
|
||
| _decomposition_ops.register(op_type, _decomp) |
cxxly
reviewed
Aug 7, 2023
python/paddle/primitive/utils.py
Outdated
| if not isinstance(op_type, str): | ||
| raise TypeError(f'op_type must be str, but got {type(op_type)}.') | ||
|
|
||
| def wrapper(f): |
There was a problem hiding this comment.
使用functools.wraps，可以避免修改函数doc string
There was a problem hiding this comment.
已修改修饰器，functools.wraps此处用不上
cxxly
reviewed
Aug 7, 2023
|
|
||
| @register_decomp('pd.mean') | ||
| def mean_decomp(x, axis, keepdim): | ||
| """define composite rule of op mean""" |
cyber-pioneer
force-pushed
the
new_ir
branch
2 times, most recently
from
487510e
to
86ee55e
Compare
cyber-pioneer
changed the title
done |
YuanRisheng
approved these changes
Aug 8, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
PR types
New features
PR changes
Others
Description
Pcard-66975
To support forward decomposition in New IR.
The process is as follows：
Note:
This pr finishes base framework of forward decomposition. To finish this feature, about 3 todos case will be done: