Skip to content
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

fix semantics of eltype on TracedRNumber #287

Closed
wants to merge 3 commits into from
Closed

fix semantics of eltype on TracedRNumber #287

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
47bf482
fix semantics of `eltype` on `TracedRNumber`
mofeing Nov 18, 2024
b539e86
implement `concrete_eltype`
mofeing Nov 18, 2024
9f91a59
fix
mofeing Nov 19, 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
6 changes: 4 additions & 2 deletions src/ControlFlow.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,10 +142,12 @@ function get_region_removing_missing_values(compiled_fn, insertions)
return_op = MLIR.IR.terminator(block)
for (i, rt) in insertions
if rt isa TracedRNumber
attr = MLIR.IR.DenseElementsAttribute(Array{eltype(rt)}(undef, ()))
attr = MLIR.IR.DenseElementsAttribute(Array{concrete_eltype(rt)}(undef, ()))
op = MLIR.Dialects.stablehlo.constant(; value=attr)
elseif rt isa TracedRArray
attr = MLIR.IR.DenseElementsAttribute(Array{eltype(rt)}(undef, size(rt)))
attr = MLIR.IR.DenseElementsAttribute(
Array{concrete_eltype(rt)}(undef, size(rt))
)
op = MLIR.Dialects.stablehlo.constant(; value=attr)
else
error("Unknown type $(typeof(rt))")
Expand Down
6 changes: 3 additions & 3 deletions src/TracedRArray.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,7 @@ end
function elem_apply(f, args::Vararg{Any,Nargs}) where {Nargs}
if all(iszero ∘ ndims, args)
scalar_args = map(args) do arg
return promote_to(TracedRNumber{eltype(arg)}, arg)
return promote_to(TracedRNumber{concrete_eltype(arg)}, arg)
end
return f(scalar_args...)
end
Expand Down Expand Up @@ -722,7 +722,7 @@ end
function broadcast_to_size(arg::TracedRNumber, rsize)
length(rsize) == 0 && return arg
return broadcast_to_size_internal(
TracedRArray{eltype(arg),0}((), arg.mlir_data, ()), rsize
TracedRArray{concrete_eltype(arg),0}((), arg.mlir_data, ()), rsize
)
end

Expand Down Expand Up @@ -757,7 +757,7 @@ function broadcast_to_size_internal(x::TracedRArray, rsize)
@assert length(size(MLIR.IR.type(x.mlir_data))) == length(dims)
mlirty = MLIR.IR.type(x.mlir_data)

return TracedRArray{eltype(x),Int(length(rsize))}(
return TracedRArray{concrete_eltype(x),Int(length(rsize))}(
(),
MLIR.IR.result(
MLIR.Dialects.stablehlo.broadcast_in_dim(
Expand Down
11 changes: 7 additions & 4 deletions src/TracedRNumber.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,10 @@ ReactantCore.is_traced(::TracedRNumber) = true

new_traced_value(::TracedRNumber{T}) where {T} = TracedRNumber{T}((), nothing)

Base.eltype(::Type{TracedRNumber{T}}) where {T} = T
concrete_eltype(x) = eltype(x)
concrete_eltype(::TracedRNumber{T}) where {T} = T
concrete_eltype(::Type{TracedRNumber{T}}) where {T} = T
Base.eltype(::Type{T}) where {T<:TracedRNumber} = T

Base.getindex(a::TracedRNumber{T}) where {T} = a

Expand Down Expand Up @@ -210,17 +213,17 @@ end
for (T1, T2) in zip((Bool, Integer), (Bool, Integer))
@eval begin
function Base.:&(x::TracedRNumber{<:$(T1)}, y::TracedRNumber{<:$(T2)})
return TracedRNumber{promote_type(eltype(x), eltype(y))}(
return TracedRNumber{promote_type(concrete_eltype(x), concrete_eltype(y))}(
(), MLIR.IR.result(MLIR.Dialects.stablehlo.and(x.mlir_data, y.mlir_data), 1)
)
end
function Base.:|(x::TracedRNumber{<:$(T1)}, y::TracedRNumber{<:$(T2)})
return TracedRNumber{promote_type(eltype(x), eltype(y))}(
return TracedRNumber{promote_type(concrete_eltype(x), concrete_eltype(y))}(
(), MLIR.IR.result(MLIR.Dialects.stablehlo.or(x.mlir_data, y.mlir_data), 1)
)
end
function Base.:!(x::TracedRNumber{<:$(T1)})
return TracedRNumber{eltype(x)}(
return TracedRNumber{concrete_eltype(x)}(
(), MLIR.IR.result(MLIR.Dialects.stablehlo.not(x.mlir_data), 1)
)
end
Expand Down
Loading