Skip to content

Commit a2e9ee7

Browse files
fix expression bool
1 parent bab10f4 commit a2e9ee7

File tree

4 files changed

+12
-12
lines changed

4 files changed

+12
-12
lines changed

src/systems/diffeqs/abstractodesystem.jl

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,7 @@ function DiffEqBase.ODEFunction{iip, specialize}(sys::AbstractODESystem,
327327
if !iscomplete(sys)
328328
error("A completed system is required. Call `complete` or `structural_simplify` on the system before creating an `ODEFunction`")
329329
end
330-
f_gen = generate_function(sys, dvs, ps; expression = Val{!eval_expression},
330+
f_gen = generate_function(sys, dvs, ps; expression = Val{true},
331331
expression_module = eval_module, checkbounds = checkbounds,
332332
kwargs...)
333333
f_oop, f_iip = eval_expression ? eval_module.eval.(f_gen) :
@@ -352,7 +352,7 @@ function DiffEqBase.ODEFunction{iip, specialize}(sys::AbstractODESystem,
352352
if tgrad
353353
tgrad_gen = generate_tgrad(sys, dvs, ps;
354354
simplify = simplify,
355-
expression = Val{!eval_expression},
355+
expression = Val{true},
356356
expression_module = eval_module,
357357
checkbounds = checkbounds, kwargs...)
358358
tgrad_oop, tgrad_iip = eval_expression ? eval_module.eval.(tgrad_gen) :
@@ -373,7 +373,7 @@ function DiffEqBase.ODEFunction{iip, specialize}(sys::AbstractODESystem,
373373
if jac
374374
jac_gen = generate_jacobian(sys, dvs, ps;
375375
simplify = simplify, sparse = sparse,
376-
expression = Val{!eval_expression},
376+
expression = Val{true},
377377
expression_module = eval_module,
378378
checkbounds = checkbounds, kwargs...)
379379
jac_oop, jac_iip = eval_expression ? eval_module.eval.(jac_gen) :
@@ -484,7 +484,7 @@ function DiffEqBase.DAEFunction{iip}(sys::AbstractODESystem, dvs = unknowns(sys)
484484
error("A completed system is required. Call `complete` or `structural_simplify` on the system before creating a `DAEFunction`")
485485
end
486486
f_gen = generate_function(sys, dvs, ps; implicit_dae = true,
487-
expression = Val{!eval_expression},
487+
expression = Val{true},
488488
expression_module = eval_module, checkbounds = checkbounds,
489489
kwargs...)
490490
f_oop, f_iip = eval_expression ? eval_module.eval.(f_gen) :
@@ -497,7 +497,7 @@ function DiffEqBase.DAEFunction{iip}(sys::AbstractODESystem, dvs = unknowns(sys)
497497
if jac
498498
jac_gen = generate_dae_jacobian(sys, dvs, ps;
499499
simplify = simplify, sparse = sparse,
500-
expression = Val{!eval_expression},
500+
expression = Val{true},
501501
expression_module = eval_module,
502502
checkbounds = checkbounds, kwargs...)
503503
jac_oop, jac_iip = eval_expression ? eval_module.eval.(jac_gen) :

src/systems/diffeqs/sdesystem.jl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -415,10 +415,10 @@ function DiffEqBase.SDEFunction{iip}(sys::SDESystem, dvs = unknowns(sys),
415415
end
416416
dvs = scalarize.(dvs)
417417

418-
f_gen = generate_function(sys, dvs, ps; expression = Val{!eval_expression}, kwargs...)
418+
f_gen = generate_function(sys, dvs, ps; expression = Val{true}, kwargs...)
419419
f_oop, f_iip = eval_expression ? eval_module.eval.(f_gen) :
420420
(drop_expr(@RuntimeGeneratedFunction(ex)) for ex in f_gen)
421-
g_gen = generate_diffusion_function(sys, dvs, ps; expression = Val{!eval_expression},
421+
g_gen = generate_diffusion_function(sys, dvs, ps; expression = Val{true},
422422
kwargs...)
423423
g_oop, g_iip = eval_expression ? eval_module.eval.(g_gen) :
424424
(drop_expr(@RuntimeGeneratedFunction(ex)) for ex in g_gen)
@@ -433,7 +433,7 @@ function DiffEqBase.SDEFunction{iip}(sys::SDESystem, dvs = unknowns(sys),
433433
g(du, u, p::MTKParameters, t) = g_iip(du, u, p..., t)
434434

435435
if tgrad
436-
tgrad_gen = generate_tgrad(sys, dvs, ps; expression = Val{!eval_expression},
436+
tgrad_gen = generate_tgrad(sys, dvs, ps; expression = Val{true},
437437
kwargs...)
438438
tgrad_oop, tgrad_iip = eval_expression ? eval_module.eval.(tgrad_gen) :
439439
(drop_expr(@RuntimeGeneratedFunction(ex)) for ex in tgrad_gen)
@@ -447,7 +447,7 @@ function DiffEqBase.SDEFunction{iip}(sys::SDESystem, dvs = unknowns(sys),
447447
end
448448

449449
if jac
450-
jac_gen = generate_jacobian(sys, dvs, ps; expression = Val{!eval_expression},
450+
jac_gen = generate_jacobian(sys, dvs, ps; expression = Val{true},
451451
sparse = sparse, kwargs...)
452452
jac_oop, jac_iip = eval_expression ? eval_module.eval.(jac_gen) :
453453
(drop_expr(@RuntimeGeneratedFunction(ex)) for ex in jac_gen)

src/systems/discrete_system/discrete_system.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,7 @@ function SciMLBase.DiscreteFunction{iip, specialize}(
315315
if !iscomplete(sys)
316316
error("A completed `DiscreteSystem` is required. Call `complete` or `structural_simplify` on the system before creating a `DiscreteProblem`")
317317
end
318-
f_gen = generate_function(sys, dvs, ps; expression = Val{!eval_expression},
318+
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) :
321321
(drop_expr(@RuntimeGeneratedFunction(eval_module, ex)) for ex in f_gen)

src/systems/nonlinear/nonlinearsystem.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ function SciMLBase.NonlinearFunction{iip}(sys::NonlinearSystem, dvs = unknowns(s
283283
if !iscomplete(sys)
284284
error("A completed `NonlinearSystem` is required. Call `complete` or `structural_simplify` on the system before creating a `NonlinearFunction`")
285285
end
286-
f_gen = generate_function(sys, dvs, ps; expression = Val{!eval_expression}, kwargs...)
286+
f_gen = generate_function(sys, dvs, ps; expression = Val{true}, kwargs...)
287287
f_oop, f_iip = eval_expression ? eval_module.eval.(f_gen) :
288288
(drop_expr(@RuntimeGeneratedFunction(ex)) for ex in f_gen)
289289
f(u, p) = f_oop(u, p)
@@ -294,7 +294,7 @@ function SciMLBase.NonlinearFunction{iip}(sys::NonlinearSystem, dvs = unknowns(s
294294
if jac
295295
jac_gen = generate_jacobian(sys, dvs, ps;
296296
simplify = simplify, sparse = sparse,
297-
expression = Val{!eval_expression}, kwargs...)
297+
expression = Val{true}, kwargs...)
298298
jac_oop, jac_iip = eval_expression ? eval_module.eval.(jac_gen) :
299299
(drop_expr(@RuntimeGeneratedFunction(ex)) for ex in jac_gen)
300300
_jac(u, p) = jac_oop(u, p)

0 commit comments

Comments
 (0)