Skip to content

Commit beb62f7

Browse files
fix typo
1 parent c5221f6 commit beb62f7

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

src/ensemble/basic_ensemble_solve.jl

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -104,9 +104,9 @@ function __solve(prob::AbstractEnsembleProblem,
104104
return EnsembleSolution(_u,elapsed_time,converged)
105105
end
106106

107-
function batch_func(i,prob,alg,I,safetycopy,kwargs...)
107+
function batch_func(i,prob,alg,I,kwargs...)
108108
iter = 1
109-
_prob = safetycopy ? deepcopy(prob.prob) : prob.prob
109+
_prob = prob.safetycopy ? deepcopy(prob.prob) : prob.prob
110110
new_prob = prob.prob_func(_prob,i,iter)
111111
rerun = true
112112
x = prob.output_func(solve(new_prob,alg;kwargs...),i)
@@ -119,7 +119,7 @@ function batch_func(i,prob,alg,I,safetycopy,kwargs...)
119119
rerun = _x[2]
120120
while rerun
121121
iter += 1
122-
_prob = safetycopy ? deepcopy(prob.prob) : prob.prob
122+
_prob = prob.safetycopy ? deepcopy(prob.prob) : prob.prob
123123
new_prob = prob.prob_func(_prob,i,iter)
124124
x = prob.output_func(solve(new_prob,alg;kwargs...),i)
125125
if !(typeof(x) <: Tuple)
@@ -137,7 +137,7 @@ function solve_batch(prob,alg,ensemblealg::EnsembleDistributed,I,pmap_batch_size
137137
wp=CachingPool(workers())
138138
batch_data = let
139139
pmap(wp,I,batch_size=pmap_batch_size) do i
140-
batch_func(i,prob,alg,I,ensemblealg.safetycopy,kwargs...)
140+
batch_func(i,prob,alg,I,kwargs...)
141141
end
142142
end
143143
map(i->batch_data[i],1:length(batch_data))
@@ -158,7 +158,7 @@ function solve_batch(prob,alg,ensemblealg::EnsembleThreads,I,pmap_batch_size,kwa
158158
Threads.@threads for batch_idx in axes(batch_data, 1)
159159
i = I[batch_idx]
160160
iter = 1
161-
_prob = ensemblealg.safetycopy ? deepcopy(prob.prob) : prob.prob
161+
_prob = prob.safetycopy ? deepcopy(prob.prob) : prob.prob
162162
new_prob = prob.prob_func(_prob,i,iter)
163163
x = prob.output_func(solve(new_prob,alg;kwargs...),i)
164164
if !(typeof(x) <: Tuple)
@@ -171,7 +171,7 @@ function solve_batch(prob,alg,ensemblealg::EnsembleThreads,I,pmap_batch_size,kwa
171171

172172
while rerun
173173
iter += 1
174-
_prob = ensemblealg.safetycopy ? deepcopy(prob.prob) : prob.prob
174+
_prob = prob.safetycopy ? deepcopy(prob.prob) : prob.prob
175175
new_prob = prob.prob_func(_prob,i,iter)
176176
x = prob.output_func(solve(new_prob,alg;kwargs...),i)
177177
if !(typeof(x) <: Tuple)
@@ -199,20 +199,20 @@ function solve_batch(prob,alg,::EnsembleSplitThreads,I,pmap_batch_size,kwargs...
199199
else
200200
I_local = I[(batch_size*(i-1)+1):(batch_size*i)]
201201
end
202-
thread_monte(prob,I_local,alg,i,ensemblealg.safetycopy,kwargs...)
202+
thread_monte(prob,I_local,alg,i,kwargs...)
203203
end
204204
end
205205
_batch_data = vector_batch_data_to_arr(batch_data)
206206
end
207207

208-
function thread_monte(prob,I,alg,procid,safetycopy,kwargs...)
208+
function thread_monte(prob,I,alg,procid,kwargs...)
209209
batch_data = Vector{Any}(undef,length(I))
210210
let
211211
j = 0
212212
Threads.@threads for i in I
213213
j += 1
214214
iter = 1
215-
_prob = safetycopy ? deepcopy(prob.prob) : prob.prob
215+
_prob = prob.safetycopy ? deepcopy(prob.prob) : prob.prob
216216
new_prob = prob.prob_func(_prob,i,iter)
217217
rerun = true
218218
x = prob.output_func(solve(new_prob,alg;kwargs...),i)
@@ -225,7 +225,7 @@ function thread_monte(prob,I,alg,procid,safetycopy,kwargs...)
225225
rerun = _x[2]
226226
while rerun
227227
iter += 1
228-
_prob = safetycopy ? deepcopy(prob.prob) : prob.prob
228+
_prob = prob.safetycopy ? deepcopy(prob.prob) : prob.prob
229229
new_prob = prob.prob_func(_prob,i,iter)
230230
x = prob.output_func(solve(new_prob,alg;kwargs...),i)
231231
if !(typeof(x) <: Tuple)

0 commit comments

Comments
 (0)