|
9 | 9 |
|
10 | 10 | dvs = unknowns(sys) |
11 | 11 | 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, |
14 | 14 | 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) |
17 | 15 |
|
18 | 16 | if spec === SciMLBase.FunctionWrapperSpecialize && iip |
19 | 17 | if u0 === nothing || p === nothing || t === nothing |
|
23 | 21 | end |
24 | 22 |
|
25 | 23 | 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...) |
33 | 26 | else |
34 | 27 | _tgrad = nothing |
35 | 28 | end |
36 | 29 |
|
37 | 30 | 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...) |
46 | 33 | else |
47 | 34 | _jac = nothing |
48 | 35 | end |
|
0 commit comments