@@ -104,9 +104,9 @@ function __solve(prob::AbstractEnsembleProblem,
104
104
return EnsembleSolution (_u,elapsed_time,converged)
105
105
end
106
106
107
- function batch_func (i,prob,alg,I,safetycopy, kwargs... )
107
+ function batch_func (i,prob,alg,I,kwargs... )
108
108
iter = 1
109
- _prob = safetycopy ? deepcopy (prob. prob) : prob. prob
109
+ _prob = prob . safetycopy ? deepcopy (prob. prob) : prob. prob
110
110
new_prob = prob. prob_func (_prob,i,iter)
111
111
rerun = true
112
112
x = prob. output_func (solve (new_prob,alg;kwargs... ),i)
@@ -119,7 +119,7 @@ function batch_func(i,prob,alg,I,safetycopy,kwargs...)
119
119
rerun = _x[2 ]
120
120
while rerun
121
121
iter += 1
122
- _prob = safetycopy ? deepcopy (prob. prob) : prob. prob
122
+ _prob = prob . safetycopy ? deepcopy (prob. prob) : prob. prob
123
123
new_prob = prob. prob_func (_prob,i,iter)
124
124
x = prob. output_func (solve (new_prob,alg;kwargs... ),i)
125
125
if ! (typeof (x) <: Tuple )
@@ -137,7 +137,7 @@ function solve_batch(prob,alg,ensemblealg::EnsembleDistributed,I,pmap_batch_size
137
137
wp= CachingPool (workers ())
138
138
batch_data = let
139
139
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... )
141
141
end
142
142
end
143
143
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
158
158
Threads. @threads for batch_idx in axes (batch_data, 1 )
159
159
i = I[batch_idx]
160
160
iter = 1
161
- _prob = ensemblealg . safetycopy ? deepcopy (prob. prob) : prob. prob
161
+ _prob = prob . safetycopy ? deepcopy (prob. prob) : prob. prob
162
162
new_prob = prob. prob_func (_prob,i,iter)
163
163
x = prob. output_func (solve (new_prob,alg;kwargs... ),i)
164
164
if ! (typeof (x) <: Tuple )
@@ -171,7 +171,7 @@ function solve_batch(prob,alg,ensemblealg::EnsembleThreads,I,pmap_batch_size,kwa
171
171
172
172
while rerun
173
173
iter += 1
174
- _prob = ensemblealg . safetycopy ? deepcopy (prob. prob) : prob. prob
174
+ _prob = prob . safetycopy ? deepcopy (prob. prob) : prob. prob
175
175
new_prob = prob. prob_func (_prob,i,iter)
176
176
x = prob. output_func (solve (new_prob,alg;kwargs... ),i)
177
177
if ! (typeof (x) <: Tuple )
@@ -199,20 +199,20 @@ function solve_batch(prob,alg,::EnsembleSplitThreads,I,pmap_batch_size,kwargs...
199
199
else
200
200
I_local = I[(batch_size* (i- 1 )+ 1 ): (batch_size* i)]
201
201
end
202
- thread_monte (prob,I_local,alg,i,ensemblealg . safetycopy, kwargs... )
202
+ thread_monte (prob,I_local,alg,i,kwargs... )
203
203
end
204
204
end
205
205
_batch_data = vector_batch_data_to_arr (batch_data)
206
206
end
207
207
208
- function thread_monte (prob,I,alg,procid,safetycopy, kwargs... )
208
+ function thread_monte (prob,I,alg,procid,kwargs... )
209
209
batch_data = Vector {Any} (undef,length (I))
210
210
let
211
211
j = 0
212
212
Threads. @threads for i in I
213
213
j += 1
214
214
iter = 1
215
- _prob = safetycopy ? deepcopy (prob. prob) : prob. prob
215
+ _prob = prob . safetycopy ? deepcopy (prob. prob) : prob. prob
216
216
new_prob = prob. prob_func (_prob,i,iter)
217
217
rerun = true
218
218
x = prob. output_func (solve (new_prob,alg;kwargs... ),i)
@@ -225,7 +225,7 @@ function thread_monte(prob,I,alg,procid,safetycopy,kwargs...)
225
225
rerun = _x[2 ]
226
226
while rerun
227
227
iter += 1
228
- _prob = safetycopy ? deepcopy (prob. prob) : prob. prob
228
+ _prob = prob . safetycopy ? deepcopy (prob. prob) : prob. prob
229
229
new_prob = prob. prob_func (_prob,i,iter)
230
230
x = prob. output_func (solve (new_prob,alg;kwargs... ),i)
231
231
if ! (typeof (x) <: Tuple )
0 commit comments