support complex input for upsample #421
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
ToucheSir
reviewed
Jun 14, 2022
src/upsample.jl
Outdated
| width_scale = T((in_w - 1) // (out_w - 1)) | ||
| height_scale = T((in_h - 1) // (out_h - 1)) | ||
| #real(T)() and // so that we can handle rationals (super slow) | ||
| width_scale =real(T)((in_w - 1) // (out_w - 1)) |
There was a problem hiding this comment.
Do you mind extracting out real(T) as RT or some like name? Otherwise this LGTM.
ToucheSir
reviewed
Jun 14, 2022
test/upsample.jl
Outdated
Comment on lines
177
to
193
| for (d, method) in zip([1, 2, 3], [upsample_linear, upsample_bilinear, upsample_trilinear]) | ||
| for (k, interp) in zip((2, tuple([2 for i=1:d]...)), [method, upsample_nearest]) | ||
| x = randn(Complex{Float32}, (4,8,12)[1:d]..., 1, 1) | ||
| xup = interp(x, k) | ||
| @test size(xup)[1:d] == (8,16,24)[1:d] | ||
| @test real(xup) == interp(real(x), k) | ||
| @test imag(xup) == interp(imag(x), k) | ||
|
|
||
| xup = interp(x; size=(8,24,48)[1:d]) | ||
| @test size(xup)[1:d] == (8,24,48)[1:d] | ||
| @test real(xup) == interp(real(x), size=(8,24,48)[1:d]) | ||
| @test imag(xup) == interp(imag(x), size=(8,24,48)[1:d]) | ||
| end | ||
| end |
There was a problem hiding this comment.
Suggested change
| for (d, method) in zip([1, 2, 3], [upsample_linear, upsample_bilinear, upsample_trilinear]) | |
| for (k, interp) in zip((2, tuple([2 for i=1:d]...)), [method, upsample_nearest]) | |
| x = randn(Complex{Float32}, (4,8,12)[1:d]..., 1, 1) | |
| xup = interp(x, k) | |
| @test size(xup)[1:d] == (8,16,24)[1:d] | |
| @test real(xup) == interp(real(x), k) | |
| @test imag(xup) == interp(imag(x), k) | |
| xup = interp(x; size=(8,24,48)[1:d]) | |
| @test size(xup)[1:d] == (8,24,48)[1:d] | |
| @test real(xup) == interp(real(x), size=(8,24,48)[1:d]) | |
| @test imag(xup) == interp(imag(x), size=(8,24,48)[1:d]) | |
| end | |
| end | |
| for (d, method) in zip(1:3, [upsample_linear, upsample_bilinear, upsample_trilinear]) | |
| for (k, interp) in zip((2, ntuple(_ -> 2, d)), [method, upsample_nearest]) | |
| x = randn(ComplexF32, (4, 8, 12)[1:d]..., 1, 1) | |
| upsize = (8, 16, 24)[1:d] | |
| xup = interp(x, k) | |
| @test size(xup)[1:d] == upsize | |
| @test real(xup) == interp(real(x), k) | |
| @test imag(xup) == interp(imag(x), k) | |
| upsize = (8, 24, 48)[1:d] | |
| xup = interp(x; size=upsize) | |
| @test size(xup)[1:d] == upsize | |
| @test real(xup) == interp(real(x), size=upsize) | |
| @test imag(xup) == interp(imag(x), size=upsize) | |
| end | |
| end |
One more touch-up
mloubout
pushed a commit
to mloubout/NNlib.jl
that referenced
this pull request
Jun 14, 2022
support complex input for upsample
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.
The current implementation uses the array input type to convert width/height/.... which creates non-real numbers when the input is complex. This fixes it by using the real type.