[metal] fix_elementwise #7467
Merged
[metal] fix_elementwise #7467
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
zhangjun
reviewed
Oct 28, 2021
Comment on lines
92
to
93
| auto op_type = KernelBase::op_type(); | ||
| op_ = op_type; |
There was a problem hiding this comment.
直接取值， ele_type_ = KernelBase::op_type()
| std::shared_ptr<MetalBuffer> params_buffer_; | ||
| DDim last_input_dims_{}; | ||
|
|
||
| std::string op_; |
| id<MTLComputePipelineState> pipline_; | ||
| std::string function_name_; | ||
| MetalContext* metal_context_; | ||
|
|
||
| int op_num; |
Comment on lines
30
to
50
| bool InputsValid(const MetalImage* input_x_, const MetalImage* input_y_) { | ||
| auto x_dims = input_x_->dim_; | ||
| auto y_dims = input_y_->dim_; | ||
|
|
||
| // check data layout | ||
| if (input_x_->transpose_ != input_y_->transpose_) return false; | ||
| // check data dims equal | ||
| if (x_dims == y_dims) return true; | ||
|
|
||
| if (x_dims[0] == y_dims[0] && x_dims[3] == y_dims[3]) { | ||
| //[1 32 1 3] | ||
| if (x_dims[1] == y_dims[1] && (x_dims[2] == 1 || y_dims[2] == 1)) return true; | ||
| //[1 1 32 3] | ||
| if (x_dims[2] == y_dims[2] && (x_dims[1] == 1 || y_dims[1] == 1)) return true; | ||
| //[1 1 1 3] | ||
| if ((x_dims[1] == 1 && x_dims[2] == 1) || (y_dims[1] == 1 && y_dims[2] == 1)) return true; | ||
| } | ||
| return false; | ||
| } | ||
|
|
||
| void ElementwiseImageCompute::PrepareForRun() { |
zhangjun
reviewed
Oct 28, 2021
|
|
||
| params_buffer_ = | ||
| std::make_shared<MetalBuffer>(metal_context_, sizeof(element_params), &element_params); | ||
|
|
||
| function_name_ = fuse_flag_ ? "elementwise_add_relu" : "elementwise_add"; | ||
|
|
||
| function_name_ = fuse_flag_ ? "elementwise_relu" : "elementwise_"; |
There was a problem hiding this comment.
elementwise_改成elementwise
zhangjun
approved these changes
Nov 3, 2021
zhangjun
pushed a commit
to zhangjun/Paddle-Lite
that referenced
this pull request
Nov 27, 2021
* fix_elementwise * fix_elementwise
zhangjun
added a commit
that referenced
this pull request
Nov 29, 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.
针对metalelementwise系列代码包括进行了重写和整合，其中包括：
add、sub、mul、div全面支持mps框架，支持broadcast
对elementwise代码进行了整合，目前通过ElementwiseImageCompute单个类的调用即可