Merge pull request #295 from SciML/lowering

Add lowering integration test

Author: ChrisRackauckas

src/build_function.jl

@@ -13,8 +13,8 @@ function _build_function(target::JuliaTarget, op::Operation, vs, ps = (), args =
                          conv = simplified_expr, expression = Val{true};
                          checkbounds = false, constructor=nothing,
                          linenumbers = true)
-    _vs = map(x-> x isa Operation ? x.op : x, vs)
-    _ps = map(x-> x isa Operation ? x.op : x, ps)
+    _vs = convert.(Variable,vs)
+    _ps = convert.(Variable,ps)
     var_pairs   = [(u.name, :(u[$i])) for (i, u) ∈ enumerate(_vs)]
     param_pairs = [(p.name, :(p[$i])) for (i, p) ∈ enumerate(_ps)]
     (ls, rs) = zip(var_pairs..., param_pairs...)
@@ -48,8 +48,8 @@ function _build_function(target::JuliaTarget, rhss, vs, ps = (), args = (),
                          conv = simplified_expr, expression = Val{true};
                          checkbounds = false, constructor=nothing,
                          linenumbers = true, multithread=false)
-    _vs = map(x-> x isa Operation ? x.op : x, vs)
-    _ps = map(x-> x isa Operation ? x.op : x, ps)
+    _vs = convert.(Variable,vs)
+    _ps = convert.(Variable,ps)
     var_pairs   = [(u.name, :(u[$i])) for (i, u) ∈ enumerate(_vs)]
     param_pairs = [(p.name, :(p[$i])) for (i, p) ∈ enumerate(_ps)]
     (ls, rs) = zip(var_pairs..., param_pairs...)

src/systems/diffeqs/abstractodesystem.jl

@@ -42,7 +42,7 @@ end
 function generate_jacobian(sys::AbstractODESystem, dvs = states(sys), ps = parameters(sys), expression = Val{true}; sparse = false, kwargs...)
     jac = calculate_jacobian(sys)
     if sparse
-        jac = sparse(jac)
+        jac = SparseArrays.sparse(jac)
     end
     return build_function(jac, dvs, ps, (sys.iv.name,), ODEToExpr(sys), expression; kwargs...)
 end
@@ -125,6 +125,7 @@ function DiffEqBase.ODEFunction{iip}(sys::AbstractODESystem, dvs = states(sys),
                                      ps = parameters(sys);
                                      version = nothing, tgrad=false,
                                      jac = false, Wfact = false,
+                                     sparse = false,
                                      kwargs...) where {iip}
     f_oop,f_iip = generate_function(sys, dvs, ps, Val{false}; kwargs...)
 
@@ -140,7 +141,7 @@ function DiffEqBase.ODEFunction{iip}(sys::AbstractODESystem, dvs = states(sys),
     end
 
     if jac
-        jac_oop,jac_iip = generate_jacobian(sys, dvs, ps, Val{false}; kwargs...)
+        jac_oop,jac_iip = generate_jacobian(sys, dvs, ps, Val{false}; sparse = sparse, kwargs...)
         _jac(u,p,t) = jac_oop(u,p,t)
         _jac(J,u,p,t) = jac_iip(J,u,p,t)
     else

src/systems/diffeqs/sdesystem.jl

@@ -66,7 +66,7 @@ are used to set the order of the dependent variable and parameter vectors,
 respectively.
 """
 function DiffEqBase.SDEFunction{iip}(sys::SDESystem, dvs = sys.states, ps = sys.ps;
-                                     version = nothing, tgrad=false,
+                                     version = nothing, tgrad=false, sparse = false,
                                      jac = false, Wfact = false, kwargs...) where {iip}
     f_oop,f_iip = generate_function(sys, dvs, ps, Val{false}; kwargs...)
     g_oop,g_iip = generate_diffusion_function(sys, dvs, ps, Val{false}; kwargs...)
@@ -85,7 +85,7 @@ function DiffEqBase.SDEFunction{iip}(sys::SDESystem, dvs = sys.states, ps = sys.
     end
 
     if jac
-        jac_oop,jac_iip = generate_jacobian(sys, dvs, ps, Val{false}; kwargs...)
+        jac_oop,jac_iip = generate_jacobian(sys, dvs, ps, Val{false}; sparse=sparse, kwargs...)
         _jac(u,p,t) = jac_oop(u,p,t)
         _jac(J,u,p,t) = jac_iip(J,u,p,t)
     else
@@ -131,7 +131,7 @@ function DiffEqBase.SDEProblem{iip}(sys::SDESystem,u0map,tspan,p=parammap;
 
     f = SDEFunction(sys;tgrad=tgrad,jac=jac,Wfact=Wfact,checkbounds=checkbounds,
                         linenumbers=linenumbers,multithread=multithread,
-                        sparse=false)
+                        sparse=sparse)
     u0 = varmap_to_vars(u0map,states(sys))
     p = varmap_to_vars(parammap,parameters(sys))
     SDEProblem(f,f.g,u0,tspan,p;kwargs...)

src/systems/nonlinear/nonlinearsystem.jl

@@ -51,7 +51,7 @@ function generate_jacobian(sys::NonlinearSystem, vs = states(sys), ps = paramete
                            sparse = false, kwargs...)
     jac = calculate_jacobian(sys)
     if sparse
-        jac = sparse(jac)
+        jac = SparseArrays.sparse(jac)
     end
     return build_function(jac, convert.(Variable,vs), convert.(Variable,ps), (), NLSysToExpr(sys))
 end

src/systems/optimization/optimizationsystem.jl

@@ -81,7 +81,7 @@ function DiffEqBase.OptimizationProblem{iip}(sys::OptimizationSystem,
     ps = parameters(sys)
 
     f = generate_function(sys,checkbounds=checkbounds,linenumbers=linenumbers,
-                              multithread=multithread,sparse=sparse)
+                              multithread=multithread)
     u0 = varmap_to_vars(u0,dvs)
     p = varmap_to_vars(parammap,ps)
     lb = varmap_to_vars(lb,dvs)

test/lowering_solving.jl

@@ -0,0 +1,26 @@
+using ModelingToolkit, OrdinaryDiffEq
+
+@parameters t σ ρ β
+@variables x(t) y(t) z(t)
+@derivatives D'~t
+
+eqs = [D(D(x)) ~ σ*(y-x),
+       D(y) ~ x*(ρ-z)-y,
+       D(z) ~ x*y - β*z]
+
+sys = ODESystem(eqs)
+sys = ode_order_lowering(sys)
+
+u0 = [D(x) => 2.0,
+	  x => 1.0,
+      y => 0.0,
+      z => 0.0]
+
+p  = [σ => 28.0,
+      ρ => 10.0,
+      β => 8/3]
+
+tspan = (0.0,100.0)
+prob = ODEProblem(sys,u0,tspan,p,jac=true)
+sol = solve(prob,Tsit5())
+#using Plots; plot(sol,vars=(:x,:y))

test/runtests.jl

@@ -15,6 +15,7 @@ using SafeTestsets, Test
 @safetestset "Domain Test" begin include("domains.jl") end
 @safetestset "Constraints Test" begin include("constraints.jl") end
 @safetestset "PDE Construction Test" begin include("pde.jl") end
+@safetestset "Lowering Integration Test" begin include("lowering_solving.jl") end
 @safetestset "Test Big System Usage" begin include("bigsystem.jl") end
 @testset "Latexify recipes Test" begin include("latexify.jl") end
 @testset "Distributed Test" begin include("distributed.jl") end