safe builder tools

Author: ChrisRackauckas

src/ModelingToolkit.jl

@@ -84,11 +84,11 @@ include("variables.jl")
 include("operations.jl")
 include("differentials.jl")
 include("equations.jl")
-include("systems/diffeqs/diffeqsystem.jl")
-include("systems/diffeqs/first_order_transform.jl")
-include("systems/nonlinear/nonlinear_system.jl")
 include("function_registration.jl")
 include("simplify.jl")
 include("utils.jl")
+include("systems/diffeqs/diffeqsystem.jl")
+include("systems/diffeqs/first_order_transform.jl")
+include("systems/nonlinear/nonlinear_system.jl")
 
 end # module

src/systems/diffeqs/diffeqsystem.jl

@@ -221,3 +221,29 @@ end
 function DiffEqBase.ODEFunction(sys::ODESystem, args...; kwargs...)
     ODEFunction{true}(sys, args...; kwargs...)
 end
+
+"""
+$(SIGNATURES)
+
+Generate `ODESystem`, dependent variables, and parameters from an `ODEProblem`.
+"""
+function modelingtoolkitize(prob::DiffEqBase.ODEProblem)
+    @parameters t
+    vars = [Variable(:x, i)(t) for i in eachindex(prob.u0)]
+    params = [Variable(:α,i; known = true)() for i in eachindex(prob.p)]
+    @derivatives D'~t
+
+    rhs = [D(var) for var in vars]
+
+    if DiffEqBase.isinplace(prob)
+        lhs = similar(vars, Any)
+        prob.f(lhs, vars, params, t)
+    else
+        lhs = prob.f(vars, params, t)
+    end
+
+    eqs = vcat([rhs[i] ~ lhs[i] for i in eachindex(prob.u0)]...)
+    de = ODESystem(eqs)
+
+    de, vars, params
+end

src/utils.jl

@@ -51,10 +51,11 @@ function build_function(rhss, vs, ps, args = (), conv = rhs -> convert(Expr, rhs
     quote
         function $fname($X,u,p,$(args...))
             $ip_let_expr
+            nothing
         end
         function $fname(u,p,$(args...))
             X = $let_expr
-            T = $(constructor === nothing ? :(u isa StaticArrays.StaticArray ? StaticArrays.similar_type(typeof(u), eltype(X)) : x->(du=similar(u, eltype(X)); du .= x)) : constructor)
+            T = $(constructor === nothing ? :(u isa ModelingToolkit.StaticArrays.StaticArray ? ModelingToolkit.StaticArrays.similar_type(typeof(u), eltype(X)) : x->(du=similar(u, eltype(X)); du .= x)) : constructor)
             T(X)
         end
     end
@@ -91,28 +92,10 @@ function vars!(vars, O)
     return vars
 end
 
-"""
-$(SIGNATURES)
-
-Generate `ODESystem`, dependent variables, and parameters from an `ODEProblem`.
-"""
-function modelingtoolkitize(prob::DiffEqBase.ODEProblem)
-    t, = @parameters t;
-    vars = [Variable(:x, i)(t) for i in eachindex(prob.u0)]
-    params = [Variable(:α,i; known = true)() for i in eachindex(prob.p)]
-    D, = @derivatives D'~t
-
-    rhs = [D(var) for var in vars]
-
-    if DiffEqBase.isinplace(prob)
-        lhs = similar(vars, Any)
-        prob.f(lhs, vars, params, t)
-    else
-        lhs = prob.f(vars, params, t)
-    end
-
-    eqs = vcat([rhs[i] ~ lhs[i] for i in eachindex(prob.u0)]...)
-    de = ODESystem(eqs)
-
-    de, vars, params
+@inline @generated function fast_invokelatest(f, ::Type{rt}, args...) where rt
+  tupargs = Expr(:tuple,args...)
+  quote
+    _f = $(Expr(:cfunction, Base.CFunction, :f, rt, :((Core.svec)($args...)), :(:ccall)))
+    return ccall(_f.ptr,rt,$tupargs,$((:(getindex(args,$i)) for i in 1:length(args))...))
+  end
 end