distributed tests pass

Author: ChrisRackauckas

Project.toml

@@ -20,7 +20,8 @@ StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
 julia = "1"
 
 [extras]
+OrdinaryDiffEq = "1dea7af3-3e70-54e6-95c3-0bf5283fa5ed"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 
 [targets]
-test = ["Test"]
+test = ["OrdinaryDiffEq", "Test"]

src/direct.jl

@@ -32,12 +32,3 @@ end
 function simplified_expr(eq::Equation)
     Expr(:(=), simplified_expr(eq.lhs), simplified_expr(eq.rhs))
 end
-
-macro I(ex)
-    name = :ICompile
-    ret = return quote
-        macro $(esc(name))()
-            esc($ex)
-        end
-    end
-end

src/utils.jl

@@ -52,7 +52,7 @@ function build_function(rhss, vs, ps = (), args = (), conv = simplified_expr, ex
     fargs = ps == () ? :(u,$(args...)) : :(u,p,$(args...))
 
     oop_ex = :(
-        ($(fargs.args...)) -> begin
+        ($(fargs.args...),) -> begin
             X = $let_expr
             T = promote_type(map(typeof,X)...)
             convert.(T,X)
@@ -71,7 +71,7 @@ function build_function(rhss, vs, ps = (), args = (), conv = simplified_expr, ex
     if expression == Val{true}
         return oop_ex, iip_ex
     else
-        return GeneralizedGenerated.mk_function(oop_ex), GeneralizedGenerated.mk_function(iip_ex)
+        return GeneralizedGenerated.mk_function(@__MODULE__,oop_ex), GeneralizedGenerated.mk_function(@__MODULE__,iip_ex)
     end
 end
 

test/direct.jl

@@ -36,9 +36,11 @@ end
 eqs = [σ*(y-x),
        x*(ρ-z)-y,
        x*y - β*z]
-f = eval(ModelingToolkit.build_function(eqs,[x,y,z],[σ,ρ,β]))
+f1,f2 = ModelingToolkit.build_function(eqs,[x,y,z],[σ,ρ,β])
+f = eval(f1)
 out = [1.0,2,3]
 o1 = f([1.0,2,3],[1.0,2,3])
+f = eval(f2)
 f(out,[1.0,2,3],[1.0,2,3])
 @test all(o1 .== out)
 
@@ -55,45 +57,16 @@ function test_worldage()
 end
 test_worldage()
 
-mac = @I begin
-   @parameters σ() ρ() β()
-   @variables x() y() z()
-
-   eqs = [σ*(y-x),
-          x*(ρ-z)-y,
-          x*y - β*z]
-   ModelingToolkit.build_function(eqs,[x,y,z],[σ,ρ,β])
-end
-f = @ICompile
-out = [1.0,2,3]
-o1 = f([1.0,2,3],[1.0,2,3])
-f(out,[1.0,2,3],[1.0,2,3])
-@test all(o1 .== out)
-
-mac = @I begin
-   @parameters σ ρ β
-   @variables x y z
-
-   eqs = [σ*(y-x),
-          x*(ρ-z)-y,
-          x*y - β*z]
-   ∂ = ModelingToolkit.jacobian(eqs,[x,y,z])
-   ModelingToolkit.build_function(∂,[x,y,z],[σ,ρ,β])
-end
-f = @ICompile
-out = zeros(3,3)
-o1 = f([1.0,2,3],[1.0,2,3])
-f(out,[1.0,2,3],[1.0,2,3])
-@test all(out .== o1)
-
 ## No parameters
 @variables x y z
 eqs = [(y-x)^2,
        x*(x-z)-y,
        x*y - y*z]
-f = eval(ModelingToolkit.build_function(eqs,[x,y,z]))
+f1,f2 = ModelingToolkit.build_function(eqs,[x,y,z])
+f = eval(f1)
 out = zeros(3)
 o1 = f([1.0,2,3])
+f = eval(f2)
 f(out,[1.0,2,3])
 @test all(out .== o1)
 
@@ -108,16 +81,3 @@ function test_worldage()
    f_iip(out,[1.0,2,3])
 end
 test_worldage()
-
-mac = @I begin
-   @variables x y z
-   eqs = [(y-x)^2,
-          x*(x-z)-y,
-          x*y - y*z]
-   ModelingToolkit.build_function(eqs,[x,y,z])
-end
-f = @ICompile
-out = zeros(3)
-o1 = f([1.0,2,3])
-f(out,[1.0,2,3])
-@test all(out .== o1)

test/distributed.jl

@@ -2,8 +2,8 @@ using Distributed
 # add processes to workspace
 addprocs(2)
 
-using ModelingToolkit
-using OrdinaryDiffEq
+@everywhere using ModelingToolkit, OrdinaryDiffEq
+using
 
 # create the Lorenz system
 @parameters t σ ρ β
@@ -24,7 +24,7 @@ ode_prob = ODEProblem(ode_func, u0, (0., 10.),params)
 
 @everywhere begin
 
-    using DifferentialEquations
+    using OrdinaryDiffEq
     using ModelingToolkit
 
     function solve_lorenz(ode_problem)

test/system_construction.jl

@@ -38,7 +38,7 @@ test_diffeq_inference("standard", de, t, (x, y, z), (σ, ρ, β))
 generate_function(de, [x,y,z], [σ,ρ,β])
 jac_expr = generate_jacobian(de)
 jac = calculate_jacobian(de)
-jacfun = eval(jac_expr)
+jacfun = eval(jac_expr[2])
 # iip
 f = ODEFunction(de, [x,y,z], [σ,ρ,β])
 Wfact, Wfact_t = ModelingToolkit.calculate_factorized_W(de)
@@ -52,22 +52,22 @@ J = zeros(3, 3)
 jacfun(J, u, p, t)
 FW = zeros(3, 3)
 FWt = zeros(3, 3)
-fw(FW, u, p, 0.2, 0.1)
-fwt(FWt, u, p, 0.2, 0.1)
+eval(fw[2])(FW, u, p, 0.2, 0.1)
+eval(fwt[2])(FWt, u, p, 0.2, 0.1)
 # oop
 f = ODEFunction(de, [x,y,z], [σ,ρ,β])
 fw, fwt = map(eval, ModelingToolkit.generate_factorized_W(de))
 du = @SArray zeros(3)
 u  = SVector(1:3...)
 p  = SVector(4:6...)
 @test f(u, p, 0.1) === @SArray [4, 0, -16]
-Sfw = fw(u, p, 0.2, 0.1)
+Sfw = eval(fw[1])(u, p, 0.2, 0.1)
 @test Sfw.L ≈ UnitLowerTriangular(FW)
 @test Sfw.U ≈ UpperTriangular(FW)
 sol = Sfw \ @SArray ones(3)
 @test sol isa SArray
 @test sol ≈ -(I - 0.2*J)\ones(3)
-Sfw_t = fwt(u, p, 0.2, 0.1)
+Sfw_t = eval(fwt[1])(u, p, 0.2, 0.1)
 @test Sfw_t.L ≈ UnitLowerTriangular(FWt)
 @test Sfw_t.U ≈ UpperTriangular(FWt)
 sol = Sfw_t \ @SArray ones(3)
@@ -82,7 +82,7 @@ sol = Sfw_t \ @SArray ones(3)
     de = ODESystem(eqs)
     test_diffeq_inference("global iv-varying", de, t, (x, y, z), (σ′, ρ, β))
     @test begin
-        f = eval(generate_function(de, [x,y,z], [σ′,ρ,β]))
+        f = eval(generate_function(de, [x,y,z], [σ′,ρ,β])[2])
         du = [0.0,0.0,0.0]
         f(du, [1.0,2.0,3.0], [x->x+7,2,3], 5.0)
         du ≈ [11, -3, -7]
@@ -95,7 +95,7 @@ sol = Sfw_t \ @SArray ones(3)
     de = ODESystem(eqs)
     test_diffeq_inference("single internal iv-varying", de, t, (x, y, z), (σ, ρ, β))
     @test begin
-        f = eval(generate_function(de, [x,y,z], [σ,ρ,β]))
+        f = eval(generate_function(de, [x,y,z], [σ,ρ,β])[2])
         du = [0.0,0.0,0.0]
         f(du, [1.0,2.0,3.0], [x->x+7,2,3], 5.0)
         du ≈ [11, -3, -7]
@@ -105,7 +105,7 @@ sol = Sfw_t \ @SArray ones(3)
     de = ODESystem(eqs)
     test_diffeq_inference("many internal iv-varying", de, t, (x,), (σ,))
     @test begin
-        f = eval(generate_function(de, [x], [σ]))
+        f = eval(generate_function(de, [x], [σ])[2])
         du = [0.0]
         f(du, [1.0], [t -> t + 2], 5.0)
         du ≈ [27561]
@@ -148,7 +148,7 @@ eqs = [0 ~ σ*(y-x),
 ns = NonlinearSystem(eqs, [x,y,z])
 test_nlsys_inference("standard", ns, (x, y, z), (σ, ρ, β))
 @test begin
-    f = eval(generate_function(ns, [x,y,z], [σ,ρ,β]))
+    f = eval(generate_function(ns, [x,y,z], [σ,ρ,β])[2])
     du = [0.0, 0.0, 0.0]
     f(du, [1,2,3], [1,2,3])
     du ≈ [1, -3, -7]
@@ -161,10 +161,11 @@ eqs = [D(x) ~ -A*x,
        D(y) ~ A*x - B*_x]
 de = ODESystem(eqs)
 @test begin
-    f = eval(generate_function(de, [x,y], [A,B,C]))
+    f = eval(generate_function(de, [x,y], [A,B,C])[2])
     du = [0.0,0.0]
     f(du, [1.0,2.0], [1,2,3], 0.0)
     du ≈ [-1, -1/3]
+    f = eval(generate_function(de, [x,y], [A,B,C])[1])
     du ≈ f([1.0,2.0], [1,2,3], 0.0)
 end