Skip to content

Commit e1b098b

Browse files
ChrisRackauckasChrisRackauckas
committed
fix RGF evaluation modules
1 parent 26bbb37 commit e1b098b

File tree

5 files changed

+12
-12
lines changed

5 files changed

+12
-12
lines changed

‎src/systems/clock_inference.jl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -416,10 +416,10 @@ function generate_discrete_affect(
416416
inits = map(a -> eval_module.eval(toexpr(LiteralExpr(a))), init_funs)
417417
else
418418
affects = map(affect_funs) do a
419-
drop_expr(@RuntimeGeneratedFunction(eval_module, toexpr(LiteralExpr(a))))
419+
drop_expr(RuntimeGeneratedFunction(eval_module, eval_module, toexpr(LiteralExpr(a))))
420420
end
421421
inits = map(init_funs) do a
422-
drop_expr(@RuntimeGeneratedFunction(eval_module, toexpr(LiteralExpr(a))))
422+
drop_expr(RuntimeGeneratedFunction(eval_module, eval_module, toexpr(LiteralExpr(a))))
423423
end
424424
end
425425
defaults = Dict{Any, Any}(v => 0.0 for v in Iterators.flatten(inputs))

‎src/systems/diffeqs/abstractodesystem.jl‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,7 @@ function DiffEqBase.ODEFunction{iip, specialize}(sys::AbstractODESystem,
331331
expression_module = eval_module, checkbounds = checkbounds,
332332
kwargs...)
333333
f_oop, f_iip = eval_expression ? eval_module.eval.(f_gen) :
334-
(drop_expr(@RuntimeGeneratedFunction(eval_module, ex)) for ex in f_gen)
334+
(drop_expr(RuntimeGeneratedFunction(eval_module, eval_module, ex)) for ex in f_gen)
335335

336336
f(u, p, t) = f_oop(u, p, t)
337337
f(du, u, p, t) = f_iip(du, u, p, t)
@@ -356,7 +356,7 @@ function DiffEqBase.ODEFunction{iip, specialize}(sys::AbstractODESystem,
356356
expression_module = eval_module,
357357
checkbounds = checkbounds, kwargs...)
358358
tgrad_oop, tgrad_iip = eval_expression ? eval_module.eval.(tgrad_gen) :
359-
(drop_expr(@RuntimeGeneratedFunction(eval_module, ex)) for ex in tgrad_gen)
359+
(drop_expr(RuntimeGeneratedFunction(eval_module, eval_module, ex)) for ex in tgrad_gen)
360360
if p isa Tuple
361361
__tgrad(u, p, t) = tgrad_oop(u, p..., t)
362362
__tgrad(J, u, p, t) = tgrad_iip(J, u, p..., t)
@@ -377,7 +377,7 @@ function DiffEqBase.ODEFunction{iip, specialize}(sys::AbstractODESystem,
377377
expression_module = eval_module,
378378
checkbounds = checkbounds, kwargs...)
379379
jac_oop, jac_iip = eval_expression ? eval_module.eval.(jac_gen) :
380-
(drop_expr(@RuntimeGeneratedFunction(eval_module, ex)) for ex in jac_gen)
380+
(drop_expr(RuntimeGeneratedFunction(eval_module, eval_module, ex)) for ex in jac_gen)
381381

382382
_jac(u, p, t) = jac_oop(u, p, t)
383383
_jac(J, u, p, t) = jac_iip(J, u, p, t)
@@ -488,7 +488,7 @@ function DiffEqBase.DAEFunction{iip}(sys::AbstractODESystem, dvs = unknowns(sys)
488488
expression_module = eval_module, checkbounds = checkbounds,
489489
kwargs...)
490490
f_oop, f_iip = eval_expression ? eval_module.eval.(f_gen) :
491-
(drop_expr(@RuntimeGeneratedFunction(eval_module, ex)) for ex in f_gen)
491+
(drop_expr(RuntimeGeneratedFunction(eval_module, eval_module, ex)) for ex in f_gen)
492492
f(du, u, p, t) = f_oop(du, u, p, t)
493493
f(du, u, p::MTKParameters, t) = f_oop(du, u, p..., t)
494494
f(out, du, u, p, t) = f_iip(out, du, u, p, t)
@@ -501,7 +501,7 @@ function DiffEqBase.DAEFunction{iip}(sys::AbstractODESystem, dvs = unknowns(sys)
501501
expression_module = eval_module,
502502
checkbounds = checkbounds, kwargs...)
503503
jac_oop, jac_iip = eval_expression ? eval_module.eval.(jac_gen) :
504-
(drop_expr(@RuntimeGeneratedFunction(eval_module, ex)) for ex in jac_gen)
504+
(drop_expr(RuntimeGeneratedFunction(eval_module, eval_module, ex)) for ex in jac_gen)
505505

506506
_jac(du, u, p, ˍ₋gamma, t) = jac_oop(du, u, p, ˍ₋gamma, t)
507507
_jac(du, u, p::MTKParameters, ˍ₋gamma, t) = jac_oop(du, u, p..., ˍ₋gamma, t)
@@ -553,7 +553,7 @@ function DiffEqBase.DDEFunction{iip}(sys::AbstractODESystem, dvs = unknowns(sys)
553553
expression = Val{true},
554554
expression_module = eval_module, checkbounds = checkbounds,
555555
kwargs...)
556-
f_oop, f_iip = (drop_expr(@RuntimeGeneratedFunction(eval_module, ex)) for ex in f_gen)
556+
f_oop, f_iip = (drop_expr(RuntimeGeneratedFunction(eval_module, eval_module, ex)) for ex in f_gen)
557557
f(u, h, p, t) = f_oop(u, h, p, t)
558558
f(u, h, p::MTKParameters, t) = f_oop(u, h, p..., t)
559559
f(du, u, h, p, t) = f_iip(du, u, h, p, t)
@@ -578,7 +578,7 @@ function DiffEqBase.SDDEFunction{iip}(sys::AbstractODESystem, dvs = unknowns(sys
578578
expression = Val{true},
579579
expression_module = eval_module, checkbounds = checkbounds,
580580
kwargs...)
581-
f_oop, f_iip = (drop_expr(@RuntimeGeneratedFunction(eval_module, ex)) for ex in f_gen)
581+
f_oop, f_iip = (drop_expr(RuntimeGeneratedFunction(eval_module, eval_module, ex)) for ex in f_gen)
582582
g_gen = generate_diffusion_function(sys, dvs, ps; expression = Val{true},
583583
isdde = true, kwargs...)
584584
g_oop, g_iip = (drop_expr(@RuntimeGeneratedFunction(ex)) for ex in g_gen)

‎src/systems/discrete_system/discrete_system.jl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,7 @@ function SciMLBase.DiscreteFunction{iip, specialize}(
318318
f_gen = generate_function(sys, dvs, ps; expression = Val{true},
319319
expression_module = eval_module, kwargs...)
320320
f_oop, f_iip = eval_expression ? eval_module.eval.(f_gen) :
321-
(drop_expr(@RuntimeGeneratedFunction(eval_module, ex)) for ex in f_gen)
321+
(drop_expr(RuntimeGeneratedFunction(eval_module, eval_module, ex)) for ex in f_gen)
322322
f(u, p, t) = f_oop(u, p, t)
323323
f(du, u, p, t) = f_iip(du, u, p, t)
324324

‎src/systems/pde/pdesystem.jl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ struct PDESystem <: ModelingToolkit.AbstractMultivariateSystem
116116
p = ps isa SciMLBase.NullParameters ? [] : ps
117117
args = vcat(DestructuredArgs(p), args)
118118
ex = Func(args, [], eq.rhs) |> toexpr
119-
eq.lhs => drop_expr(@RuntimeGeneratedFunction(eval_module, ex))
119+
eq.lhs => drop_expr(RuntimeGeneratedFunction(eval_module, eval_module, ex))
120120
end
121121
end
122122
end

‎test/precompile_test.jl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ end
3131
ODEPrecompileTest
3232
@test ODEPrecompileTest.f_noeval_good(u, p, 0.1) == [4, 0, -16]
3333

34-
@test_throws KeyError ODEPrecompileTest.f_eval_bad(u, p, 0.1)
34+
ODEPrecompileTest.f_eval_bad(u, p, 0.1)
3535

3636
@test parentmodule(typeof(ODEPrecompileTest.f_eval_good.f.f_iip)) ==
3737
ODEPrecompileTest

0 commit comments

Comments
 (0)