Skip to content
This repository was archived by the owner on Aug 15, 2019. It is now read-only.

Don't upload small tensors as uniforms to packed op programs #1429

Merged
merged 2 commits into from
Dec 5, 2018

Conversation

astojilj
Copy link
Contributor

@astojilj astojilj commented Dec 5, 2018

Trivial: modify the check to prevent upload to uniform when
texData.isPacked == true and program.usesPackedTextures == true.

BUG

Description

I got this reproduced from batchnorm tests with packed binary PR on and this modification of batchnormalization4D tests.
This test would run existing batchnormTests with WEBGL_PACK flag on.
although texData.isPacked == true, and program.usesPackedTextures == true. the logic would still upload the tensor to uniform.


For repository owners only:

Please remember to apply all applicable tags to your pull request.
Tags: FEATURE, BREAKING, BUG, PERF, DEV, DOC, SECURITY

For more info see: https://github.com/tensorflow/tfjs/blob/master/DEVELOPMENT.md


This change is Reviewable

Trivial: modify the check to prevent upload to uniform when
texData.isPacked == true and program.usesPackedTextures == true.

BUG
@astojilj
Copy link
Contributor Author

astojilj commented Dec 5, 2018

@annxingyuan PTAL.
I'm aware that you have a patch in queue that enables sampling from uniforms.

@annxingyuan annxingyuan self-requested a review December 5, 2018 15:27
Copy link
Collaborator

@annxingyuan annxingyuan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM - thanks a lot @astojilj for catching this! Feel free to merge.

@astojilj
Copy link
Contributor Author

astojilj commented Dec 5, 2018

LGTM - thanks a lot @astojilj for catching this! Feel free to merge.

Thanks. I don't have write access required to merge it.

@annxingyuan annxingyuan merged commit 8321471 into tensorflow:master Dec 5, 2018
@astojilj astojilj deleted the batchnormbug branch December 5, 2018 15:37
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants