Skip to content

Commit 964cd9a

Browse files
change multithreaded argument
1 parent 0bb1b44 commit 964cd9a

File tree

5 files changed

+15
-15
lines changed

5 files changed

+15
-15
lines changed

src/systems/diffeqs/abstractodesystem.jl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ function DiffEqBase.ODEProblem{iip}(sys::AbstractODESystem,u0map,tspan,
197197
version = nothing, tgrad=false,
198198
jac = false, Wfact = false,
199199
checkbounds = false, sparse = false,
200-
linenumbers = true, multithread=false,
200+
linenumbers = true, parallel=SerialForm(),
201201
kwargs...) where iip
202202
```
203203
@@ -209,10 +209,10 @@ function DiffEqBase.ODEProblem{iip}(sys::AbstractODESystem,u0map,tspan,
209209
version = nothing, tgrad=false,
210210
jac = false, Wfact = false,
211211
checkbounds = false, sparse = false,
212-
linenumbers = true, multithread=false,
212+
linenumbers = true, parallel=SerialForm(),
213213
kwargs...) where iip
214214
f = ODEFunction(sys;tgrad=tgrad,jac=jac,Wfact=Wfact,checkbounds=checkbounds,
215-
linenumbers=linenumbers,multithread=multithread,
215+
linenumbers=linenumbers,parallel=parallel,
216216
sparse=sparse)
217217
u0 = varmap_to_vars(u0map,states(sys))
218218
p = varmap_to_vars(parammap,parameters(sys))

src/systems/diffeqs/sdesystem.jl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ function DiffEqBase.SDEProblem{iip}(sys::SDESystem,u0map,tspan,p=parammap;
161161
version = nothing, tgrad=false,
162162
jac = false, Wfact = false,
163163
checkbounds = false, sparse = false,
164-
linenumbers = true, multithread=false,
164+
linenumbers = true, parallel=SerialForm(),
165165
kwargs...)
166166
```
167167
@@ -172,11 +172,11 @@ function DiffEqBase.SDEProblem{iip}(sys::SDESystem,u0map,tspan,parammap=DiffEqBa
172172
version = nothing, tgrad=false,
173173
jac = false, Wfact = false,
174174
checkbounds = false, sparse = false,
175-
linenumbers = true, multithread=false,
175+
linenumbers = true, parallel=SerialForm(),
176176
kwargs...) where iip
177177

178178
f = SDEFunction(sys;tgrad=tgrad,jac=jac,Wfact=Wfact,checkbounds=checkbounds,
179-
linenumbers=linenumbers,multithread=multithread,
179+
linenumbers=linenumbers,parallel=parallel,
180180
sparse=sparse)
181181
u0 = varmap_to_vars(u0map,states(sys))
182182
p = varmap_to_vars(parammap,parameters(sys))
@@ -185,4 +185,4 @@ end
185185

186186
function DiffEqBase.SDEProblem(sys::SDESystem, args...; kwargs...)
187187
SDEProblem{true}(sys, args...; kwargs...)
188-
end
188+
end

src/systems/nonlinear/nonlinearsystem.jl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ function DiffEqBase.NonlinearProblem{iip}(sys::NonlinearSystem,u0map,tspan,
7171
parammap=DiffEqBase.NullParameters();
7272
jac = false, sparse=false,
7373
checkbounds = false,
74-
linenumbers = true, multithread=false,
74+
linenumbers = true, parallel=SerialForm(),
7575
kwargs...) where iip
7676
```
7777
@@ -82,13 +82,13 @@ function DiffEqBase.NonlinearProblem{iip}(sys::NonlinearSystem,u0map,tspan,
8282
parammap=DiffEqBase.NullParameters();
8383
jac = false, sparse=false,
8484
checkbounds = false,
85-
linenumbers = true, multithread=false,
85+
linenumbers = true, parallel=SerialForm(),
8686
kwargs...) where iip
8787
dvs = states(sys)
8888
ps = parameters(sys)
8989

9090
f = generate_function(sys;checkbounds=checkbounds,linenumbers=linenumbers,
91-
multithread=multithread,sparse=sparse,expression=Val{false})
91+
parallel=parallel,sparse=sparse,expression=Val{false})
9292
u0 = varmap_to_vars(u0map,dvs)
9393
p = varmap_to_vars(parammap,ps)
9494
NonlinearProblem(f,u0,tspan,p;kwargs...)

src/systems/optimization/optimizationsystem.jl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ function DiffEqBase.OptimizationProblem{iip}(sys::OptimizationSystem,
8080
u0=nothing, lb=nothing, ub=nothing,
8181
hes = false, sparse = false,
8282
checkbounds = false,
83-
linenumbers = true, multithread=false,
83+
linenumbers = true, parallel=SerialForm(),
8484
kwargs...) where iip
8585
```
8686
@@ -92,13 +92,13 @@ function DiffEqBase.OptimizationProblem{iip}(sys::OptimizationSystem,
9292
u0=nothing, lb=nothing, ub=nothing,
9393
hes = false, sparse = false,
9494
checkbounds = false,
95-
linenumbers = true, multithread=false,
95+
linenumbers = true, parallel=SerialForm(),
9696
kwargs...) where iip
9797
dvs = states(sys)
9898
ps = parameters(sys)
9999

100100
f = generate_function(sys,checkbounds=checkbounds,linenumbers=linenumbers,
101-
multithread=multithread,expression=Val{false})
101+
parallel=parallel,expression=Val{false})
102102
u0 = varmap_to_vars(u0,dvs)
103103
p = varmap_to_vars(parammap,ps)
104104
lb = varmap_to_vars(lb,dvs)

test/bigsystem.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,13 @@ end
4545

4646
f(du,u,nothing,0.0)
4747

48-
multithreadedf = eval(ModelingToolkit.build_function(du,u,multithread=true)[2])
48+
multithreadedf = eval(ModelingToolkit.build_function(du,u,parallel=MultithreadedForm())[2])
4949
_du = rand(N,N,3)
5050
_u = rand(N,N,3)
5151
multithreadedf(_du,_u)
5252

5353
jac = sparse(ModelingToolkit.jacobian(vec(du),vec(u),simplify=false))
54-
multithreadedjac = eval(ModelingToolkit.build_function(vec(jac),u,multithread=true)[2])
54+
multithreadedjac = eval(ModelingToolkit.build_function(vec(jac),u,parallel=MultithreadedForm())[2])
5555

5656
#_jac = similar(jac,Float64)
5757
#multithreadedjac(_jac,_u)

0 commit comments

Comments
 (0)