Merge pull request #53 from chriselrod/supportmorethreadsthantrajectories

Support more threads than trajectories.

Author: ChrisRackauckas

.github/workflows/CI.yml

@@ -33,6 +33,7 @@ jobs:
       - uses: julia-actions/julia-runtest@v1
         env:
           GROUP: ${{ matrix.group }}
+          JULIA_NUM_THREADS: 11
       - uses: julia-actions/julia-processcoverage@v1
       - uses: codecov/codecov-action@v1
         with:

Project.toml

@@ -1,7 +1,7 @@
 name = "SciMLBase"
 uuid = "0bca4576-84f4-4d90-8ffe-ffa030f20462"
 authors = ["Chris Rackauckas <[email protected]> and contributors"]
-version = "1.11.3"
+version = "1.11.4"
 
 [deps]
 ArrayInterface = "4fba245c-0d91-5ea0-9b3e-6abc04ee57a9"

src/ensemble/basic_ensemble_solve.jl

@@ -199,22 +199,21 @@ function SciMLBase.solve_batch(prob,alg,::EnsembleSerial,II,pmap_batch_size;kwar
 end
 
 function solve_batch(prob,alg,ensemblealg::EnsembleThreads,II,pmap_batch_size;kwargs...)
-
-  if length(II) == 1 || Threads.nthreads() == 1
+  nthreads = min(Threads.nthreads(), length(II))
+  if length(II) == 1 || nthreads == 1
     return solve_batch(prob,alg,EnsembleSerial(),II,pmap_batch_size;kwargs...)
   end
 
   if typeof(prob.prob) <: AbstractJumpProblem && length(II) != 1
-    probs = [deepcopy(prob.prob) for i in 1:Threads.nthreads()]
+    probs = [deepcopy(prob.prob) for i in 1:nthreads]
   else
     probs = prob.prob
   end
 
   #
-  batch_size = length(II)÷Threads.nthreads()
-
-  batch_data = tmap(1:Threads.nthreads()) do i
-    if i == Threads.nthreads()
+  batch_size = length(II)÷nthreads
+  batch_data = tmap(1:nthreads) do i
+    if i == nthreads
       I_local = II[(batch_size*(i-1)+1):end]
     else
       I_local = II[(batch_size*(i-1)+1):(batch_size*i)]