Skip to content

Commit 50c300b

Browse files
committed
updates to runner
1 parent 3fa28d5 commit 50c300b

2 files changed

Lines changed: 6 additions & 5 deletions

File tree

src/executionplan.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ estimate_singleread(ia) = ia.ismem ? 1e-16 : 3.0
272272
function optimize_loopranges(op::GMDWop,max_cache;tol_low=0.2,tol_high = 0.05,max_order=2,x0 = nothing, force_regular=false)
273273
lb = [0.0,map(_->1.0,op.windowsize)...]
274274
ub = [max_cache,op.windowsize...]
275-
x0 = x0 === nothing ? [2.0 for _ in op.windowsize] : x0
275+
x0 = x0 === nothing ? [1.5 for _ in op.windowsize] : x0
276276
totsize = op.windowsize
277277
input_chunkspecs = get_chunkspec.(op.inars,(totsize,))
278278
output_chunkspecs = get_chunkspec.(op.outspecs,op.f.outtype)

src/runner.jl

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -168,21 +168,22 @@ function run_loop(runner::LocalRunner,loopranges = runner.loopranges;groupspecs=
168168
)
169169
end
170170

171-
function default_loopbody(inow, op, inbuffers_pure, outbuffers, threaded, outars, cb, runfilter)
171+
function default_loopbody(inow, op, inbuffers_pure, outbuffers, threaded, outars, cb, runfilter, piddir)
172172
@debug "inow = ", inow
173173
if all(c -> need_run(inow, c), runfilter)
174174
inbuffers_wrapped = read_range.((inow,),op.inars,inbuffers_pure);
175175
outbuffers_now = extract_outbuffer.((inow,),op.outspecs,op.f.init,op.f.buftype,outbuffers)
176176
run_block(op,inow,inbuffers_wrapped,outbuffers_now,threaded)
177-
put_buffer.((inow,),outbuffers_now,outars,nothing)
177+
put_buffer.((inow,),outbuffers_now,outars,(piddir,))
178178
clean_aggregator.(outbuffers)
179179
notify_callback(cb, inow)
180180
end
181+
true
181182
end
182183

183184
@noinline function run_loop(::LocalRunner, op, inbuffers_pure, outbuffers, threaded, outars, loopranges, cb, runfilter; groupspecs=nothing)
184185
for inow in loopranges
185-
default_loopbody(inow, op, inbuffers_pure, outbuffers, threaded, outars, cb, runfilter)
186+
default_loopbody(inow, op, inbuffers_pure, outbuffers, threaded, outars, cb, runfilter,nothing)
186187
end
187188
notify_callback(cb, nothing)
188189
end
@@ -228,7 +229,7 @@ end
228229

229230
@noinline function run_loop(::PMapRunner, op, inbuffers_pure, outbuffers, threaded, outars, cb, runfilter, loopranges; groupspecs=nothing)
230231
pmap(CachingPool(workers()),loopranges) do inow
231-
default_loopbody(inow, op, inbuffers_pure, outbuffers, threaded, outars, cb, runfilter)
232+
default_loopbody(inow, op, inbuffers_pure, outbuffers, threaded, outars, cb, runfilter,nothing)
232233
end
233234
notify_callback(cb, nothing)
234235
end

0 commit comments

Comments
 (0)