SciML/ModelingToolkit.jlPublic

NotificationsYou must be signed in to change notification settings
Fork234
Star1.6k

[WIP] refactor: update to SymbolicUtils@4 and Symbolics@7#3953

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.

By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Jump to bottom

Draft

AayushSabharwal wants to merge157 commits intomaster

base:master

Choose a base branch

fromas/su-v4

Draft

[WIP] refactor: update to SymbolicUtils@4 and Symbolics@7#3953

AayushSabharwal wants to merge157 commits intomasterfromas/su-v4

+2,661 −2,225

Conversation

Copy link

Member

AayushSabharwal commentedOct 2, 2025

Checklist

Appropriate tests were added
Any code changes were done in a way that does not break public API
All documentation related to code changes were updated
The new code follows the
contributor guidelines, in particular theSciML Style Guide and
COLPRAC.
Any new documentation only uses public API

Additional context

Add any other context about the problem here.

github-actionsbot reviewed

Oct 2, 2025

View reviewed changes

Copy link

Contributor

github-actionsbot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

Remaining comments which cannot be posted as a review comment to avoid GitHub Rate Limit

JuliaFormatter

[JuliaFormatter]_{reported byreviewdog 🐶}

ModelingToolkit.jl/src/systems/connectors.jl

Line 1118 inbf11961

SymbolicUtils.promote_symtype(::typeof(instream_rt),::Type{T},::Type{S},::Type{R})where {T, S, R}= Real

[JuliaFormatter]_{reported byreviewdog 🐶}

ModelingToolkit.jl/src/systems/imperative_affect.jl

Line 73 inbf11961

[JuliaFormatter]_{reported byreviewdog 🐶}

ModelingToolkit.jl/src/systems/index_cache.jl

Line 32 inbf11961

const MaybeArrayIndexT= Union{Int, UnitRange{Int}, Base.ReshapedArray{Int, N, UnitRange{Int}}where {N}}

[JuliaFormatter]_{reported byreviewdog 🐶}

ModelingToolkit.jl/src/systems/index_cache.jl

Lines 114 to 115 inbf11961

	parse_callbacks_for_discretes!(cevs, disc_param_callbacks, constant_buffers, nonnumeric_buffers,0)
	parse_callbacks_for_discretes!(devs, disc_param_callbacks, constant_buffers, nonnumeric_buffers,length(cevs))

[JuliaFormatter]_{reported byreviewdog 🐶}

ModelingToolkit.jl/src/systems/index_cache.jl

Line 130 inbf11961

push!(disc_syms_by_symtype_by_partition[i],filter(==(partition)∘ Base.Fix1(getindex, disc_param_callbacks), buffer))

[JuliaFormatter]_{reported byreviewdog 🐶}

ModelingToolkit.jl/src/systems/index_cache.jl

Line 163 inbf11961

push!(disc_buffer_templates,map(Base.Fix1(BufferTemplate, symtype)∘ length, disc_syms_by_partition))

[JuliaFormatter]_{reported byreviewdog 🐶}

ModelingToolkit.jl/src/systems/index_cache.jl

Lines 298 to 301 inbf11961

	BSImpl.Term(; f, args)=>begin
	f=== getindex&& (idx=get(disc_idxs, args[1],nothing))!==nothing
	end
	_=>false

[JuliaFormatter]_{reported byreviewdog 🐶}

ModelingToolkit.jl/src/systems/index_cache.jl

Line 370 inbf11961

functionparse_callbacks_for_discretes!(events::Vector, disc_param_callbacks::Dict{SymbolicT, BitSet}, constant_buffers::Dict{TypeT, Set{SymbolicT}}, nonnumeric_buffers::Dict{TypeT, Set{SymbolicT}}, offset::Int)

[JuliaFormatter]_{reported byreviewdog 🐶}

ModelingToolkit.jl/src/systems/index_cache.jl

Line 445 inbf11961

function SymbolicIndexingInterface.parameter_index(ic::IndexCache, sym::Union{Num, Symbolics.Arr, Symbolics.CallAndWrap})

[JuliaFormatter]_{reported byreviewdog 🐶}

ModelingToolkit.jl/src/systems/index_cache.jl

Line 501 inbf11961

functioncheck_index_map(idxmap::Dict{SymbolicT, V}, sym::SymbolicT)::Union{V, Nothing}where {V}

[JuliaFormatter]_{reported byreviewdog 🐶}

ModelingToolkit.jl/src/systems/nonlinear/initializesystem.jl

Line 829 inbf11961

mask[i]=!iscall(eq.rhs)||operation(eq.rhs)!== StructuralTransformations.change_origin

[JuliaFormatter]_{reported byreviewdog 🐶}

ModelingToolkit.jl/src/systems/system.jl

Line 282 inbf11961

if (checksisa Bool&& checks===true|| checksisa Int&& (checks& CheckComponents)>0)&& iv!==nothing

[JuliaFormatter]_{reported byreviewdog 🐶}

ModelingToolkit.jl/src/systems/system.jl

Line 448 inbf11961

[JuliaFormatter]_{reported byreviewdog 🐶}

ModelingToolkit.jl/src/systems/systemstructure.jl

Line 755 inbf11961

fullvars[i], discmap; filterer= Symbolics.FPSubFilterer{Union{Sample, Hold, Pre}}()))

[JuliaFormatter]_{reported byreviewdog 🐶}

ModelingToolkit.jl/src/utils.jl

Line 36 inbf11961

issym(op)&&returnSSym(nameof(op); type= FnType{Tuple{symtype(iv)}, Real}, shape= SU.ShapeVecT())(iv)

[JuliaFormatter]_{reported byreviewdog 🐶}

ModelingToolkit.jl/src/utils.jl

Line 193 inbf11961

BSImpl.Term(; f)&&if fisa Differentialend=>begin

