[Dy2Stat]Allow ifelse return buildin type in paddle cond #37888
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
|
Thanks for your contribution! |
0x45f
changed the title
int in paddle cond
Aurelius84
reviewed
Dec 8, 2021
| # false_args = [ | ||
| # to_static_variable(var) if id(var) in return_var_ids else var | ||
| # for var in false_args | ||
| # ] |
| @@ -102,6 +102,28 @@ def select_input(inputs, mask): | |||
| return out | |||
|
|
|||
|
|
|||
| def select_input_with_buildin_type(inputs, mask): | |||
| from paddle.fluid.dygraph.dygraph_to_static.variable_trans_func import to_static_variable | |||
| @@ -2284,6 +2306,8 @@ def append_conditional_block_grad(self, parent_block, inside_block, | |||
| def copy_var_to_parent_block(var, layer_helper): | |||
| if var is None: | |||
| return None | |||
| if isinstance(var, (bool, float, six.integer_types)): | |||
There was a problem hiding this comment.
Suggested change
| if isinstance(var, (bool, float, six.integer_types)): | |
| if not isinstance(var, Variable): |
只要不是variable类型都直接返回。
| isinstance(true_var, Variable)) or (isinstance(true_var, ( | ||
| bool, float, six.integer_types)) and isinstance(false_var, | ||
| Variable)): | ||
| inputs = [to_static_variable(false_var), to_static_variable(true_var)] |
There was a problem hiding this comment.
这里的处理逻辑是：
- true_var、false_var 都不是variable，则直接判断是否相等（包括list、dict等其他类型）
- true_var、false_var 其中有一个是Variable，PR的逻辑是会将其中一个转为Variable返回，这个合理么？
0x45f
added a commit
to 0x45f/Paddle
that referenced
this pull request
Jan 4, 2022
…e#37888) * allow ifelse return `int` in paddle cond * add test and refine code * polish code, add test * code format
lanxianghit
pushed a commit
that referenced
this pull request
Jan 5, 2022
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
Others
PR changes
Others
Describe
PR的修改如下：