using GG it works

Author: ChrisRackauckas

Project.toml

@@ -14,6 +14,7 @@ NaNMath = "77ba4419-2d1f-58cd-9bb1-8ffee604a2e3"
 SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
 SpecialFunctions = "276daf66-3868-5448-9aa4-cd146d93841b"
 StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
+GG = "6b9d7cbe-bcb9-11e9-073f-15a7a543e2eb"
 
 [compat]
 julia = "1"

src/ModelingToolkit.jl

@@ -13,7 +13,7 @@ using StaticArrays, LinearAlgebra
 
 using MacroTools
 import MacroTools: splitdef, combinedef
-
+import GG
 using DocStringExtensions
 
 """

src/systems/diffeqs/diffeqsystem.jl

@@ -217,53 +217,26 @@ Create an `ODEFunction` from the [`ODESystem`](@ref). The arguments `dvs` and `p
 are used to set the order of the dependent variable and parameter vectors,
 respectively.
 """
-function DiffEqBase.ODEFunction{iip}(sys::ODESystem, dvs, ps,
-                                     safe = Val{true};
+function DiffEqBase.ODEFunction{iip}(sys::ODESystem, dvs, ps;
                                      version = nothing,
                                      jac = false, Wfact = false) where {iip}
-    _f = eval(generate_function(sys, dvs, ps))
-    out_f_safe(u,p,t) = ModelingToolkit.fast_invokelatest(_f,typeof(u),u,p,t)
-    out_f_safe(du,u,p,t) = ModelingToolkit.fast_invokelatest(_f,Nothing,du,u,p,t)
-    out_f(u,p,t) = _f(u,p,t)
-    out_f(du,u,p,t) = _f(du,u,p,t)
+    _f = generate_function(sys, dvs, ps)
 
     if jac
-        _jac = eval(generate_jacobian(sys, dvs, ps))
-        jac_f_safe(u,p,t) = ModelingToolkit.fast_invokelatest(_jac,Matrix{eltype(u)},u,p,t)
-        jac_f_safe(J,u,p,t) = ModelingToolkit.fast_invokelatest(_jac,Nothing,J,u,p,t)
-        jac_f(u,p,t) = _jac(u,p,t)
-        jac_f(J,u,p,t) = _jac(J,u,p,t)
+        _jac = generate_jacobian(sys, dvs, ps)
     else
-        jac_f_safe = nothing
-        jac_f = nothing
+        _jac = nothing
     end
 
     if Wfact
-        _Wfact,_Wfact_t = eval.(generate_factorized_W(sys, dvs, ps))
-        Wfact_f_safe(u,p,gam,t) = ModelingToolkit.fast_invokelatest(_Wfact,Matrix{eltype(u)},u,p,gam,t)
-        Wfact_f_safe(J,u,p,gam,t) = ModelingToolkit.fast_invokelatest(_Wfact,Nothing,J,u,p,gam,t)
-        Wfact_f_t_safe(u,p,gam,t) = ModelingToolkit.fast_invokelatest(_Wfact_t,Matrix{eltype(u)},u,p,gam,t)
-        Wfact_f_t_safe(J,u,p,gam,t) = ModelingToolkit.fast_invokelatest(_Wfact_t,Nothing,J,u,p,gam,t)
-        Wfact_f(u,p,gam,t) = _Wfact(u,p,gam,t)
-        Wfact_f(J,u,p,gam,t) = _Wfact(J,u,p,gam,t)
-        Wfact_f_t(u,p,gam,t) = _Wfact_t(u,p,gam,t)
-        Wfact_f_t(J,u,p,gam,t) = _Wfact_t(J,u,p,gam,t)
+        _Wfact,_Wfact_t = generate_factorized_W(sys, dvs, ps)
     else
-        Wfact_f_safe = nothing
-        Wfact_f_t_safe = nothing
-        Wfact_f = nothing
-        Wfact_f_t = nothing
+        _Wfact,_Wfact_t = nothing,nothing
     end
 
-    if safe === Val{true}
-        ODEFunction{iip}(out_f_safe,jac=jac_f_safe,
-                          Wfact = Wfact_f_safe,
-                          Wfact_t = Wfact_f_t_safe)
-    else
-        ODEFunction{iip}(out_f,jac=jac_f,
-                          Wfact = Wfact_f,
-                          Wfact_t = Wfact_f_t)
-    end
+    ODEFunction{iip}(_f,jac=_jac,
+                      Wfact = _Wfact,
+                      Wfact_t = _Wfact_t)
 end
 
 function DiffEqBase.ODEFunction(sys::ODESystem, args...; kwargs...)

src/utils.jl

@@ -31,6 +31,13 @@ function flatten_expr!(x)
     x
 end
 
+mk_function(args, kwargs, body) =
+    let Args   = args |> GG.expr2typelevel,
+        Kwargs = kwargs |> GG.expr2typelevel,
+        Body   = body |> GG.expr2typelevel
+        GG.RuntimeFn{Args, Kwargs, Body}()
+    end
+
 function build_function(rhss, vs, ps = (), args = (), conv = simplified_expr; constructor=nothing)
     _vs = map(x-> x isa Operation ? x.op : x, vs)
     _ps = map(x-> x isa Operation ? x.op : x, ps)
@@ -50,19 +57,7 @@ function build_function(rhss, vs, ps = (), args = (), conv = simplified_expr; co
     let_expr = Expr(:let, var_eqs, sys_expr)
 
     fargs = ps == () ? :(u,$(args...)) : :(u,p,$(args...))
-    quote
-        @everywhere function $fname($X,$(fargs.args...))
-            $ip_let_expr
-            nothing
-        end
-        @everywhere function $fname($(fargs.args...))
-            X = $let_expr
-            T = promote_type(map(typeof,X)...)
-            convert.(T,X)
-            construct = $(constructor === nothing ? :(u isa ModelingToolkit.StaticArrays.StaticArray ? ModelingToolkit.StaticArrays.similar_type(typeof(u), eltype(X)) : x->(du=similar(u, T, $(size(rhss)...)); vec(du) .= x; du)) : constructor)
-            construct(X)
-        end
-    end
+    mk_function(fargs,:(),let_expr)
 end
 
 is_constant(::Constant) = true