Refactor apply transformer #36899
Merged
Refactor apply transformer #36899
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! |
Aurelius84
reviewed
Nov 1, 2021
| @@ -216,6 +216,129 @@ void apply_device_guard(const OperatorBase* op_base, | |||
| } | |||
| } | |||
|
|
|||
| std::vector<OpFuncNode> apply_data_transformer(VariableValueMap& ins_map_temp, | |||
There was a problem hiding this comment.
apply_data_transformer -> apply_data_transform
There was a problem hiding this comment.
ins_map_temp 函数里修改了么？没有修改的话，这里应该是 const 修饰下？expected_kernel_key 也确认下？
| const platform::Place& place) { | ||
| auto& op_base = op_func_node.operator_base_; | ||
| auto& op = op_base; | ||
| auto inputs_names = op->Inputs(); |
There was a problem hiding this comment.
这里 op_base 和 op是同一个指针，为什么需要两个变量？另外，对于指针类型，这里要PADDLE_ENFORCE_NOT_NULL判断下
| no_data_transform_index; // record the no need transform variable index. | ||
| std::vector<OpFuncNode> copy_func_nodes; // return all the copy opfuncnode. | ||
|
|
||
| for (auto& var_name_item : ins_map_temp) { /*{{{*/ |
| @@ -272,123 +395,28 @@ void build_op_func_list(const platform::Place& place, | |||
| Scope scope; | |||
| auto expected_kernel_key = | |||
| dynamic_cast<const framework::OperatorWithKernel*>(op_base) | |||
| ->GetExpectedKernelType( | |||
| ->GetExpectedKernelType( // for all variables's type and context's | |||
| // place | |||
zhiqiu
reviewed
Nov 3, 2021
| var_name_item.second[i] = var_scope->Var(new_var_name); | ||
| } else if (need_dtype_transform_for_var(kernel_type_for_var, | ||
| expected_kernel_key)) { | ||
| // TODO(@xiongkun) add dtype judgement here) |
There was a problem hiding this comment.
Suggested change
| // TODO(@xiongkun) add dtype judgement here) | |
| PADDLE_THROW("not implemented yet") |
| @@ -216,6 +216,171 @@ void apply_device_guard(const OperatorBase* op_base, | |||
| } | |||
| } | |||
|
|
|||
| // the return value is whether data transformer is needed for this var | |||
| bool need_place_transform_for_var(const OpKernelType kernel_type_for_var, | |||
There was a problem hiding this comment.
Suggested change
| bool need_place_transform_for_var(const OpKernelType kernel_type_for_var, | |
| bool need_place_transform_for_var(const OpKernelType& kernel_type_for_var, |
|
|
||
| bool need_dtype_transform_for_var(const OpKernelType kernel_type_for_var, | ||
| const OpKernelType expected_kernel_key) { | ||
| return false; // TODO(@xiongkun) add dtype judgement here) |
There was a problem hiding this comment.
here) -> here, and I think throw error is better than return false, since it is not correct yet.
| } | ||
|
|
||
| // NOTE(@xiongkun03) | ||
| // the different of var_name and outer_name : |
| // record no need data transformer input var_id | ||
| VLOG(3) << op_base->Type() | ||
| << " found no data_transform var: " << var_name | ||
| << " with id: " << var_name; |
There was a problem hiding this comment.
var_name -> var_scope->VarId(var_name)
Aurelius84
approved these changes
Nov 5, 2021
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
Extract mem copy op as a function: apply_data_transformer