Fix batch matching for batch mat mul #7062
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
mattsoulanille
approved these changes
Nov 19, 2022
Comment on lines
+118
to
+121
| a3dValues[batchIndexA * aBatch + i * aOuterStep + k * aInnerStep]; | ||
| const bVal = | ||
| b3dValues[k * bInnerStep + j * bOuterStep + batchOffsetB]; | ||
| // tslint:disable-next-line: max-line-length | ||
| b3dValues[k * bInnerStep + j * bOuterStep + batchIndexB * bBatch]; |
There was a problem hiding this comment.
I was wondering why k matched with aInnerStep but did not then match with bOuterStep, but I see now that bOuterStep and bInnerStep are opposite to aOuterStep and aInnerStep (lines 82 - 87). They don't refer to 'rows' and 'columns' of the matrices being multiplied, where you would step a's row index with b's column index for the dot product.
No action necessary.
pyu10055
approved these changes
Nov 21, 2022
There was a problem hiding this comment.
Thanks, we can move the batch variable assignment up to the loop of bi, given those assignment only depends on the bi value not other loop variables. It can be a separate PR.
Reviewable status:
complete! 2 of 1 approvals obtained (waiting on @Linchenn and @mattsoulanille)
Linchenn
added a commit
to Linchenn/tfjs
that referenced
this pull request
Jan 9, 2023
BUG * fix * lint * fix
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.
Fix #7061 for CPU, WASM (native implementation) and WebGL backends.
This error is because of batch mismatch when A has more dimensions than B, and vice versa.
For example: A's shape is
[2,4,3,3]and B's shape is[4,3,3]. Then A's batch is the first two dimensions[2, 4]while B's batch is the first dimension[4], so B's batch is supposed to be broadcasted to be[2, 4]. Then, to computeoutput[1][0][0][0], we have to do dot product ofA[1][0] [0][...]withB[0] [...][0], but the current algorithm is doing dot product ofA[1][0][0][...]withB[3][...][0].To see the logs from the Cloud Build CI, please join either our discussion or announcement mailing list.
This change is