Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Change map for a for loop #45

Merged
merged 2 commits into from
Mar 31, 2021
Merged

Change map for a for loop #45

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
87beef2
Change map for a for loop to work around
andreasnoack Mar 31, 2021
b3ea422
Update basic_ensemble_solve.jl
ChrisRackauckas Mar 31, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions src/ensemble/basic_ensemble_solve.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,11 +182,16 @@ function solve_batch(prob,alg,ensemblealg::EnsembleDistributed,II,pmap_batch_siz
tighten_container_eltype(batch_data)
end

function solve_batch(prob,alg,::EnsembleSerial,II,pmap_batch_size;kwargs...)
batch_data = map(II) do i
batch_func(i,prob,alg;kwargs...)
function solve_batch(prob, alg, ::EnsembleSerial, II, pmap_batch_size; kwargs...)
if isempty(II)
throw(ArgumentError("number of trajectories must be positive"))
end
tighten_container_eltype(batch_data)
batch_data = [batch_func(first(II), prob, alg; kwargs...)]
ChrisRackauckas marked this conversation as resolved.
Show resolved Hide resolved
sizehint!(batch_data,length(II))
for i in 2:length(II)
@inbounds push!(batch_data, batch_func(II[i], prob, alg; kwargs...))
end
return tighten_container_eltype(batch_data)
end

function solve_batch(prob,alg,ensemblealg::EnsembleThreads,II,pmap_batch_size;kwargs...)
Expand Down