finalize splitthreads fixes and test distributed ensembles

Author: ChrisRackauckas

src/ensemble/basic_ensemble_solve.jl

@@ -199,9 +199,10 @@ end
 
 function thread_monte(prob,I,alg,procid,kwargs...)
   batch_data = Vector{Any}(undef,length(I))
-  @show I
   let
+    j = 0
     Threads.@threads for i in I
+      j += 1
       iter = 1
       new_prob = prob.prob_func(deepcopy(prob.prob),i,iter)
       rerun = true
@@ -225,7 +226,7 @@ function thread_monte(prob,I,alg,procid,kwargs...)
           end
           rerun = _x[2]
       end
-      batch_data[i - start + 1] = _x[1]
+      batch_data[j] = _x[1]
     end
   end
   batch_data

test/downstream/distributed_ensemble.jl

@@ -0,0 +1,14 @@
+using Distributed
+addprocs(2)
+println("There are $(nprocs()) processes")
+@everywhere using OrdinaryDiffEq
+
+@everywhere prob = ODEProblem((u,p,t)->1.01u,0.5,(0.0,1.0))
+@everywhere u0s = [rand()*prob.u0 for i in 1:2]
+@everywhere function prob_func(prob,i,repeat)
+    println("Running trajectory $i")
+    ODEProblem(prob.f,u0s[i],prob.tspan)
+end
+
+ensemble_prob = EnsembleProblem(prob, prob_func=prob_func)
+sim = solve(ensemble_prob,Tsit5(),EnsembleSplitThreads(),trajectories=2)

test/runtests.jl

@@ -48,6 +48,7 @@ if !is_APPVEYOR && GROUP == "Downstream"
     @time @safetestset "DEDataArray" begin include("downstream/data_array_regression_tests.jl") end
     @time @safetestset "Concrete_solve Tests" begin include("downstream/concrete_solve_tests.jl") end
     @time @safetestset "AD Tests" begin include("downstream/ad_tests.jl") end
+    @time @testset "Distributed Ensemble Tests" begin include("downstream/distributed_ensemble.jl") end
 end
 
 if !is_APPVEYOR && GROUP == "GPU"