RandomHeight Preprocessing Layer #7483
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
…ctins for preprocessing layers Co-authored-by: Silvia Kocsis <silvia.kocsis@gmail.com> Co-authored-by: Natalie Umanzor <umanzor2949@gmail.com>
Co-authored-by: Silvia Kocsis <silvia.kocsis@gmail.com> Co-authored-by: Natalie Umanzor <umanzor2949@gmail.com>
…d handles randomization of width Co-authored-by: Silvia Kocsis <silvia.kocsis@gmail.com> Co-authored-by: Natalie Umanzor <umanzor2949@gmail.com>
Co-authored-by: Silvia Kocsis <silvia.kocsis@gmail.com> Co-authored-by: Natalie Umanzor <umanzor2949@gmail.com>
Co-authored-by: Silvia Kocsis <silvia.kocsis@gmail.com> Co-authored-by: Natalie Umanzor <umanzor2949@gmail.com>
Co-authored-by: Natalie Umanzor <umanzor2949@gmail.com> Co-authored-by: Ryan Wallace <ryanwallace1396@gmail.com>
…ss, got rid of rng_types as all random distribution functions seem to be stateless Co-authored-by: Natalie Umanzor <umanzor2949@gmail.com> Co-authored-by: Ryan Wallace <ryanwallace1396@gmail.com>
…nd stores random distribution functions as properties Co-authored-by: Natalie Umanzor <umanzor2949@gmail.com> Co-authored-by: Ryan Wallace <ryanwallace1396@gmail.com>
…mLayer Co-authored-by: Natalie Umanzor <umanzor2949@gmail.com> Co-authored-by: Ryan Wallace <ryanwallace1396@gmail.com>
Co-authored-by: Silvia Kocsis <silvia.kocsis@gmail.com> Co-authored-by: Natalie Umanzor <umanzor2949@gmail.com>
Co-authored-by: Silvia Kocsis <silvia.kocsis@gmail.com> Co-authored-by: Natalie Umanzor <umanzor2949@gmail.com>
Co-authored-by: Natalie Umanzor <umanzor2949@gmail.com> Co-authored-by: Ryan Wallace <ryanwallace1396@gmail.com>
Co-authored-by: Natalie Umanzor <umanzor2949@gmail.com> Co-authored-by: Ryan Wallace <ryanwallace1396@gmail.com>
Co-authored-by: Natalie Umanzor <umanzor2949@gmail.com> Co-authored-by: Ryan Wallace <ryanwallace1396@gmail.com>
…, and added test for RandomSeed Co-authored-by: Natalie Umanzor <umanzor2949@gmail.com> Co-authored-by: Ryan Wallace <ryanwallace1396@gmail.com>
Co-authored-by: Natalie Umanzor <umanzor2949@gmail.com> Co-authored-by: Ryan Wallace <ryanwallace1396@gmail.com>
Co-authored-by: Natalie Umanzor <umanzor2949@gmail.com> Co-authored-by: Ryan Wallace <ryanwallace1396@gmail.com>
mattsoulanille
requested changes
Mar 15, 2023
| override computeOutputShape(inputShape: Shape|Shape[]): Shape|Shape[] { | ||
| inputShape = getExactlyOneShape(inputShape); | ||
| const numChannels = inputShape[2]; | ||
| return [this.adjustedHeight, this.imgWidth, numChannels]; |
There was a problem hiding this comment.
The Keras implementation sets the height index to None.
>>> random_height = keras.layers.RandomHeight([0.5, 0.7])
>>> random_height.compute_output_shape([1, 224, 224, 3])
TensorShape([1, None, 224, 3])I think this is to indicate that the height of a generic tensor that this layer could create is unknown. I don't think it should be specific to the last tensor the layer created. The equivalent to None in a shape in TFJS is -1, so the above code, if written in TFJS, should return [1, -1, 224, 3]. For your code, you can just return [-1, this.imgWidth, numChannels].
This should also let you remove the this.adjustedHeight variable from the class and make it local to the call function.
There was a problem hiding this comment.
I think I missed this in my review of RandomWidth. Could you add the change there as well? Thanks!
Comment on lines
129
to
130
| this.adjustedHeight = this.heightFactor.dataSync()[0] * imgHeight; | ||
| this.adjustedHeight = Math.round(this.adjustedHeight); |
There was a problem hiding this comment.
Suggested change
| this.adjustedHeight = this.heightFactor.dataSync()[0] * imgHeight; | |
| this.adjustedHeight = Math.round(this.adjustedHeight); | |
| let adjustedHeight = this.heightFactor.dataSync()[0] * imgHeight; | |
| adjustedHeight = Math.round(this.adjustedHeight); |
| this.adjustedHeight = this.heightFactor.dataSync()[0] * imgHeight; | ||
| this.adjustedHeight = Math.round(this.adjustedHeight); | ||
|
|
||
| const size:[number, number] = [this.adjustedHeight, this.imgWidth]; |
There was a problem hiding this comment.
Suggested change
| const size:[number, number] = [this.adjustedHeight, this.imgWidth]; | |
| const size:[number, number] = [adjustedHeight, this.imgWidth]; |
…OutputShape. Co-authored-by: Natalie Umanzor <umanzor2949@gmail.com> Co-authored-by: Ryan Wallace <ryanwallace1396@gmail.com>
…ts/tfjs into randomHeight
|
Hey @mattsoulanille! Made the changes in |
chunnienc
approved these changes
Mar 20, 2023
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.
RandomHeight Preprocessing Layer
Co-authored-by:
Natalie Umanzor (@numanzor) umanzor2949@gmail.com
Silvia Kocsis (@Silvia42) silvia.kocsis@gmail.com
Ryan Wallace (@RWallie) ryanwallace1396@gmail.com
This change is