TF Functionality #137
Merged
TF Functionality #137
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
Modified the lowlevel colfilter, coldfilt, rowfilter, rowdfilt functions to allow filters of any shape (tensor, np array or list). This makes it more like the numpy implementation. Wrote tests and confirmed they pass for current implementation.
Wrote new script for transform 2d Added checks in other tf scripts to make them not run if tensorflow is not installed.
Currently have to skip these tests as tensorflow can't pad more than half of the width of an input.
In between qshift filtering, if the rows or cols weren't a multiple of 4, I was adding the end row/end col twice, when the numpy implementation adds the first row & end row/first row & end col.
Not yet passing the tests however
made it [batch, height, width, channels, 6] rather than [batch, height, width, channels]
Little success so far.
* 'tf' of github.com:fbcotter/dtcwt: Removed splat from tf routines Fixed compatability import and removed splat from tests Added tf info to backends.rst
Instead of using map fn, put the channels into the batch dimensions, and do the forward transform on a batch of single channel inputs.
no longer needs tf installed to create a class instance.
Fixed the Tensorflow backend's handling of Pyramids - made it align with the numpy and opencl versions. Added the unpack function the utils.
This now makes the forward method act exactly as the forward method from the numpy backend. Handling 3 or 4d inputs is now handled solely by the forward_channels method.
|
Tanks for this! I've manually fixed the merge conflict via commit 1c11bbd which you might want to check over. I'll let Travis and coveralls take it from here.. |
rjw57
approved these changes
Sep 12, 2017
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.
Add new backend folder: 'tf', implementing the 1-D and 2-D transforms in tensorflow.
Updated docs to describe how to use these functions. Added test suite to verify functionality.