[Executorch] Refactor op_add to support op_sub broadcasting #8255
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
Summary: Refactor op_add to conslidate commong broadcasting related improvements Test Plan: Previously added tests Reviewers: Subscribers: Tasks: Tags: [ghstack-poisoned]
🔗 Helpful Links🧪 See artifacts and rendered test results at hud.pytorch.org/pr/pytorch/executorch/8255
Note: Links to docs will display an error until the docs builds have been completed. ❌ 1 New FailureAs of commit 4f81db5 with merge base 5dd2ed3 ( NEW FAILURE - The following job has failed:
This comment was automatically generated by Dr. CI and updates every 15 minutes. |
facebook-github-bot
added
the
CLA Signed
Summary: Refactor op_add to conslidate commong broadcasting related improvements Test Plan: Previously added tests Reviewers: Subscribers: Tasks: Tags: [ghstack-poisoned]
swolchok
requested changes
Feb 6, 2025
| out, | ||
| "Failed to resize output tensor."); | ||
|
|
||
| ET_SWITCH_REALB_TYPES(a_type, ctx, "add.out", CTYPE, [&]() { |
There was a problem hiding this comment.
need to put const char *op_name in the template parameters and fix this
Comment on lines
168
to
169
| ET_SWITCH_REALHBBF16_TYPES(a_type, ctx, "add.out", CTYPE_A, [&]() { | ||
| ET_SWITCH_REALHBBF16_TYPES(b_type, ctx, "add.out", CTYPE_B, [&]() { |
yeah sounds good. Let me address your comments in the previous diffs |
kimishpatel
added
module: kernels
Summary: Refactor op_add to conslidate commong broadcasting related improvements Test Plan: Previously added tests Reviewers: Subscribers: Tasks: Tags: cc larryliu0820 manuelcandales [ghstack-poisoned]
Summary: Refactor op_add to conslidate commong broadcasting related improvements Test Plan: Previously added tests Reviewers: Subscribers: Tasks: Tags: cc larryliu0820 manuelcandales [ghstack-poisoned]
Summary: Refactor op_add to conslidate commong broadcasting related improvements Test Plan: Previously added tests Reviewers: Subscribers: Tasks: Tags: cc larryliu0820 manuelcandales [ghstack-poisoned]
Summary: Refactor op_add to conslidate commong broadcasting related improvements Test Plan: Previously added tests Reviewers: Subscribers: Tasks: Tags: cc larryliu0820 manuelcandales [ghstack-poisoned]
swolchok
approved these changes
Feb 11, 2025
Comment on lines
+129
to
+176
| if constexpr (is_sub) { | ||
| if (selected_optimized_path == | ||
| ElementwiseOptimizedPath::kBroadcast2dBy1dReverseArguments || | ||
| selected_optimized_path == | ||
| ElementwiseOptimizedPath::kBroadcastLastDimReverseArguments || | ||
| selected_optimized_path == | ||
| ElementwiseOptimizedPath::kBroadcastNdByNdReverseArguments) { | ||
| auto add_lambda = [&alpha_val_vec](auto x, auto y) { | ||
| return y - alpha_val_vec * x; | ||
| }; | ||
| return torch::executor::handle_broadcast_elementwise<CTYPE>( | ||
| ctx, add_lambda, a, b, out, selected_optimized_path, alpha); | ||
| } else { | ||
| auto add_lambda = [&alpha_val_vec](auto x, auto y) { | ||
| return x - alpha_val_vec * y; | ||
| }; | ||
| return torch::executor::handle_broadcast_elementwise<CTYPE>( | ||
| ctx, add_lambda, a, b, out, selected_optimized_path, alpha); | ||
| } | ||
| } else { | ||
| if (selected_optimized_path == | ||
| ElementwiseOptimizedPath::kBroadcast2dBy1dReverseArguments || | ||
| selected_optimized_path == | ||
| ElementwiseOptimizedPath::kBroadcastLastDimReverseArguments || | ||
| selected_optimized_path == | ||
| ElementwiseOptimizedPath::kBroadcastNdByNdReverseArguments) { | ||
| // Reason we swap out args here is because | ||
| // handle_broadcast_elementwise handles this selected_optimized_path | ||
| // option a bit differently. This should really be resolved in | ||
| // handle_broadcast_elementwise. However, the current blocker is that | ||
| // handle_broadcast_elementwise tries to be agnostic of op. This | ||
| // should be fixed, likely by moving lambda creation to | ||
| // handle_broadcast_elementwise and it be aware of which op is being | ||
| // executed. | ||
| auto add_lambda = [&alpha_val_vec](auto x, auto y) { | ||
| return y + alpha_val_vec * x; | ||
| }; | ||
| return torch::executor::handle_broadcast_elementwise<CTYPE>( | ||
| ctx, add_lambda, a, b, out, selected_optimized_path, alpha); | ||
| } else { | ||
| auto add_lambda = [&alpha_val_vec](auto x, auto y) { | ||
| return x + alpha_val_vec * y; | ||
| }; | ||
| return torch::executor::handle_broadcast_elementwise<CTYPE>( | ||
| ctx, add_lambda, a, b, out, selected_optimized_path, alpha); | ||
| } | ||
| } | ||
| }); |
There was a problem hiding this comment.
I think you can just select the lambdas based on is_sub rather than duplicating the rest of the code under this if constexpr: https://godbolt.org/z/Esdz1exKj
There was a problem hiding this comment.
thats a good suggestion. I tried doing the same in a different way which didnt quite work, but i can try out your suggestion
|
@kimishpatel has imported this pull request. If you are a Meta employee, you can view this diff on Phabricator. |
Summary: Refactor op_add to conslidate commong broadcasting related improvements Test Plan: Previously added tests Reviewers: Subscribers: Tasks: Tags: cc larryliu0820 manuelcandales Differential Revision: [D69491817](https://our.internmc.facebook.com/intern/diff/D69491817) [ghstack-poisoned]
Summary: Refactor op_add to conslidate commong broadcasting related improvements Test Plan: Previously added tests Reviewers: Subscribers: Tasks: Tags: cc larryliu0820 manuelcandales Differential Revision: [D69491817](https://our.internmc.facebook.com/intern/diff/D69491817) [ghstack-poisoned]
|
@kimishpatel has imported this pull request. If you are a Meta employee, you can view this diff on Phabricator. |
Summary: Refactor op_add to conslidate commong broadcasting related improvements Test Plan: Previously added tests Reviewers: Subscribers: Tasks: Tags: cc larryliu0820 manuelcandales Differential Revision: [D69491817](https://our.internmc.facebook.com/intern/diff/D69491817) [ghstack-poisoned]
|
@kimishpatel has imported this pull request. If you are a Meta employee, you can view this diff on Phabricator. |
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.
Stack from ghstack (oldest at bottom):
Summary:
Refactor op_add to conslidate commong broadcasting related improvements
Test Plan:
Previously added tests
Reviewers:
Subscribers:
Tasks:
Tags:
cc @larryliu0820 @manuelcandales
Differential Revision: D69491817