refactor: improve precompile-friendliness

Author: AayushSabharwal

lib/ModelingToolkitBase/src/systems/abstractsystem.jl

@@ -1460,6 +1460,14 @@ function unknowns_toplevel(sys::AbstractSystem)
     return get_unknowns(sys)
 end
 
+function __no_initial_params_pred(x::SymbolicT)
+    arr, _ = split_indexed_var(x)
+    Moshi.Match.@match arr begin
+        BSImpl.Term(; f) && if f isa Initial end => false
+        _ => false
+    end
+end
+
 """
 $(TYPEDSIGNATURES)
 
@@ -1482,11 +1490,7 @@ function parameters(sys::AbstractSystem; initial_parameters = false)
     end
     result = collect(result)
     if !initial_parameters && !is_initializesystem(sys)
-        filter!(result) do sym
-            return !(isoperator(sym, Initial) ||
-                     iscall(sym) && operation(sym) === getindex &&
-                     isoperator(arguments(sym)[1], Initial))
-        end
+        filter!(__no_initial_params_pred, result)
     end
     return result
 end
@@ -1699,7 +1703,7 @@ Recursively substitute `dict` into `expr`. Use `Symbolics.simplify` on the expre
 if `simplify == true`.
 """
 function substitute_and_simplify(expr, dict::AbstractDict, simplify::Bool)
-    expr = Symbolics.fixpoint_sub(expr, dict; operator = Union{ModelingToolkitBase.Initial, Pre})
+    expr = Symbolics.fixpoint_sub(expr, dict, Union{Initial, Pre})
     simplify ? Symbolics.simplify(expr) : expr
 end
 

lib/ModelingToolkitBase/src/systems/callbacks.jl

@@ -1043,13 +1043,13 @@ The `SymbolicDiscreteCallback`s in the returned vector are structs with two fiel
 See also `get_discrete_events`, which only returns the events of the top-level system.
 """
 function discrete_events(sys::AbstractSystem)
-    obs = get_discrete_events(sys)
+    cbs = get_discrete_events(sys)
     systems = get_systems(sys)
-    cbs = [obs;
-           reduce(vcat,
-               (map(cb -> namespace_callback(cb, s), discrete_events(s)) for s in systems),
-               init = SymbolicDiscreteCallback[])]
-    cbs
+    cbs = copy(cbs)
+    for s in systems
+        append!(cbs, map(Base.Fix2(namespace_callback, s), discrete_events(s)))
+    end
+    return cbs
 end
 
 """
@@ -1100,15 +1100,13 @@ The `SymbolicContinuousCallback`s in the returned vector are structs with two fi
 See also `get_continuous_events`, which only returns the events of the top-level system.
 """
 function continuous_events(sys::AbstractSystem)
-    obs = get_continuous_events(sys)
-    filter(!isempty, obs)
-
+    cbs = get_discrete_events(sys)
     systems = get_systems(sys)
-    cbs = [obs;
-           reduce(vcat,
-               (map(o -> namespace_callback(o, s), continuous_events(s)) for s in systems),
-               init = SymbolicContinuousCallback[])]
-    filter(!isempty, cbs)
+    cbs = copy(cbs)
+    for s in systems
+        append!(cbs, map(Base.Fix2(namespace_callback, s), discrete_events(s)))
+    end
+    return cbs
 end
 
 """

lib/ModelingToolkitBase/src/systems/systems.jl

@@ -10,14 +10,15 @@ function canonicalize_io(iovars, type::String)
     iobuffer = OrderedSet{SymbolicT}()
     arrsyms = AtomicArrayDict{OrderedSet{SymbolicT}}()
     for var in iovars
-        if Symbolics.isarraysymbolic(var)
-            if !symbolic_has_known_size(var)
-                throw(ArgumentError("""
-                All $(type)s must have known shape. Found $var with unknown shape.
-                """))
+        sh = SU.shape(var)
+        if SU.is_array_shape(sh)
+            if sh isa SU.ShapeVecT
+                union!(iobuffer, vec(collect(var)::Array{SymbolicT})::Vector{SymbolicT})
+                continue
             end
-            union!(iobuffer, vec(collect(var)::Array{SymbolicT})::Vector{SymbolicT})
-            continue
+            throw(ArgumentError("""
+            All $(type)s must have known shape. Found $var with unknown shape.
+            """))
         end
         arr, isarr = split_indexed_var(var)
         if isarr
@@ -41,7 +42,7 @@ function canonicalize_io(iovars, type::String)
             or simply pass $k as an $type.
             """))
         end
-        if type != "output" && !isequal(vec(collect(k))::Vector{SymbolicT}, collect(v))
+        if type != "output" && !isequal(vec(collect(k)::Array{SymbolicT})::Vector{SymbolicT}, collect(v))
             throw(ArgumentError("""
             Elements of scalarized array variables must be in sorted order in $(type)s. \
             Either pass all scalarized elements in sorted order as $(type)s \
@@ -469,16 +470,17 @@ function __num_isdiag_noise(mat)
     true
 end
 
-function __get_num_diag_noise(mat)
-    map(axes(mat, 1)) do i
+function __get_num_diag_noise(mat::Matrix{SymbolicT})
+    result = fill(Symbolics.COMMON_ZERO, size(mat, 1))
+    for i in axes(mat, 1)
         for j in axes(mat, 2)
             mij = mat[i, j]
-            if !_iszero(mij)
-                return mij
-            end
+            _iszero(mij) && continue
+            result[i] = mij
+            break
         end
-        0
     end
+    return result
 end
 
 """