Skip to content

Fix issue with tuples #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 6, 2019
Merged

Fix issue with tuples #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/grad.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,6 @@ function to_vec(x::Tuple)
x_vecs, x_backs = zip(map(to_vec, x)...)
sz = cumsum([map(length, x_vecs)...])
return vcat(x_vecs...), function(v)
return ntuple(n->x_backs[n](v[sz[n]-length(x[n])+1:sz[n]]), length(x))
return ntuple(n->x_backs[n](v[sz[n]-length(x_vecs[n])+1:sz[n]]), length(x))
end
end
17 changes: 17 additions & 0 deletions test/grad.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,19 @@
using FDM: grad, jacobian, _jvp, _j′vp, jvp, j′vp, to_vec

# Dummy type where length(x::DummyType) ≠ length(first(to_vec(x)))
struct DummyType{TX<:Matrix}
X::TX
end

function FDM.to_vec(x::DummyType)
x_vec, back = to_vec(x.X)
return x_vec, x_vec -> DummyType(back(x_vec))
end

Base.:(==)(x::DummyType, y::DummyType) = x.X == y.X
Base.length(x::DummyType) = size(x.X, 1)


@testset "grad" begin

@testset "grad" begin
Expand Down Expand Up @@ -47,6 +61,7 @@ using FDM: grad, jacobian, _jvp, _j′vp, jvp, j′vp, to_vec
test_to_vec(UpperTriangular(randn(13, 13)))
test_to_vec(Symmetric(randn(11, 11)))
test_to_vec(Diagonal(randn(7)))
test_to_vec(DummyType(randn(2, 9)))

@testset "$T" for T in (Adjoint, Transpose)
test_to_vec(T(randn(4, 4)))
Expand All @@ -60,6 +75,8 @@ using FDM: grad, jacobian, _jvp, _j′vp, jvp, j′vp, to_vec
test_to_vec((randn(4), randn(4, 3, 2), 1))
test_to_vec((5, randn(4, 3, 2), UpperTriangular(randn(4, 4)), 2.5))
test_to_vec(((6, 5), 3, randn(3, 2, 0, 1)))
test_to_vec((DummyType(randn(2, 7)), DummyType(randn(3, 9))))
test_to_vec((DummyType(randn(3, 2)), randn(11, 8)))
end
end

Expand Down