[JuliaFormatter]_{reported byreviewdog 🐶}

ModelingToolkit.jl/src/utils.jl

Line 288 inbf11961

functionprocess_variables!(var_to_name::Dict{Symbol, SymbolicT}, defs::SymmapT, guesses::SymmapT, vars::Vector{SymbolicT})

[JuliaFormatter]_{reported byreviewdog 🐶}

ModelingToolkit.jl/src/utils.jl

Line 328 inbf11961

BSImpl.Term(; f, args)&&if f=== getindexend=> args[1]

[JuliaFormatter]_{reported byreviewdog 🐶}

ModelingToolkit.jl/src/utils.jl

Line 399 inbf11961

hasmetadata(x, VariableSource)||iscall(x)&&operation(x)=== getindex&&isvariable(arguments(x)[1])::Bool

[JuliaFormatter]_{reported byreviewdog 🐶}

ModelingToolkit.jl/src/utils.jl

Line 543 inbf11961

functioncollect_scoped_vars!(unknowns::OrderedSet{SymbolicT}, parameters::OrderedSet{SymbolicT}, sys::AbstractSystem, iv::Union{SymbolicT, Nothing}; depth=1, op= Differential)

[JuliaFormatter]_{reported byreviewdog 🐶}

ModelingToolkit.jl/src/utils.jl

Line 626 inbf11961

BSImpl.Term(; f)&&if fisa Oend=>true

[JuliaFormatter]_{reported byreviewdog 🐶}

ModelingToolkit.jl/src/utils.jl

Line 635 inbf11961

BSImpl.Term(; f)&&if fisa Operatorend=> fisa O

[JuliaFormatter]_{reported byreviewdog 🐶}

ModelingToolkit.jl/src/utils.jl

Line 654 inbf11961

functioncollect_vars!(unknowns::OrderedSet{SymbolicT}, parameters::OrderedSet{SymbolicT}, expr::SymbolicT, iv::Union{SymbolicT, Nothing}; depth=0, op= Symbolics.Operator)

[JuliaFormatter]_{reported byreviewdog 🐶}

ModelingToolkit.jl/src/utils.jl

Line 672 inbf11961

functioncollect_vars!(unknowns::OrderedSet{SymbolicT}, parameters::OrderedSet{SymbolicT}, expr::AbstractArray{SymbolicT}, iv::Union{SymbolicT, Nothing}; depth=0, op= Symbolics.Operator)

[JuliaFormatter]_{reported byreviewdog 🐶}

ModelingToolkit.jl/src/utils.jl

Line 724 inbf11961

check_scope_depth(getmetadata(var, SymScope,LocalScope())::AllScopes, depth)||returnnothing

[JuliaFormatter]_{reported byreviewdog 🐶}

ModelingToolkit.jl/src/variables.jl

Line 198 inbf11961

iscall(x)&&operation(x)=== getindex&&returnsafe_getmetadata(m,arguments(x)[1], default)

[JuliaFormatter]_{reported byreviewdog 🐶}

ModelingToolkit.jl/src/variables.jl

Line 259 inbf11961

BSImpl.Term(; f, args, shape, type, metadata)&&if fisa Operatorend=>begin

[JuliaFormatter]_{reported byreviewdog 🐶}

ModelingToolkit.jl/src/variables.jl

Line 621 inbf11961

getunshifted(x::SymbolicT)= Symbolics.getmetadata(x, VariableUnshifted,nothing)::Union{SymbolicT, Nothing}

src/ModelingToolkit.jl

