add deny param list to solve unuse param cannot found problem #36996
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! |
wzzju
reviewed
Nov 5, 2021
| for (auto* op : cluster) { | ||
| if (deny_param_list.count(op->Name())) { | ||
| const auto* desc = op->Op(); | ||
| if (desc == nullptr) continue; |
There was a problem hiding this comment.
Suggested change
| if (desc == nullptr) continue; | |
| 这部分可能为空吗？如果没有可能就加PADDLE_ENFORCE吧。 |
There was a problem hiding this comment.
可能吧，Pass中其它地方也有类似判断
Comment on lines
59
to
66
| static std::unordered_map<std::string, std::string> deny_param_list = { | ||
| {"batch_norm", "ReserveSpace"}}; | ||
|
|
||
| bool OpHasInput(const OpDesc* op_desc, const std::string& param_name) { | ||
| const auto& inputs = op_desc->InputNames(); | ||
| return std::find(inputs.cbegin(), inputs.cend(), param_name) != inputs.cend(); | ||
| } | ||
|
|
There was a problem hiding this comment.
Suggested change
| static std::unordered_map<std::string, std::string> deny_param_list = { | |
| {"batch_norm", "ReserveSpace"}}; | |
| bool OpHasInput(const OpDesc* op_desc, const std::string& param_name) { | |
| const auto& inputs = op_desc->InputNames(); | |
| return std::find(inputs.cbegin(), inputs.cend(), param_name) != inputs.cend(); | |
| } |
| if (desc == nullptr) continue; | ||
|
|
||
| auto deny_param_name = deny_param_list.at(op->Name()); | ||
| if (OpHasInput(desc, deny_param_name)) { |
There was a problem hiding this comment.
Suggested change
| if (OpHasInput(desc, deny_param_name)) { | |
| if (desc->Inputs.count(deny_param_name)) { |
| @@ -299,17 +307,41 @@ void AddCinnOpToGraph(const GraphNodeSet& cluster, | |||
| framework::OpDesc cinn_op_desc; | |||
| cinn_op_desc.SetType(kCinnLaunchOp); | |||
| std::vector<std::string> input_names; | |||
|
|
|||
| std::unordered_set<std::string> deny_var_list; | |||
There was a problem hiding this comment.
找deny_var_list的逻辑封装成一个函数吧，返回类型为std::unordered_setstd::string 即可。
wzzju
reviewed
Nov 5, 2021
Comment on lines
61
to
64
| static std::unordered_map<std::string, std::string> deny_param_list = { | ||
| {"batch_norm", "ReserveSpace"}, | ||
| {"transpose2", "XShape"}, | ||
| {"reshape2", "XShape"}}; |
There was a problem hiding this comment.
这个还是放在函数外面吧，声明本文件的静态常量对象（注意命名），和kDelim类似，放在匿名空间中就不用加static修饰。
wzzju
reviewed
Nov 5, 2021
| @@ -56,6 +56,40 @@ namespace { | |||
| // & FLAGS_deny_cinn_ops. | |||
| constexpr char kDelim[] = ";"; | |||
|
|
|||
| std::unordered_set<std::string> GetDenyVarNamesList( | |||
There was a problem hiding this comment.
Suggested change
| std::unordered_set<std::string> GetDenyVarNamesList( | |
| std::unordered_set<std::string> GetDenyVarNames( |
wzzju
reviewed
Nov 5, 2021
| @@ -56,6 +56,64 @@ namespace { | |||
| // & FLAGS_deny_cinn_ops. | |||
| constexpr char kDelim[] = ";"; | |||
|
|
|||
| static const std::unordered_map<std::string, std::unordered_set<std::string>> | |||
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
Bug fixes
PR changes
APIs
Describe
解决
batch_norm、transpose等op存在无用输出参数，导致cinn_launch_op运行报错的问题。