Skip to content

Add ProjectTo for CA #202

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 2 commits into from
Apr 10, 2023
Merged

Add ProjectTo for CA #202

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
68bc950
Add ProjectTo for CA
avik-pal Apr 5, 2023
d654990
Fix tests: gradients for Int --> Float
avik-pal Apr 6, 2023
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 Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "ComponentArrays"
uuid = "b0b7db55-cfe3-40fc-9ded-d10e2dbeff66"
authors = ["Jonnie Diegelman <[email protected]>"]
version = "0.13.9"
version = "0.13.10"

[deps]
ArrayInterface = "4fba245c-0d91-5ea0-9b3e-6abc04ee57a9"
Expand Down
12 changes: 9 additions & 3 deletions src/compat/chainrulescore.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
function ChainRulesCore.rrule(::typeof(getproperty), x::ComponentArray, s::Union{Symbol, Val})
function ChainRulesCore.rrule(::typeof(getproperty), x::ComponentArray, s::Union{Symbol,Val})
function getproperty_adjoint(Δ)
zero_x = zero(similar(x, eltype(Δ)))
setproperty!(zero_x, s, Δ)
Expand All @@ -8,6 +8,12 @@ function ChainRulesCore.rrule(::typeof(getproperty), x::ComponentArray, s::Union
return getproperty(x, s), getproperty_adjoint
end

ChainRulesCore.rrule(::typeof(getdata), x::ComponentArray) = getdata(x), Δ->(ChainRulesCore.NoTangent(), ComponentArray(Δ, getaxes(x)))
ChainRulesCore.rrule(::typeof(getdata), x::ComponentArray) = getdata(x), Δ -> (ChainRulesCore.NoTangent(), ComponentArray(Δ, getaxes(x)))

ChainRulesCore.rrule(::Type{ComponentArray}, data, axes) = ComponentArray(data, axes), Δ->(ChainRulesCore.NoTangent(), getdata(Δ), ChainRulesCore.NoTangent())
ChainRulesCore.rrule(::Type{ComponentArray}, data, axes) = ComponentArray(data, axes), Δ -> (ChainRulesCore.NoTangent(), getdata(Δ), ChainRulesCore.NoTangent())

function ChainRulesCore.ProjectTo(ca::ComponentArray)
return ChainRulesCore.ProjectTo{ComponentArray}(; project=ChainRulesCore.ProjectTo(getdata(ca)), axes=getaxes(ca))
end

(p::ChainRulesCore.ProjectTo{ComponentArray})(dx::AbstractArray) = ComponentArray(p.project(dx), p.axes)
20 changes: 9 additions & 11 deletions test/autodiff_tests.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,24 +32,22 @@ truth = ComponentArray(a = [32, 48], x = 156)
@test zygote_full ≈ truth
end

# Not sure why this doesn't work in v1.2, but I don't want to drop the tests for that just
# for this to work
if VERSION ≥ v"1.6"
@test ComponentArray(x=4,) == Zygote.gradient(ComponentArray(x=2,)) do c
(;c...,).x^2
end[1]
else
@test_skip ComponentArray(x=4,) == Zygote.gradient(ComponentArray(x=2,)) do c
(;c...,).x^2
end[1]
end
@test ComponentArray(x=4.0,) ≈ Zygote.gradient(ComponentArray(x=2,)) do c
(;c...,).x^2
end[1]

# Issue #148
ps = ComponentArray(;bias = rand(4))
out = Zygote.gradient(x -> sum(x.^3 .+ ps.bias), Zygote.seed(rand(4),Val(12)))[1]
@test out isa Vector{<:ForwardDiff.Dual}
end

@testset "Projection" begin
gs_ca = Zygote.gradient(sum, ca)[1]

@test gs_ca isa ComponentArray
end


# # This is commented out because the gradient operation itself is broken due to Zygote's inability
# # to support mutation and ComponentArray's use of mutation for construction from a NamedTuple.
Expand Down