use TensorShape for index calc #3171
Merged
Conversation
This file contains hidden or 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
chriselion
commented
Jan 7, 2020
| m_Offset = channelOffset; | ||
| m_Data = null; | ||
| m_Shape = shape; | ||
| m_TensorShape = m_Proxy.data.shape; |
Contributor
Author
There was a problem hiding this comment.
This isn't used in the tensor case, but just set it for consistency.
chriselion
commented
Jan 7, 2020
| var index = m_Batch * height * width * channels + h * width * channels + w * channels + ch; | ||
| m_Data[index + m_Offset] = value; | ||
| var index = m_TensorShape.Index(m_Batch, h, w, ch + m_Offset); | ||
| m_Data[index] = value; |
Contributor
Author
There was a problem hiding this comment.
Could compute the index for both TensorProxy and float array cases, and use m_Proxy.data[index] = value; but I don't see a strong reason for doing that. Same for the vector case.
added 2 commits
January 6, 2020 17:27
surfnerd
approved these changes
Jan 7, 2020
Contributor
surfnerd
left a comment
surfnerd
left a comment
There was a problem hiding this comment.
I like the changes. Seems a bit cleaner.
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Followup from the last PR - save a TensorShape instead of the int[] in WriteAdapter to reuse the index calculation code from there
This also undoes a signature change, since we don't need the shape when passing a TensorProxy to write (since the tensor already knows its shape).