Skip to content

Preserve tracked array wrappers in restructure #498

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

Draft
ChrisRackauckas-Claude wants to merge 1 commit into
base: master
Choose a base branch
from
+41 −11
Draft

Preserve tracked array wrappers in restructure #498

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
8 changes: 8 additions & 0 deletions ext/ArrayInterfaceReverseDiffExt.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,13 @@ end
function ArrayInterface.restructure(x::Array, y::ReverseDiff.TrackedArray)
reshape(y, Base.size(x)...)
end
function ArrayInterface.restructure(x::ReverseDiff.TrackedArray, y::ReverseDiff.TrackedArray)
reshape(y, Base.size(x)...)
end
function ArrayInterface.restructure(
x::ReverseDiff.TrackedArray, y::AbstractArray{<:ReverseDiff.TrackedReal}
)
reshape(ArrayInterface.aos_to_soa(y), Base.size(x)...)
end

end # module
12 changes: 11 additions & 1 deletion ext/ArrayInterfaceTrackerExt.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,21 @@ ArrayInterface.ismutable(::Type{<:Tracker.TrackedArray}) = false
ArrayInterface.ismutable(T::Type{<:Tracker.TrackedReal}) = false
ArrayInterface.can_setindex(::Type{<:Tracker.TrackedArray}) = false
ArrayInterface.fast_scalar_indexing(::Type{<:Tracker.TrackedArray}) = false
ArrayInterface.aos_to_soa(x::AbstractArray{<:Tracker.TrackedReal,N}) where {N} = Tracker.collect(x)
function ArrayInterface.aos_to_soa(x::AbstractArray{<:Tracker.TrackedReal, N}) where {N}
Tracker.collect(x)
end

function ArrayInterface.restructure(x::Array, y::Tracker.TrackedArray)
reshape(y, Base.size(x)...)
end
function ArrayInterface.restructure(x::Tracker.TrackedArray, y::Tracker.TrackedArray)
reshape(y, Base.size(x)...)
end
function ArrayInterface.restructure(
x::Tracker.TrackedArray, y::AbstractArray{<:Tracker.TrackedReal}
)
reshape(ArrayInterface.aos_to_soa(y), Base.size(x)...)
end
function ArrayInterface.restructure(x::Array, y::Array{<:Tracker.TrackedReal})
reshape(y, Base.size(x)...)
end
Expand Down
32 changes: 22 additions & 10 deletions test/ad.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,38 +4,50 @@ x = ReverseDiff.track([4.0])
x = reshape([ReverseDiff.track(rand(1, 1, 1))[1]], 1, 1, 1)
@test ArrayInterface.aos_to_soa(x) isa ReverseDiff.TrackedArray
@test ndims(ArrayInterface.aos_to_soa(x)) == 3
x = reduce(vcat, ReverseDiff.track([4.0,4.0]))
x = reduce(vcat, ReverseDiff.track([4.0, 4.0]))
@test ArrayInterface.aos_to_soa(x) isa ReverseDiff.TrackedArray
x = [ReverseDiff.track([4.0])[1]]
@test ArrayInterface.aos_to_soa(x) isa ReverseDiff.TrackedArray
x = reduce(vcat, ReverseDiff.track([4.0,4.0]))
x = [x[1],x[2]]
x = reduce(vcat, ReverseDiff.track([4.0, 4.0]))
x = [x[1], x[2]]
@test ArrayInterface.aos_to_soa(x) isa ReverseDiff.TrackedArray

x = Tracker.TrackedArray([4.0])
@test ArrayInterface.aos_to_soa(x) isa Tracker.TrackedArray
x = [Tracker.TrackedArray([4.0])[1]]
@test ArrayInterface.aos_to_soa(x) isa Tracker.TrackedArray
x = Tracker.TrackedArray([4.0,4.0])
x = Tracker.TrackedArray([4.0, 4.0])
@test ArrayInterface.aos_to_soa(x) isa Tracker.TrackedArray
x = reduce(vcat, Tracker.TrackedArray([4.0,4.0]))
x = [x[1],x[2]]
x = reduce(vcat, Tracker.TrackedArray([4.0, 4.0]))
x = [x[1], x[2]]
@test ArrayInterface.aos_to_soa(x) isa Tracker.TrackedArray

x = rand(4)
y = Tracker.TrackedReal.(rand(2,2))
y = Tracker.TrackedReal.(rand(2, 2))
@test ArrayInterface.restructure(x, y) isa Array
@test eltype(ArrayInterface.restructure(x, y)) <: Tracker.TrackedReal
@test size(ArrayInterface.restructure(x, y)) == (4,)
y = Tracker.TrackedArray(rand(2,2))
y = Tracker.TrackedArray(rand(2, 2))
@test ArrayInterface.restructure(x, y) isa Tracker.TrackedArray
@test size(ArrayInterface.restructure(x, y)) == (4,)
x = Tracker.TrackedArray(rand(4))
@test ArrayInterface.restructure(x, y) isa Tracker.TrackedArray
@test size(ArrayInterface.restructure(x, y)) == (4,)
y = Tracker.TrackedReal.(rand(2, 2))
@test ArrayInterface.restructure(x, y) isa Tracker.TrackedArray
@test size(ArrayInterface.restructure(x, y)) == (4,)

x = rand(4)
y = ReverseDiff.track(rand(2,2))
y = ReverseDiff.track(rand(2, 2))
@test ArrayInterface.restructure(x, y) isa ReverseDiff.TrackedArray
@test size(ArrayInterface.restructure(x, y)) == (4,)
y = ReverseDiff.track.(rand(2,2))
x = ReverseDiff.track(rand(4))
@test ArrayInterface.restructure(x, y) isa ReverseDiff.TrackedArray
@test size(ArrayInterface.restructure(x, y)) == (4,)
y = ReverseDiff.track.(rand(2, 2))
@test ArrayInterface.restructure(x, y) isa ReverseDiff.TrackedArray
@test size(ArrayInterface.restructure(x, y)) == (4,)
x = rand(4)
@test ArrayInterface.restructure(x, y) isa Array
@test eltype(ArrayInterface.restructure(x, y)) <: ReverseDiff.TrackedReal
@test size(ArrayInterface.restructure(x, y)) == (4,)
Loading