Skip to content

Commit 4ee32df

Browse files
refactor: use new compiled generate_* functions
1 parent 7cb145a commit 4ee32df

File tree

1 file changed

+6
-19
lines changed

1 file changed

+6
-19
lines changed

src/problems/odeproblem.jl

Lines changed: 6 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,9 @@
99

1010
dvs = unknowns(sys)
1111
ps = parameters(sys)
12-
f_gen = generate_rhs(sys, dvs, ps; expression = Val{true},
13-
expression_module = eval_module, checkbounds = checkbounds, cse,
12+
f = generate_rhs(sys, dvs, ps; expression = Val{false},
13+
eval_expression, eval_module, checkbounds = checkbounds, cse,
1414
kwargs...)
15-
f_oop, f_iip = eval_or_rgf.(f_gen; eval_expression, eval_module)
16-
f = GeneratedFunctionWrapper{(2, 3, is_split(sys))}(f_oop, f_iip)
1715

1816
if spec === SciMLBase.FunctionWrapperSpecialize && iip
1917
if u0 === nothing || p === nothing || t === nothing
@@ -23,26 +21,15 @@
2321
end
2422

2523
if tgrad
26-
tgrad_gen = generate_tgrad(sys, dvs, ps;
27-
simplify = simplify,
28-
expression = Val{true},
29-
expression_module = eval_module, cse,
30-
checkbounds = checkbounds, kwargs...)
31-
tgrad_oop, tgrad_iip = eval_or_rgf.(tgrad_gen; eval_expression, eval_module)
32-
_tgrad = GeneratedFunctionWrapper{(2, 3, is_split(sys))}(tgrad_oop, tgrad_iip)
24+
_tgrad = generate_tgrad(sys, dvs, ps; expression = Val{false},
25+
simplify, cse, eval_expression, eval_module, checkbounds, kwargs...)
3326
else
3427
_tgrad = nothing
3528
end
3629

3730
if jac
38-
jac_gen = generate_jacobian(sys, dvs, ps;
39-
simplify = simplify, sparse = sparse,
40-
expression = Val{true},
41-
expression_module = eval_module, cse,
42-
checkbounds = checkbounds, kwargs...)
43-
jac_oop, jac_iip = eval_or_rgf.(jac_gen; eval_expression, eval_module)
44-
45-
_jac = GeneratedFunctionWrapper{(2, 3, is_split(sys))}(jac_oop, jac_iip)
31+
_jac = generate_jacobian(sys, dvs, ps; expression = Val{false},
32+
simplify, sparse, cse, eval_expression, eval_module, checkbounds, kwargs...)
4633
else
4734
_jac = nothing
4835
end

0 commit comments

Comments
 (0)