Merge pull request #857 from mohamed82008/mt/fix_841

Fix #841

Author: ChrisRackauckas

Project.toml

@@ -28,6 +28,7 @@ Requires = "ae029012-a4dd-5104-9daa-d747884805df"
 RuntimeGeneratedFunctions = "7e49a35a-f44a-4d26-94aa-eba1b4ca6b47"
 SafeTestsets = "1bc83da4-3b8d-516f-aca4-4fe02f6d838f"
 SciMLBase = "0bca4576-84f4-4d90-8ffe-ffa030f20462"
+Serialization = "9e88b42a-f829-5b0c-bbe9-9e923198166b"
 Setfield = "efcf1570-3423-57d1-acb7-fd33fddbac46"
 SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
 SpecialFunctions = "276daf66-3868-5448-9aa4-cd146d93841b"

src/systems/diffeqs/abstractodesystem.jl

@@ -199,6 +199,13 @@ variable and parameter vectors, respectively.
 """
 struct ODEFunctionExpr{iip} end
 
+struct ODEFunctionClosure{O, I} <: Function
+    f_oop::O
+    f_iip::I
+end
+(f::ODEFunctionClosure)(u, p, t) = f.f_oop(u, p, t)
+(f::ODEFunctionClosure)(du, u, p, t) = f.f_iip(du, u, p, t)
+
 function ODEFunctionExpr{iip}(sys::AbstractODESystem, dvs = states(sys),
                                      ps = parameters(sys), u0 = nothing;
                                      version = nothing, tgrad=false,
@@ -209,20 +216,13 @@ function ODEFunctionExpr{iip}(sys::AbstractODESystem, dvs = states(sys),
 
     f_oop, f_iip = generate_function(sys, dvs, ps; expression=Val{true}, kwargs...)
     fsym = gensym(:f)
-    _f = quote
-      $fsym(u,p,t) = $f_oop(u,p,t)
-      $fsym(du,u,p,t) = $f_iip(du,u,p,t)
-    end
-
+    _f = :($fsym = ModelingToolkit.ODEFunctionClosure($f_oop, $f_iip))
     tgradsym = gensym(:tgrad)
     if tgrad
         tgrad_oop, tgrad_iip = generate_tgrad(sys, dvs, ps;
                                 simplify=simplify,
                                 expression=Val{true}, kwargs...)
-        _tgrad = quote
-            $tgradsym(u,p,t) = $tgrad_oop(u,p,t)
-            $tgradsym(J,u,p,t) = $tgrad_iip(J,u,p,t)
-        end
+        _tgrad = :($tgradsym = ModelingToolkit.ODEFunctionClosure($tgrad_oop, $tgrad_iip))
     else
         _tgrad = :($tgradsym = nothing)
     end
@@ -232,10 +232,7 @@ function ODEFunctionExpr{iip}(sys::AbstractODESystem, dvs = states(sys),
         jac_oop,jac_iip = generate_jacobian(sys, dvs, ps;
                                  sparse=sparse, simplify=simplify,
                                  expression=Val{true}, kwargs...)
-        _jac = quote
-            $jacsym(u,p,t) = $jac_oop(u,p,t)
-            $jacsym(J,u,p,t) = $jac_iip(J,u,p,t)
-        end
+        _jac = :($jacsym = ModelingToolkit.ODEFunctionClosure($jac_oop, $jac_iip))
     else
         _jac = :($jacsym = nothing)
     end

test/runtests.jl

@@ -37,3 +37,4 @@ println("Last test requires gcc available in the path!")
 @safetestset "C Compilation Test" begin include("ccompile.jl") end
 @safetestset "Latexify recipes Test" begin include("latexify.jl") end
 @safetestset "StructuralTransformations" begin include("structural_transformation/runtests.jl") end
+@testset "Serialization" begin include("serialization.jl") end

test/serialization.jl

@@ -0,0 +1,21 @@
+using ModelingToolkit, SciMLBase, Serialization
+
+@parameters t
+@variables x(t)
+D = Differential(t)
+
+sys = ODESystem([D(x) ~ -0.5*x])
+for prob in [
+    eval(ModelingToolkit.ODEProblem{false}(sys, nothing, nothing, SciMLBase.NullParameters())),
+    eval(ModelingToolkit.ODEProblemExpr{false}(sys, nothing, nothing, SciMLBase.NullParameters()))
+]
+    _fn = tempname()
+
+    open(_fn, "w") do f
+        serialize(f, prob)
+    end
+
+    _cmd = "using ModelingToolkit, Serialization; deserialize(\"$_fn\")"
+
+    run(`$(Base.julia_cmd()) -e $(_cmd)`)
+end