Skip to content

fix: ensure printing of wrapped ConcreteRArrays goes through our show #367

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
avik-pal merged 2 commits into from
Dec 12, 2024
+15 −8
Merged

fix: ensure printing of wrapped ConcreteRArrays goes through our show #367

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
d7d5ae6
fix: ensure printing of wrapped ConcreteRArrays goes through our show
avik-pal Dec 12, 2024
269e2c8
fix: allow wrapped arrays in mapreduce
avik-pal Dec 12, 2024
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
10 changes: 6 additions & 4 deletions src/ConcreteRArray.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,16 +195,18 @@ function Base.show(io::IO, X::ConcreteRScalar{T}) where {T}
return nothing
end

function Base.print_array(io::IO, X::ConcreteRArray)
if X.data == XLA.AsyncEmptyBuffer
function Base.print_array(io::IO, X::AnyConcreteRArray)
data = ancestor(X).data
if data == XLA.AsyncEmptyBuffer
println(io, "<Empty buffer>")
return nothing
end
return Base.print_array(io, convert(Array, X))
end

function Base.show(io::IO, X::ConcreteRArray)
if X.data == XLA.AsyncEmptyBuffer
function Base.show(io::IO, X::AnyConcreteRArray)
data = ancestor(X).data
if data == XLA.AsyncEmptyBuffer
println(io, "<Empty buffer>")
return nothing
end
Expand Down
6 changes: 6 additions & 0 deletions src/Reactant.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,12 @@ function Enzyme.make_zero(
return res
end

function ancestor(x::AbstractArray)
p_x = parent(x)
p_x === x && return x
return ancestor(p_x)
end

include("mlir/MLIR.jl")
include("XLA.jl")
include("Interpreter.jl")
Expand Down
7 changes: 3 additions & 4 deletions src/TracedRArray.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,9 +122,6 @@ function set_mlir_data!(x::AnyTracedRArray, data)
return x
end

ancestor(x::TracedRArray) = x
ancestor(x::WrappedTracedRArray) = ancestor(parent(x))

get_ancestor_indices(::TracedRArray, indices...) = indices
function get_ancestor_indices(x::WrappedTracedRArray, indices...)
return get_ancestor_indices(parent(x), Base.reindex(parentindices(x), indices)...)
Expand Down Expand Up @@ -388,10 +385,12 @@ end
function Base.mapreduce(
@nospecialize(f),
@nospecialize(op),
@nospecialize(A::TracedRArray{T,N});
@nospecialize(A::AnyTracedRArray{T,N});
dims=:,
init=nothing,
) where {T,N}
A = materialize_traced_array(A)

if dims isa Int
dims = [dims]
end
Expand Down