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 searching inside callable symbolics in get_variables! #1361

Merged
merged 3 commits into from
Nov 15, 2024
Merged

fix: fix searching inside callable symbolics in get_variables! #1361

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cf7438d
fix: fix searching inside callable symbolics in `get_variables!`
AayushSabharwal Nov 15, 2024
e393216
fix: handle removal of `Lux.NilSizePropagation.recursively_nillify`
AayushSabharwal Nov 15, 2024
0514859
fix: wrap symbolic before calling `outputsize` in `LuxExt`
AayushSabharwal Nov 15, 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 ext/SymbolicsLuxExt.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,10 @@ using Symbolics
using Lux.LuxCore
using Symbolics.SymbolicUtils

function Lux.NilSizePropagation.recursively_nillify(x::SymbolicUtils.BasicSymbolic{<:Vector{<:Real}})
Lux.NilSizePropagation.recursively_nillify(Symbolics.wrap(x))
@static if isdefined(Lux.NilSizePropagation, :recursively_nillify)
function Lux.NilSizePropagation.recursively_nillify(x::SymbolicUtils.BasicSymbolic{<:Vector{<:Real}})
Lux.NilSizePropagation.recursively_nillify(Symbolics.wrap(x))
end
end

@register_array_symbolic LuxCore.stateless_apply(
Expand Down
3 changes: 2 additions & 1 deletion src/utils.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ function is_singleton(e)
op = operation(e)
op === getindex && return true
iscall(op) && return is_singleton(op) # recurse to reach getindex for array element variables
return issym(op)
return issym(op) && !hasmetadata(e, CallWithParent)
else
return issym(e)
end
Expand All @@ -76,6 +76,7 @@ function get_variables!(vars, e::Symbolic, varlist=nothing)
push!(vars, e)
end
else
get_variables!(vars, operation(e), varlist)
foreach(x -> get_variables!(vars, x, varlist), arguments(e))
end
return (vars isa AbstractVector) ? unique!(vars) : vars
Expand Down
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 @@ -19,6 +19,14 @@ using Symbolics: symbolic_to_float, var_from_nested_derivative, unwrap

sorted_vars2 = Symbolics.get_variables(ex2; sort = true)
@test isequal(sorted_vars2, [x, y])

@variables c(..)
ex3 = c(x) + c(t) - c(c(t) + y)
vars3 = Symbolics.get_variables(ex3)
@test length(vars3) == 4

sorted_vars3 = Symbolics.get_variables(ex3; sort = true)
@test isequal(sorted_vars3, [c.f, t, x, y])
end

@testset "symbolic_to_float" begin
Expand Down
Loading