[hannk] Clean up aliasing (v2) #6364
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
The code for aliasing tensors was janky. This cleans it up and makes a clear distinction between aliasing done to overlay buffers with crop-and-translate, vs the aliasing done when we reshape tensors. We no longer allow a given tensor to do both of these, and we give preference to Reshape aliasing first. (Cherry-picked from #6321)
|
Monday morning review ping |
dsharletg
approved these changes
Nov 1, 2021
apps/hannk/interpreter/tensor.h
Outdated
| // | ||
| // Note that this list should never have size() of 0 or 1 (the pointer should simply be null). | ||
| std::shared_ptr<std::vector<std::weak_ptr<Tensor>>> aliases_; | ||
| AliasType alias_type_ = AliasType::None; |
There was a problem hiding this comment.
Shouldn't this be inside the shared_ptr above? A tuple/struct with the vector?
There was a problem hiding this comment.
Hm, yes, that is probably a better design, will do.
apps/hannk/interpreter/tensor.h
Outdated
| @@ -207,10 +219,17 @@ class Tensor { | |||
|
|
|||
| void resize_dynamic(const Box &new_shape); | |||
|
|
|||
| bool is_alias() const { | |||
| return is_alias_; | |||
| // Return true iff this Tensor aliases another Tensor. | |||
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.
The code for aliasing tensors was janky. This cleans it up and makes a clear distinction between aliasing done to overlay buffers with crop-and-translate, vs the aliasing done when we reshape tensors. We no longer allow a given tensor to do both of these, and we give preference to Reshape aliasing first.
(Cherry-picked from #6321)