Skip to content

to_vec Tuple bug (do not merge) #14

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

Closed
Parent: Install TagBot as a GitHub Action
wants to merge 2 commits into from
Closed

to_vec Tuple bug (do not merge) #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bc5389b
Use x_vec length
willtebbutt Apr 21, 2019
430c742
Improve Diagonal implementation and test Tuple implementation
willtebbutt Apr 21, 2019
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
7 changes: 5 additions & 2 deletions src/grad.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,13 +92,16 @@ function to_vec(x::T) where {T<:LinearAlgebra.AbstractTriangular}
return x_vec, x_vec->T(reshape(back(x_vec), size(x)))
end
to_vec(x::Symmetric) = vec(Matrix(x)), x_vec->Symmetric(reshape(x_vec, size(x)))
to_vec(X::Diagonal) = vec(Matrix(X)), x_vec->Diagonal(reshape(x_vec, size(X)...))
function to_vec(X::Diagonal)
diag_vec, from_diag = to_vec(X.diag)
return diag_vec, x_vec->Diagonal(from_diag(x_vec))
end

# Non-array data structures.
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
1 change: 1 addition & 0 deletions test/grad.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ 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((Diagonal(randn(7)),))
end
end

Expand Down