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: fix fast_substitute on subarrays of symbolic variables #1423

Merged
merged 2 commits into from
Jan 31, 2025
Merged

fix: fix fast_substitute on subarrays of symbolic variables #1423

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
e0196cf
fix: fix `fast_substitute` on subarrays of symbolic variables
AayushSabharwal Jan 30, 2025
16df6db
fix: fix `build_function` for array symbolics
AayushSabharwal Jan 31, 2025
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
15 changes: 8 additions & 7 deletions src/build_function.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ end

SymbolicUtils.Code.get_rewrites(x::Arr) = SymbolicUtils.Code.get_rewrites(unwrap(x))

function _build_function(target::JuliaTarget, op::Union{Arr, ArrayOp}, args...;
function _build_function(target::JuliaTarget, op::Union{Arr, ArrayOp, SymbolicUtils.BasicSymbolic{<:AbstractArray}}, args...;
conv = toexpr,
expression = Val{true},
expression_module = @__MODULE__(),
Expand All @@ -141,6 +141,7 @@ function _build_function(target::JuliaTarget, op::Union{Arr, ArrayOp}, args...;
linenumbers = true,
cse = false,
nanmath = true,
wrap_code = (identity, identity),
kwargs...)

dargs = map((x) -> destructure_arg(x[2], !checkbounds,
Expand All @@ -155,7 +156,7 @@ function _build_function(target::JuliaTarget, op::Union{Arr, ArrayOp}, args...;

outsym = Symbol("ˍ₋out")
body = inplace_expr(unwrap(op), outsym)
oop_expr = conv(Func([outsym, dargs...], [], body), states)
iip_expr = conv(wrap_code[2](Func([outsym, dargs...], [], body)), states)

N = length(shape(op))
op = unwrap(op)
Expand All @@ -167,18 +168,18 @@ function _build_function(target::JuliaTarget, op::Union{Arr, ArrayOp}, args...;
$outsym
end) |> LiteralExpr
end
ip_expr = conv(Func(dargs, [], op_body), states)
oop_expr = conv(wrap_code[1](Func(dargs, [], op_body)), states)
if !checkbounds
@assert Meta.isexpr(oop_expr, :function)
oop_expr.args[2] = :(@inbounds begin; $(oop_expr.args[2]); end)
@assert Meta.isexpr(ip_expr, :function)
ip_expr.args[2] = :(@inbounds begin; $(ip_expr.args[2]); end)
@assert Meta.isexpr(iip_expr, :function)
iip_expr.args[2] = :(@inbounds begin; $(iip_expr.args[2]); end)
end
if expression == Val{true}
oop_expr, ip_expr
oop_expr, iip_expr
else
_build_and_inject_function(expression_module, oop_expr),
_build_and_inject_function(expression_module, ip_expr)
_build_and_inject_function(expression_module, iip_expr)
end
end

Expand Down
2 changes: 2 additions & 0 deletions src/variable.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -606,6 +606,7 @@ function fast_substitute(expr, subs; operator = Nothing)
canfold = Ref(!(op isa Symbolic))
args = let canfold = canfold
map(args) do x
symbolic_type(x) == NotSymbolic() && !is_array_of_symbolics(x) && return x
x′ = fast_substitute(x, subs; operator)
canfold[] = canfold[] && (symbolic_type(x′) == NotSymbolic() && !is_array_of_symbolics(x′))
x′
Expand Down Expand Up @@ -633,6 +634,7 @@ function fast_substitute(expr, pair::Pair; operator = Nothing)
canfold = Ref(!(op isa Symbolic))
args = let canfold = canfold
map(args) do x
symbolic_type(x) == NotSymbolic() && !is_array_of_symbolics(x) && return x
x′ = fast_substitute(x, pair; operator)
canfold[] = canfold[] && (symbolic_type(x′) == NotSymbolic() && !is_array_of_symbolics(x′))
x′
Expand Down
11 changes: 11 additions & 0 deletions test/build_function.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,3 +290,14 @@ end
fn = build_function(T, collect(x); similarto = Array, expression = false)[1]
@test fn((1.0, 2.0)) ≈ [1.0, 4.0]
end

@testset "`build_function` with array symbolics" begin
@variables x[1:4]
for var in [x[1:2], x[1:2] .+ 0.0, Symbolics.unwrap(x[1:2])]
foop, fiip = build_function(var[1:2], x; expression = false)
@test foop(ones(4)) ≈ ones(2)
buf = zeros(2)
fiip(buf, ones(4))
@test buf ≈ ones(2)
end
end
8 changes: 8 additions & 0 deletions test/utils.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,3 +162,11 @@ end
ex2 = Symbolics.fixpoint_sub(ex, Dict(y => 1.0, z => 2.0))
@test isequal(ex2, foo([x, 1.0], 2.0))
end

@testset "`fast_substitute` of subarray symbolics" begin
@variables p[1:4] q[1:5]
@test isequal(p[1:2], Symbolics.fast_substitute(p[1:2], Dict()))
@test isequal(p[1:2], Symbolics.fast_substitute(p[1:2], p => p))
@test isequal(q[1:2], Symbolics.fast_substitute(p[1:2], Dict(p => q)))
@test isequal(q[1:2], Symbolics.fast_substitute(p[1:2], p => q))
end
Loading