Comment on lines +361 to +453

		fold1=Val{false}()
		using SymbolicUtils
		using SymbolicUtils: shape
		using Symbolics
		@syms x yf(t) q[1:5]
		SymbolicUtils.Sym{SymReal}(:a; type= Real, shape= SymbolicUtils.ShapeVecT())
		x+ y
		x* y
		x/ y
		x^ y
		x^5
		6^ x
		x- y
		-y
		2y
		z=2
		dict= SymbolicUtils.ACDict{VartypeT}()
		dict[x]=1
		dict[y]=1
		type::typeof(DataType)=rand()<0.5? Real: Float64
		nt= (; type, shape, unsafe=true)
		Base.pairs(nt)
		BSImpl.AddMul{VartypeT}(1, dict, SymbolicUtils.AddMulVariant.MUL; type, shape= SymbolicUtils.ShapeVecT(), unsafe=true)
		*(y, z)
		*(z, y)
		SymbolicUtils.symtype(y)
		f(x)
		(5x/5)
		expand((x+ y)^2)
		simplify(x^ (1//2)+ (sin(x)^2+cos(x)^2)+2(x+ y)- x- y)
		ex= x+2y+sin(x)
		rules1=Dict(x=> y)
		rules2=Dict(x=>1)
		Dx=Differential(x)
		Differential(y)(ex)
		uex=unwrap(ex)
		Symbolics.executediff(Dx, uex)
		# Running `fold = Val(true)` invalidates the precompiled statements
		# for `fold = Val(false)` and itself doesn't precompile anyway.
		# substitute(ex, rules1)
		substitute(ex, rules1; fold= fold1)
		substitute(ex, rules2; fold= fold1)
		@variables foo
		f(foo)
		@variables x yf(::Real) q[1:5]
		x+ y
		x* y
		x/ y
		x^ y
		x^5
		# 6 ^ x
		x- y
		-y
		2y
		symtype(y)
		z=2
		*(y, z)
		*(z, y)
		f(x)
		(5x/5)
		[x, y]
		[x, f, f]
		promote_type(Int, Num)
		promote_type(Real, Num)
		promote_type(Float64, Num)
		# expand((x + y) ^ 2)
		# simplify(x ^ (1//2) + (sin(x) ^ 2 + cos(x) ^ 2) + 2(x + y) - x - y)
		ex= x+2y+sin(x)
		rules1=Dict(x=> y)
		# rules2 = Dict(x => 1)
		# Running `fold = Val(true)` invalidates the precompiled statements
		# for `fold = Val(false)` and itself doesn't precompile anyway.
		# substitute(ex, rules1)
		substitute(ex, rules1; fold= fold1)
		Symbolics.linear_expansion(ex, y)
		# substitute(ex, rules2; fold = fold1)
		# substitute(ex, rules2)
		# substitute(ex, rules1; fold = fold2)
		# substitute(ex, rules2; fold = fold2)
		q[1]
		q'q
		using ModelingToolkit

Copy link

Contributor

github-actionsbotOct 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

[JuliaFormatter]_{reported byreviewdog 🐶}

Suggested change

	fold1=Val{false}()
	using SymbolicUtils
	using SymbolicUtils: shape
	using Symbolics
	@syms x yf(t) q[1:5]
	SymbolicUtils.Sym{SymReal}(:a; type= Real, shape= SymbolicUtils.ShapeVecT())
	x+ y
	x* y
	x/ y
	x^ y
	x^5
	6^ x
	x- y
	-y
	2y
	z=2
	dict= SymbolicUtils.ACDict{VartypeT}()
	dict[x]=1
	dict[y]=1
	type::typeof(DataType)=rand()<0.5? Real: Float64
	nt= (; type, shape, unsafe=true)
	Base.pairs(nt)
	BSImpl.AddMul{VartypeT}(1, dict, SymbolicUtils.AddMulVariant.MUL; type, shape= SymbolicUtils.ShapeVecT(), unsafe=true)
	*(y, z)
	*(z, y)
	SymbolicUtils.symtype(y)
	f(x)
	(5x/5)
	expand((x+ y)^2)
	simplify(x^ (1//2)+ (sin(x)^2+cos(x)^2)+2(x+ y)- x- y)
	ex= x+2y+sin(x)
	rules1=Dict(x=> y)
	rules2=Dict(x=>1)
	Dx=Differential(x)
	Differential(y)(ex)
	uex=unwrap(ex)
	Symbolics.executediff(Dx, uex)
	# Running `fold = Val(true)` invalidates the precompiled statements
	# for `fold = Val(false)` and itself doesn't precompile anyway.
	# substitute(ex, rules1)
	substitute(ex, rules1; fold= fold1)
	substitute(ex, rules2; fold= fold1)
	@variables foo
	f(foo)
	@variables x yf(::Real) q[1:5]
	x+ y
	x* y
	x/ y
	x^ y
	x^5
	# 6 ^ x
	x- y
	-y
	2y
	symtype(y)
	z=2
	*(y, z)
	*(z, y)
	f(x)
	(5x/5)
	[x, y]
	[x, f, f]
	promote_type(Int, Num)
	promote_type(Real, Num)
	promote_type(Float64, Num)
	# expand((x + y) ^ 2)
	# simplify(x ^ (1//2) + (sin(x) ^ 2 + cos(x) ^ 2) + 2(x + y) - x - y)
	ex= x+2y+sin(x)
	rules1=Dict(x=> y)
	# rules2 = Dict(x => 1)
	# Running `fold = Val(true)` invalidates the precompiled statements
	# for `fold = Val(false)` and itself doesn't precompile anyway.
	# substitute(ex, rules1)
	substitute(ex, rules1; fold= fold1)
	Symbolics.linear_expansion(ex, y)
	# substitute(ex, rules2; fold = fold1)
	# substitute(ex, rules2)
	# substitute(ex, rules1; fold = fold2)
	# substitute(ex, rules2; fold = fold2)
	q[1]
	q'q
	using ModelingToolkit
	fold1=Val{false}()
	using SymbolicUtils
	using SymbolicUtils: shape
	using Symbolics
	@syms x yf(t) q[1:5]
	SymbolicUtils.Sym{SymReal}(:a; type= Real, shape= SymbolicUtils.ShapeVecT())
	x+ y
	x* y
	x/ y
	x^ y
	x^5
	6^ x
	x- y
	-y
	2y
	z=2
	dict= SymbolicUtils.ACDict{VartypeT}()
	dict[x]=1
	dict[y]=1
	type::typeof(DataType)=rand()<0.5? Real: Float64
	nt= (; type, shape, unsafe=true)
	Base.pairs(nt)
	BSImpl.AddMul{VartypeT}(1, dict, SymbolicUtils.AddMulVariant.MUL; type,
	shape= SymbolicUtils.ShapeVecT(), unsafe=true)
	*(y, z)
	*(z, y)
	SymbolicUtils.symtype(y)
	f(x)
	(5x/5)
	expand((x+ y)^2)
	simplify(x^ (1//2)+ (sin(x)^2+cos(x)^2)+2(x+ y)- x- y)
	ex= x+2y+sin(x)
	rules1=Dict(x=> y)
	rules2=Dict(x=>1)
	Dx=Differential(x)
	Differential(y)(ex)
	uex=unwrap(ex)
	Symbolics.executediff(Dx, uex)
	# Running `fold = Val(true)` invalidates the precompiled statements
	# for `fold = Val(false)` and itself doesn't precompile anyway.
	# substitute(ex, rules1)
	substitute(ex, rules1; fold= fold1)
	substitute(ex, rules2; fold= fold1)
	@variables foo
	f(foo)
	@variables x yf(::Real) q[1:5]
	x+ y
	x* y
	x/ y
	x^ y
	x^5
	# 6 ^ x
	x- y
	-y
	2y
	symtype(y)
	z=2
	*(y, z)
	*(z, y)
	f(x)
	(5x/5)
	[x, y]
	[x, f, f]
	promote_type(Int, Num)
	promote_type(Real, Num)
	promote_type(Float64, Num)
	# expand((x + y) ^ 2)
	# simplify(x ^ (1//2) + (sin(x) ^ 2 + cos(x) ^ 2) + 2(x + y) - x - y)
	ex= x+2y+sin(x)
	rules1=Dict(x=> y)
	# rules2 = Dict(x => 1)
	# Running `fold = Val(true)` invalidates the precompiled statements
	# for `fold = Val(false)` and itself doesn't precompile anyway.
	# substitute(ex, rules1)
	substitute(ex, rules1; fold= fold1)
	Symbolics.linear_expansion(ex, y)
	# substitute(ex, rules2; fold = fold1)
	# substitute(ex, rules2)
	# substitute(ex, rules1; fold = fold2)
	# substitute(ex, rules2; fold = fold2)
	q[1]
	q'q
	using ModelingToolkit

src/ModelingToolkit.jl Outdated

		@named sys=System([ModelingToolkit.D_nounits(x)~-x], ModelingToolkit.t_nounits)
		prob=ODEProblem(mtkcompile(sys), [x=>30.0], (0,100), jac=true)
		isequal(ModelingToolkit.D_nounits.x, ModelingToolkit.t_nounits)
		sys=System([ModelingToolkit.D_nounits(x)~ x], ModelingToolkit.t_nounits, [x], Num[]; name=:sys)

Copy link

Contributor

github-actionsbotOct 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

[JuliaFormatter]_{reported byreviewdog 🐶}

Suggested change

	sys=System([ModelingToolkit.D_nounits(x)~ x], ModelingToolkit.t_nounits, [x], Num[]; name=:sys)
	sys=System([ModelingToolkit.D_nounits(x)~ x],
	ModelingToolkit.t_nounits, [x], Num[]; name=:sys)

src/ModelingToolkit.jl

Comment on lines +485 to +500

		precompile(Tuple{typeof(Base.merge), NamedTuple{(:f,:args,:metadata,:hash,:hash2,:shape,:type,:id), Tuple{SymbolicUtils.BasicSymbolicImpl.var"typeof(BasicSymbolicImpl)"{SymbolicUtils.SymReal}, SymbolicUtils.SmallVec{SymbolicUtils.BasicSymbolicImpl.var"typeof(BasicSymbolicImpl)"{SymbolicUtils.SymReal}, Array{SymbolicUtils.BasicSymbolicImpl.var"typeof(BasicSymbolicImpl)"{SymbolicUtils.SymReal},1}}, Nothing, UInt64, UInt64, SymbolicUtils.SmallVec{Base.UnitRange{Int64}, Array{Base.UnitRange{Int64},1}}, DataType, SymbolicUtils.IDType}}, NamedTuple{(:metadata,), Tuple{Base.ImmutableDict{DataType, Any}}}})
		precompile(Tuple{typeof(Base.merge), NamedTuple{(:f,:args,:metadata,:hash,:hash2,:shape,:type,:id), Tuple{SymbolicUtils.BasicSymbolicImpl.var"typeof(BasicSymbolicImpl)"{SymbolicUtils.SymReal}, SymbolicUtils.SmallVec{SymbolicUtils.BasicSymbolicImpl.var"typeof(BasicSymbolicImpl)"{SymbolicUtils.SymReal}, Array{SymbolicUtils.BasicSymbolicImpl.var"typeof(BasicSymbolicImpl)"{SymbolicUtils.SymReal},1}}, Base.ImmutableDict{DataType, Any}, UInt64, UInt64, SymbolicUtils.SmallVec{Base.UnitRange{Int64}, Array{Base.UnitRange{Int64},1}}, DataType, SymbolicUtils.IDType}}, NamedTuple{(:id,:hash,:hash2), Tuple{Nothing, Int64, Int64}}})
		precompile(Tuple{typeof(Core.kwcall), NamedTuple{(:f,:args,:metadata,:hash,:hash2,:shape,:type,:id), Tuple{SymbolicUtils.BasicSymbolicImpl.var"typeof(BasicSymbolicImpl)"{SymbolicUtils.SymReal}, SymbolicUtils.SmallVec{SymbolicUtils.BasicSymbolicImpl.var"typeof(BasicSymbolicImpl)"{SymbolicUtils.SymReal}, Array{SymbolicUtils.BasicSymbolicImpl.var"typeof(BasicSymbolicImpl)"{SymbolicUtils.SymReal},1}}, Base.ImmutableDict{DataType, Any}, Int64, Int64, SymbolicUtils.SmallVec{Base.UnitRange{Int64}, Array{Base.UnitRange{Int64},1}}, DataType, Nothing}}, Type{SymbolicUtils.BasicSymbolicImpl.Term{SymbolicUtils.SymReal}}})
		precompile(Tuple{typeof(Symbolics.parse_vars), Symbol, Type, Tuple{Symbol, Symbol}, Function})
		precompile(Tuple{typeof(Base.merge), NamedTuple{(:name,:metadata,:hash,:hash2,:shape,:type,:id), Tuple{Symbol, Base.ImmutableDict{DataType, Any}, UInt64, UInt64, SymbolicUtils.SmallVec{Base.UnitRange{Int64}, Array{Base.UnitRange{Int64},1}}, DataType, SymbolicUtils.IDType}}, NamedTuple{(:metadata,), Tuple{Base.ImmutableDict{DataType, Any}}}})

Copy link

Contributor

github-actionsbotOct 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

[JuliaFormatter]_{reported byreviewdog 🐶}

Suggested change

	precompile(Tuple{typeof(Base.merge), NamedTuple{(:f,:args,:metadata,:hash,:hash2,:shape,:type,:id), Tuple{SymbolicUtils.BasicSymbolicImpl.var"typeof(BasicSymbolicImpl)"{SymbolicUtils.SymReal}, SymbolicUtils.SmallVec{SymbolicUtils.BasicSymbolicImpl.var"typeof(BasicSymbolicImpl)"{SymbolicUtils.SymReal}, Array{SymbolicUtils.BasicSymbolicImpl.var"typeof(BasicSymbolicImpl)"{SymbolicUtils.SymReal},1}}, Nothing, UInt64, UInt64, SymbolicUtils.SmallVec{Base.UnitRange{Int64}, Array{Base.UnitRange{Int64},1}}, DataType, SymbolicUtils.IDType}}, NamedTuple{(:metadata,), Tuple{Base.ImmutableDict{DataType, Any}}}})
	precompile(Tuple{typeof(Base.merge), NamedTuple{(:f,:args,:metadata,:hash,:hash2,:shape,:type,:id), Tuple{SymbolicUtils.BasicSymbolicImpl.var"typeof(BasicSymbolicImpl)"{SymbolicUtils.SymReal}, SymbolicUtils.SmallVec{SymbolicUtils.BasicSymbolicImpl.var"typeof(BasicSymbolicImpl)"{SymbolicUtils.SymReal}, Array{SymbolicUtils.BasicSymbolicImpl.var"typeof(BasicSymbolicImpl)"{SymbolicUtils.SymReal},1}}, Base.ImmutableDict{DataType, Any}, UInt64, UInt64, SymbolicUtils.SmallVec{Base.UnitRange{Int64}, Array{Base.UnitRange{Int64},1}}, DataType, SymbolicUtils.IDType}}, NamedTuple{(:id,:hash,:hash2), Tuple{Nothing, Int64, Int64}}})
	precompile(Tuple{typeof(Core.kwcall), NamedTuple{(:f,:args,:metadata,:hash,:hash2,:shape,:type,:id), Tuple{SymbolicUtils.BasicSymbolicImpl.var"typeof(BasicSymbolicImpl)"{SymbolicUtils.SymReal}, SymbolicUtils.SmallVec{SymbolicUtils.BasicSymbolicImpl.var"typeof(BasicSymbolicImpl)"{SymbolicUtils.SymReal}, Array{SymbolicUtils.BasicSymbolicImpl.var"typeof(BasicSymbolicImpl)"{SymbolicUtils.SymReal},1}}, Base.ImmutableDict{DataType, Any}, Int64, Int64, SymbolicUtils.SmallVec{Base.UnitRange{Int64}, Array{Base.UnitRange{Int64},1}}, DataType, Nothing}}, Type{SymbolicUtils.BasicSymbolicImpl.Term{SymbolicUtils.SymReal}}})
	precompile(Tuple{typeof(Symbolics.parse_vars), Symbol, Type, Tuple{Symbol, Symbol}, Function})
	precompile(Tuple{typeof(Base.merge), NamedTuple{(:name,:metadata,:hash,:hash2,:shape,:type,:id), Tuple{Symbol, Base.ImmutableDict{DataType, Any}, UInt64, UInt64, SymbolicUtils.SmallVec{Base.UnitRange{Int64}, Array{Base.UnitRange{Int64},1}}, DataType, SymbolicUtils.IDType}}, NamedTuple{(:metadata,), Tuple{Base.ImmutableDict{DataType, Any}}}})
	precompile(Tuple{typeof(Base.merge),
	NamedTuple{(:f,:args,:metadata,:hash,:hash2,:shape,:type,:id),
	Tuple{
	SymbolicUtils.BasicSymbolicImpl.var"typeof(BasicSymbolicImpl)"{SymbolicUtils.SymReal},
	SymbolicUtils.SmallVec{
	SymbolicUtils.BasicSymbolicImpl.var"typeof(BasicSymbolicImpl)"{SymbolicUtils.SymReal},
	Array{
	SymbolicUtils.BasicSymbolicImpl.var"typeof(BasicSymbolicImpl)"{SymbolicUtils.SymReal},
	1}},
	Nothing,
	UInt64,
	UInt64,
	SymbolicUtils.SmallVec{Base.UnitRange{Int64}, Array{Base.UnitRange{Int64},1}},
	DataType,
	SymbolicUtils.IDType}},
	NamedTuple{(:metadata,), Tuple{Base.ImmutableDict{DataType, Any}}}})
	precompile(Tuple{typeof(Base.merge),
	NamedTuple{(:f,:args,:metadata,:hash,:hash2,:shape,:type,:id),
	Tuple{
	SymbolicUtils.BasicSymbolicImpl.var"typeof(BasicSymbolicImpl)"{SymbolicUtils.SymReal},
	SymbolicUtils.SmallVec{
	SymbolicUtils.BasicSymbolicImpl.var"typeof(BasicSymbolicImpl)"{SymbolicUtils.SymReal},
	Array{
	SymbolicUtils.BasicSymbolicImpl.var"typeof(BasicSymbolicImpl)"{SymbolicUtils.SymReal},
	1}},
	Base.ImmutableDict{DataType, Any},
	UInt64,
	UInt64,
	SymbolicUtils.SmallVec{Base.UnitRange{Int64}, Array{Base.UnitRange{Int64},1}},
	DataType,
	SymbolicUtils.IDType}},
	NamedTuple{(:id,:hash,:hash2), Tuple{Nothing, Int64, Int64}}})
	precompile(Tuple{typeof(Core.kwcall),
	NamedTuple{(:f,:args,:metadata,:hash,:hash2,:shape,:type,:id),
	Tuple{
	SymbolicUtils.BasicSymbolicImpl.var"typeof(BasicSymbolicImpl)"{SymbolicUtils.SymReal},
	SymbolicUtils.SmallVec{
	SymbolicUtils.BasicSymbolicImpl.var"typeof(BasicSymbolicImpl)"{SymbolicUtils.SymReal},
	Array{
	SymbolicUtils.BasicSymbolicImpl.var"typeof(BasicSymbolicImpl)"{SymbolicUtils.SymReal},
	1}},
	Base.ImmutableDict{DataType, Any},
	Int64,
	Int64,
	SymbolicUtils.SmallVec{Base.UnitRange{Int64}, Array{Base.UnitRange{Int64},1}},
	DataType,
	Nothing}},
	Type{SymbolicUtils.BasicSymbolicImpl.Term{SymbolicUtils.SymReal}}})
	precompile(Tuple{
	typeof(Symbolics.parse_vars), Symbol, Type, Tuple{Symbol, Symbol}, Function})
	precompile(Tuple{typeof(Base.merge),
	NamedTuple{(:name,:metadata,:hash,:hash2,:shape,:type,:id),
	Tuple{Symbol, Base.ImmutableDict{DataType, Any}, UInt64, UInt64,
	SymbolicUtils.SmallVec{Base.UnitRange{Int64}, Array{Base.UnitRange{Int64},1}},
	DataType, SymbolicUtils.IDType}},
	NamedTuple{(:metadata,), Tuple{Base.ImmutableDict{DataType, Any}}}})

src/ModelingToolkit.jl

Comment on lines +491 to +503

		precompile(Tuple{typeof(Core.kwcall), NamedTuple{(:name,:defaults), Tuple{Symbol, Base.Dict{Symbolics.Num, Float64}}}, Type{ModelingToolkit.System}, Array{Symbolics.Equation,1}, Symbolics.Num, Array{Symbolics.Num,1}, Array{Symbolics.Num,1}})
		precompile(Tuple{Type{NamedTuple{(:name,:defaults), T}where T<:Tuple}, Tuple{Symbol, Base.Dict{Symbolics.Num, Float64}}})

Copy link

Contributor

github-actionsbotOct 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

[JuliaFormatter]_{reported byreviewdog 🐶}

Suggested change

	precompile(Tuple{typeof(Core.kwcall), NamedTuple{(:name,:defaults), Tuple{Symbol, Base.Dict{Symbolics.Num, Float64}}}, Type{ModelingToolkit.System}, Array{Symbolics.Equation,1}, Symbolics.Num, Array{Symbolics.Num,1}, Array{Symbolics.Num,1}})
	precompile(Tuple{Type{NamedTuple{(:name,:defaults), T}where T<:Tuple}, Tuple{Symbol, Base.Dict{Symbolics.Num, Float64}}})
	precompile(Tuple{typeof(Core.kwcall),
	NamedTuple{(:name,:defaults), Tuple{Symbol, Base.Dict{Symbolics.Num, Float64}}},
	Type{ModelingToolkit.System}, Array{Symbolics.Equation,1},
	Symbolics.Num, Array{Symbolics.Num,1}, Array{Symbolics.Num,1}})
	precompile(Tuple{Type{NamedTuple{(:name,:defaults), T}where T<:Tuple},
	Tuple{Symbol, Base.Dict{Symbolics.Num, Float64}}})

src/ModelingToolkit.jl

Comment on lines +494 to +507

		precompile(Tuple{Type{NamedTuple{(:name,:defaults,:guesses), T}where T<:Tuple}, Tuple{Symbol, Base.Dict{Symbolics.Num, Float64}, Base.Dict{Symbolics.Num, Float64}}})
		precompile(Tuple{typeof(Core.kwcall), NamedTuple{(:name,:defaults,:guesses), Tuple{Symbol, Base.Dict{Symbolics.Num, Float64}, Base.Dict{Symbolics.Num, Float64}}}, Type{ModelingToolkit.System}, Array{Symbolics.Equation,1}, Symbolics.Num, Array{Symbolics.Num,1}, Array{Symbolics.Num,1}})
		precompile(Tuple{typeof(Core.kwcall), NamedTuple{(:type,:shape), Tuple{DataType, SymbolicUtils.SmallVec{Base.UnitRange{Int64}, Array{Base.UnitRange{Int64},1}}}},typeof(SymbolicUtils.term), Any, SymbolicUtils.BasicSymbolicImpl.var"typeof(BasicSymbolicImpl)"{SymbolicUtils.SymReal}})

Copy link

Contributor

github-actionsbotOct 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

[JuliaFormatter]_{reported byreviewdog 🐶}

Suggested change

	precompile(Tuple{Type{NamedTuple{(:name,:defaults,:guesses), T}where T<:Tuple}, Tuple{Symbol, Base.Dict{Symbolics.Num, Float64}, Base.Dict{Symbolics.Num, Float64}}})
	precompile(Tuple{typeof(Core.kwcall), NamedTuple{(:name,:defaults,:guesses), Tuple{Symbol, Base.Dict{Symbolics.Num, Float64}, Base.Dict{Symbolics.Num, Float64}}}, Type{ModelingToolkit.System}, Array{Symbolics.Equation,1}, Symbolics.Num, Array{Symbolics.Num,1}, Array{Symbolics.Num,1}})
	precompile(Tuple{typeof(Core.kwcall), NamedTuple{(:type,:shape), Tuple{DataType, SymbolicUtils.SmallVec{Base.UnitRange{Int64}, Array{Base.UnitRange{Int64},1}}}},typeof(SymbolicUtils.term), Any, SymbolicUtils.BasicSymbolicImpl.var"typeof(BasicSymbolicImpl)"{SymbolicUtils.SymReal}})
	precompile(Tuple{Type{NamedTuple{(:name,:defaults,:guesses), T}where T<:Tuple},
	Tuple{Symbol, Base.Dict{Symbolics.Num, Float64}, Base.Dict{Symbolics.Num, Float64}}})
	precompile(Tuple{typeof(Core.kwcall),
	NamedTuple{(:name,:defaults,:guesses),
	Tuple{Symbol, Base.Dict{Symbolics.Num, Float64}, Base.Dict{Symbolics.Num, Float64}}},
	Type{ModelingToolkit.System},
	Array{Symbolics.Equation,1},
	Symbolics.Num,
	Array{Symbolics.Num,1},
	Array{Symbolics.Num,1}})
	precompile(Tuple{typeof(Core.kwcall),
	NamedTuple{(:type,:shape),
	Tuple{DataType,
	SymbolicUtils.SmallVec{Base.UnitRange{Int64}, Array{Base.UnitRange{Int64},1}}}},
	typeof(SymbolicUtils.term),
	Any,
	SymbolicUtils.BasicSymbolicImpl.var"typeof(BasicSymbolicImpl)"{SymbolicUtils.SymReal}})

src/systems/abstractsystem.jl

		term=namespace_expr(term, sys, n; ivs)
		end
		expr=namespace_expr(expr, sys, n; ivs)
		return BSImpl.ArrayOp{VartypeT}(output_idx, expr, reduce, term, ranges; type, shape, metadata)

Copy link

Contributor

github-actionsbotOct 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

[JuliaFormatter]_{reported byreviewdog 🐶}

Suggested change

	return BSImpl.ArrayOp{VartypeT}(output_idx, expr, reduce, term, ranges; type, shape, metadata)
	return BSImpl.ArrayOp{VartypeT}(
	output_idx, expr, reduce, term, ranges; type, shape, metadata)

src/systems/abstractsystem.jl

		for (i, eq)inenumerate(eqs)
		empty!(varsbuf)
		vars!(varsbuf, eq;op= Union{Differential, Initial, Pre})
		SU.search_variables!(varsbuf, eq;is_atomic=OperatorIsAtomic{Union{Differential, Initial, Pre}}())

Copy link

Contributor

github-actionsbotOct 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

[JuliaFormatter]_{reported byreviewdog 🐶}

Suggested change

	SU.search_variables!(varsbuf, eq; is_atomic=OperatorIsAtomic{Union{Differential, Initial, Pre}}())
	SU.search_variables!(varsbuf, eq; is_atomic= OperatorIsAtomic{Union{
	Differential, Initial, Pre}}())

src/systems/alias_elimination.jl

		end

		functionobserved2graph(eqs, unknowns)
		functionobserved2graph(eqs::Vector{Equation}, unknowns::Vector{SymbolicT})::Tuple{BipartiteGraph{Int, Nothing}, Vector{Int}}

Copy link

Contributor

github-actionsbotOct 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

[JuliaFormatter]_{reported byreviewdog 🐶}

Suggested change

	functionobserved2graph(eqs::Vector{Equation}, unknowns::Vector{SymbolicT})::Tuple{BipartiteGraph{Int, Nothing}, Vector{Int}}
	functionobserved2graph(eqs::Vector{Equation},
	unknowns::Vector{SymbolicT})::Tuple{BipartiteGraph{Int, Nothing}, Vector{Int}}

src/systems/callbacks.jl

		@set! sys.unknowns=s(get_unknowns(sys))
		@set! sys.ps=s(get_ps(sys))
		AffectSystem(sys,s(aff.unknowns),s(aff.parameters),s(aff.discretes))

Copy link

Contributor

github-actionsbotOct 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

[JuliaFormatter]_{reported byreviewdog 🐶}

Suggested change

src/systems/codegen_utils.jl

		"""
		const DDE_HISTORY_FUN=Sym{Symbolics.FnType{Tuple{Any, <:Real}, Vector{Real}}}(:___history___)
		const BVP_SOLUTION=Sym{Symbolics.FnType{Tuple{<:Real}, Vector{Real}}}(:__sol__)
		const DDE_HISTORY_FUN=SSym(:___history___; type= SU.FnType{Tuple{Any,<:Real}, Vector{Real}}, shape= SU.Unknown(1))

Copy link

Contributor

github-actionsbotOct 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

[JuliaFormatter]_{reported byreviewdog 🐶}

Suggested change

	const DDE_HISTORY_FUN=SSym(:___history___; type= SU.FnType{Tuple{Any,<:Real}, Vector{Real}}, shape= SU.Unknown(1))
	const DDE_HISTORY_FUN=SSym(
	:___history___; type= SU.FnType{Tuple{Any,<:Real}, Vector{Real}}, shape= SU.Unknown(1))

AayushSabharwal added29 commits

October 10, 2025 18:18

fix: fixODEProblem construction during precompilation with `eval_e…

8eb2d68

…xpression = true`

fix: fix overspecialization of nonnumeric buffers inremake_buffer

fba3ccc

fix: fixeval_expression = true construction of problems

638a7a9

test: test no specialization of nonnumeric buffers

83db1e5

test: test solvingODEProblem witheval_expression = true

135383b

docs: fix bad docstring

af71cca

fix: fix type-change of time-dependent parameters withrespecialize

aaaac6e

fix: add@invokelatest to allow trivial initialization with `eval_e…

9ede8ab

…xpression = true`

test: fixrespecialize test

eb1c901

refactor: remove usages ofSymbolic

9afe05e

refactor: remove usages of_parse_vars

f04e9e7

refactor: remove outdated imports

4d42365

refactor: remove usages offast_substitute

194831c

refactor: remove usages ofCallWithMetadata

2cb147b

refactor: remove usages of oldsymtype syntax

36ea1d8

refactor: remove usages ofDifference

51440fd

refactor: remove usages ofSymbolics._mapreduce

e0b6e72

refactor: remove usages ofSymbolics.getparent

eafd2da

fix: implementSII.getname forSystem

251ee2b

fix: remove usages ofSymbolics.Unknown,Symbolics.shape

334dcfd

refactor: remove usages ofarray_term

d820617

fix: move ChainRulesCore to an extension

c0e5e02

fix: move JuliaFormatter to an extension

99ebed1

fix: fix invalidations frompromote_symtype method

60e5f5f

fix: remove usages ofoccursin for searching expressions

f7533e2

fix: remove usages of deprecatedchildren

04c7e95

refactor: concretely type some utility functions

0723840

fix: handleConst in connection expansion

b5b373b

refactor: improve type-stability ofrenamespace

b3f1d32

AayushSabharwal added15 commits

October 14, 2025 16:33

fixup! fix: improve type-stability oftearing_reassemble

89f1803

fix: handle wrapped constants infind_eq_solvables!

2883d73

fix: minor bug fix in initsys generation

8328947

refactor: avoid usingvars! in initsys generation

ed1895c

fix: unwrap symbolic constants in initsys generation

af94889

fixup! fix: improve type-stability of some SII functions

f1b8c49

fixup! fix: improve type-stability of alias elimination

796899e

fixup! fix: fix parameter default parsing in@mtkmodel

a171233

fix: add edge case for unit handling in@mtkmodel

f4ae3a0

fix: handle newguesses type in initprob generation

0e54dde

fix: improve type-stability ofSystem constructor

65c2e46

fix: properly hashcons constant global symbolics

7a59416

fix: improve type-stability ofsubexpressions_not_involving_vars!

0b4000c

fix: handleShift applied toEquation

6595ace

refactor: reorganize imports to recompile invalidations

f718670

AayushSabharwal force-pushed theas/su-v4 branch frombf11961 tof718670Compare

October 14, 2025 11:08

isaacsas reviewed

Oct 14, 2025

View reviewed changes

src/problems/jumpproblem.jl

Copy link

Member

isaacsasOct 14, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

How are you now supporting a list of variables from which any collected variables must be members? That seems dropped in this new version of these functions.

Copy link

MemberAuthor

AayushSabharwalOct 14, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

Symbolics.get_variables does this, and is a wrapper overSymbolicUtils.search_variables! with the appropriate filter function. Now this is a common API forany sort of filter you might want to apply to the collected variables.

Copy link

Member

isaacsasOct 14, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

So that is whatis_atomic does? (Just because from the name is unclear to me what it means.)

Copy link

MemberAuthor

AayushSabharwalOct 14, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

Yes. I'm working on improving docs in SymbolicUtils for all of the new stuff.is_atomic takes an expression and returns a boolean identifying whether the expression should be considered "atomic" and included in the list of variables. The function should probably be namedfind_atomics but now that requires amassive find-and-replace.

Copy link

MemberAuthor

AayushSabharwalOct 14, 2025•
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

This isn't to say Iwon't do the renaming, but rather that I might wait a bit to get things working first.

Copy link

Member

isaacsasOct 14, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

Sounds good! I just wanted to check the filtering wasn’t being inadvertently lost for MassActionJump stoichiometric species.

AayushSabharwal added12 commits

October 15, 2025 12:57

fix: fixpantelides_reassemble

7a4a3a5

fixup! fix: improve type-stability oftearing_reassemble

c8eebc1

fix: fixchange_independent_variable

54350fb

fix: unwrap consts inrespecialize

0d1a863

fix: handle edge case inadd_initialization_parameters

3bac999

fixup! fix: improve type-stability of connection infrastructure

7a52bf6

fixup! fix: fix invalidations frompromote_symtype method

20a234f

fix: do not usevars inImperativeAffect

18200ec

fixup! fix: makeIndexCache constructor more type-stable

4065830

chore: additional precompile statements

83dc56b

refactor: removevars,vars!

0d14c93

refactor: improve type-stability ofsubexpressions_not_involving_vars!

d4e4396

AayushSabharwal mentioned this pull request

Oct 24, 2025

CompatHelper: bump compat for SymbolicUtils to 4, (keep existing compat)#3948

Closed

Labels

None yet

Movatterモバイル変換

Uh oh!

[WIP] refactor: update to SymbolicUtils@4 and Symbolics@7#3953

Are you sure you want to change the base?

[WIP] refactor: update to SymbolicUtils@4 and Symbolics@7#3953

Conversation

AayushSabharwal commentedOct 2, 2025

Checklist

Additional context

Uh oh!

github-actionsbot left a comment

Choose a reason for hiding this comment

Uh oh!

github-actionsbotOct 2, 2025

Choose a reason for hiding this comment

Uh oh!

github-actionsbotOct 2, 2025

Choose a reason for hiding this comment

Uh oh!

github-actionsbotOct 2, 2025

Choose a reason for hiding this comment

Uh oh!

github-actionsbotOct 2, 2025

Choose a reason for hiding this comment

Uh oh!

github-actionsbotOct 2, 2025

Choose a reason for hiding this comment

Uh oh!

github-actionsbotOct 2, 2025

Choose a reason for hiding this comment

Uh oh!

github-actionsbotOct 2, 2025

Choose a reason for hiding this comment

Uh oh!

github-actionsbotOct 2, 2025

Choose a reason for hiding this comment

Uh oh!

github-actionsbotOct 2, 2025

Choose a reason for hiding this comment

Uh oh!

github-actionsbotOct 2, 2025

Choose a reason for hiding this comment

Uh oh!

isaacsasOct 14, 2025

Choose a reason for hiding this comment

Uh oh!

AayushSabharwalOct 14, 2025

Choose a reason for hiding this comment

Uh oh!

isaacsasOct 14, 2025

Choose a reason for hiding this comment

Uh oh!

AayushSabharwalOct 14, 2025

Choose a reason for hiding this comment

Uh oh!

AayushSabharwalOct 14, 2025• editedLoading Uh oh!There was an error while loading.Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

isaacsasOct 14, 2025

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

AayushSabharwalOct 14, 2025•
edited
Loading