Skip to content

Commit

Permalink
Revert "Actually collect maps asynchronously"
Browse files Browse the repository at this point in the history
This reverts commit 324eadb.
  • Loading branch information
glwagner committed Nov 15, 2022
1 parent 983fa93 commit 8e57118
Showing 1 changed file with 5 additions and 12 deletions.
17 changes: 5 additions & 12 deletions src/InverseProblems.jl
Expand Up @@ -337,8 +337,7 @@ Base.length(batch::BatchedInverseProblem) = length(batch.batch)
Nensemble(batched_ip::BatchedInverseProblem) = Nensemble(first(batched_ip.batch))

function collect_forward_maps_asynchronously!(outputs, batched_ip, parameters; kw...)
start_time = time_ns()

#=
@sync begin
for (n, ip) in enumerate(batched_ip.batch)
@async begin
Expand All @@ -347,31 +346,25 @@ function collect_forward_maps_asynchronously!(outputs, batched_ip, parameters; k
end
end
end
=#

#=
for (n, ip) in enumerate(batched_ip.batch)
forward_map_output = forward_map(ip, parameters; suppress=false, kw...)
outputs[n] = batched_ip.weights[n] * forward_map_output
end
=#

end_time = time_ns()
elapsed = 1e-9 * (end_time - start_time)

return elapsed
return outputs
end

function forward_map(batched_ip::BatchedInverseProblem, parameters; suppress=true, kw...)
outputs = Dict()

if suppress
@suppress elapsed = collect_forward_maps_asynchronously!(outputs, batched_ip, parameters; kw...)
@suppress collect_forward_maps_asynchronously!(outputs, batched_ip, parameters; kw...)
else
elapsed = collect_forward_maps_asynchronously!(outputs, batched_ip, parameters; kw...)
collect_forward_maps_asynchronously!(outputs, batched_ip, parameters; kw...)
end

@info "Forward map collection took " * prettytime(elapsed)

vectorized_outputs = [outputs[n] for n = 1:length(batched_ip)]

return vcat(vectorized_outputs...)
Expand Down

0 comments on commit 8e57118

Please sign in to comment.