Propagate layout in fn.reductions #4947
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
|
!build |
|
CI MESSAGE: [9014738]: BUILD STARTED |
|
CI MESSAGE: [9014738]: BUILD FAILED |
mzient
reviewed
Jul 19, 2023
Comment on lines
32
to
41
| int in_ndim = layout.size(); | ||
| assert(in_ndim >= 0 && in_ndim <= 64); | ||
| assert(axes.size() <= in_ndim); | ||
| uint64_t mask = 0; | ||
| for (auto a : axes) { | ||
| assert(0 <= a && a < in_ndim); | ||
| uint64_t a_mask = 1_u64 << a; | ||
| assert(!(mask & a_mask)); // axes must be unique for the correct out layout dim | ||
| mask |= a_mask; | ||
| } |
There was a problem hiding this comment.
Instead of defensively double-checking the axes, you can simply do uint64_t mask = to_bit_mask(axes);
mzient
reviewed
Jul 19, 2023
Comment on lines
42
to
39
| int out_ndim = in_ndim - axes.size(); | ||
| TensorLayout out_layout; | ||
| if (out_ndim <= 0) { | ||
| return out_layout; | ||
| } | ||
| out_layout.resize(out_ndim); | ||
| for (int in_idx = 0, out_idx = 0; in_idx < in_ndim; in_idx++) { | ||
| if (!(mask & (1_u64 << in_idx))) { | ||
| out_layout[out_idx++] = layout[in_idx]; | ||
| } | ||
| } |
There was a problem hiding this comment.
Simpler:
Suggested change
| int out_ndim = in_ndim - axes.size(); | |
| TensorLayout out_layout; | |
| if (out_ndim <= 0) { | |
| return out_layout; | |
| } | |
| out_layout.resize(out_ndim); | |
| for (int in_idx = 0, out_idx = 0; in_idx < in_ndim; in_idx++) { | |
| if (!(mask & (1_u64 << in_idx))) { | |
| out_layout[out_idx++] = layout[in_idx]; | |
| } | |
| } | |
| TensorLayout out_layout; | |
| for (int idx = 0; idx < layout.size(); idx++) { | |
| if (!(mask & (1_u64 << idx))) { | |
| out_layout += layout[idx]; | |
| } | |
| } |
There was a problem hiding this comment.
Nice. I missed that += op. It lets me drop the unique axes assumption.
mzient
approved these changes
Jul 19, 2023
klecki
approved these changes
Jul 19, 2023
| } | ||
|
|
||
| template <typename Input, typename Output, typename Axes> | ||
| inline void PropagateLayout(const Input &input, Output &output, Axes &&axes, bool keep_dims) { |
There was a problem hiding this comment.
Just a nitpick, but we typically do (output, input, params).
Signed-off-by: Kamil Tokarski <ktokarski@nvidia.com>
Signed-off-by: Kamil Tokarski <ktokarski@nvidia.com>
Signed-off-by: Kamil Tokarski <ktokarski@nvidia.com>
stiepan
force-pushed
the
reduce_propagate_layout
branch
from
109b9c0
to
e2a9c0b
Compare
|
!build |
|
CI MESSAGE: [9100773]: BUILD STARTED |
|
CI MESSAGE: [9100773]: BUILD PASSED |
JanuszL
pushed a commit
to JanuszL/DALI
that referenced
this pull request
Oct 13, 2023
Set layout to outputs of the family of fn.reductions (if not set already by the the specific implementation). --------- Signed-off-by: Kamil Tokarski <ktokarski@nvidia.com>
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.
Category:
Bug fix/New feature
Description:
Adds missing layout propagation to the family of
fn.reductions. The layout propagation rules are simple:keep_dimsis True, the input layout is just copied to the output.Additional information:
Here's a real-life example of an augmentation that can benefit from the layout propagation, otherwise the
center = ..line would not work.Affected modules and functionalities:
Key points relevant for the review:
Tests:
Checklist
Documentation
DALI team only
Requirements
REQ IDs: N/A
JIRA TASK: DALI-3554