Merge branch 'master' into move_scale

Author: SebastianM-C

Project.toml

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

src/ensemble/basic_ensemble_solve.jl

@@ -182,11 +182,20 @@ 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 responsible_map(f,II...)
+  batch_data = []
+  sizehint!(batch_data,length(II[1]))
+  for i in 1:length(II[1])
+    @inbounds push!(batch_data, f(getindex.(II,i)...))
   end
-  tighten_container_eltype(batch_data)
+  identity.(batch_data)
+end
+
+function SciMLBase.solve_batch(prob,alg,::EnsembleSerial,II,pmap_batch_size;kwargs...)
+  batch_data = responsible_map(II) do i
+    SciMLBase.batch_func(i,prob,alg;kwargs...)
+  end
+  SciMLBase.tighten_container_eltype(batch_data)
 end
 
 function solve_batch(prob,alg,ensemblealg::EnsembleThreads,II,pmap_batch_size;kwargs...)

src/ensemble/ensemble_solutions.jl

@@ -95,9 +95,6 @@ end
 
 Base.summary(io::IO, A::AbstractEnsembleSolution) =
   print(io,"EnsembleSolution Solution of length ",length(A.u)," with uType:\n",eltype(A.u))
-function Base.show(io::IO, A::AbstractEnsembleSolution)
-  summary(io,A)
-end
 function Base.show(io::IO, m::MIME"text/plain", A::AbstractEnsembleSolution)
   summary(io,A)
 end

src/operators/common_defaults.jl

@@ -18,6 +18,8 @@ for op in (:*, :/, :\)
 end
 LinearAlgebra.mul!(Y::AbstractArray, L::AbstractDiffEqLinearOperator, B::AbstractArray) =
   mul!(Y, convert(AbstractMatrix,L), B)
+LinearAlgebra.mul!(Y::AbstractArray, L::AbstractDiffEqLinearOperator, B::AbstractArray, α::Number, β::Number) =
+  mul!(Y, convert(AbstractMatrix,L), B, α, β)
 for pred in (:isreal, :issymmetric, :ishermitian, :isposdef)
   @eval LinearAlgebra.$pred(L::AbstractDiffEqLinearOperator) = $pred(convert(AbstractArray, L))
 end

src/problems/problem_utils.jl

@@ -37,11 +37,11 @@ function Base.summary(io::IO, prob::AbstractLinearProblem)
     type_color,isinplace(prob),
     no_color)
 end
-function Base.show(io::IO, A::AbstractLinearProblem)
+function Base.show(io::IO, mime::MIME"text/plain", A::AbstractLinearProblem)
   summary(io,A)
   println(io)
   print(io,"b: ")
-  show(io, A.b)
+  show(io, mime, A.b)
 end
 
 function Base.summary(io::IO, prob::AbstractNonlinearProblem{uType,iip}) where {uType,iip}
@@ -54,11 +54,11 @@ function Base.summary(io::IO, prob::AbstractNonlinearProblem{uType,iip}) where {
     type_color,isinplace(prob),
     no_color)
 end
-function Base.show(io::IO, A::AbstractNonlinearProblem)
+function Base.show(io::IO, mime::MIME"text/plain", A::AbstractNonlinearProblem)
   summary(io,A)
   println(io)
   print(io,"u0: ")
-  show(io, A.u0)
+  show(io, mime, A.u0)
 end
 
 function Base.summary(io::IO, prob::AbstractOptimizationProblem)
@@ -69,11 +69,11 @@ function Base.summary(io::IO, prob::AbstractOptimizationProblem)
     type_color,isinplace(prob),
     no_color)
 end
-function Base.show(io::IO, A::AbstractOptimizationProblem)
+function Base.show(io::IO, mime::MIME"text/plain", A::AbstractOptimizationProblem)
   summary(io,A)
   println(io)
   print(io,"u0: ")
-  show(io, A.u0)
+  show(io, mime, A.u0)
 end
 
 function Base.summary(io::IO, prob::AbstractQuadratureProblem)
@@ -84,7 +84,7 @@ function Base.summary(io::IO, prob::AbstractQuadratureProblem)
     type_color,isinplace(prob),
     no_color)
 end
-function Base.show(io::IO, A::AbstractQuadratureProblem)
+function Base.show(io::IO, mime::MIME"text/plain", A::AbstractQuadratureProblem)
   summary(io,A)
   println(io)
 end
@@ -93,33 +93,33 @@ function Base.summary(io::IO, prob::AbstractNoiseProblem)
   print(io,
   nameof(typeof(prob))," with WType ",typeof(prob.noise.W[1])," and tType ",typeof(prob.tspan[1]),". In-place: ",isinplace(prob))
 end
-function Base.show(io::IO, A::DEProblem)
+function Base.show(io::IO, mime::MIME"text/plain", A::DEProblem)
   summary(io,A)
   println(io)
   print(io,"timespan: ")
-  show(io,A.tspan)
+  show(io,mime,A.tspan)
   println(io)
   print(io,"u0: ")
-  show(io, A.u0)
+  show(io, mime, A.u0)
 end
-function Base.show(io::IO, A::AbstractNoiseProblem)
+function Base.show(io::IO, mime::MIME"text/plain", A::AbstractNoiseProblem)
   summary(io,A)
   println(io)
   print(io,"timespan: ")
-  show(io,A.tspan)
+  show(io,mime,A.tspan)
   println(io)
 end
-function Base.show(io::IO, A::AbstractDAEProblem)
+function Base.show(io::IO, mime::MIME"text/plain", A::AbstractDAEProblem)
   summary(io,A)
   println(io)
   print(io,"timespan: ")
-  show(io,A.tspan)
+  show(io,mime,A.tspan)
   println(io)
   print(io,"u0: ")
-  show(io, A.u0)
+  show(io, mime, A.u0)
   println(io)
   print(io,"du0: ")
-  show(io, A.du0)
+  show(io, mime, A.du0)
 end
 
 function Base.summary(io::IO, prob::AbstractEnsembleProblem)
@@ -129,7 +129,7 @@ function Base.summary(io::IO, prob::AbstractEnsembleProblem)
     " with problem ",
     nameof(typeof(prob.prob)))
 end
-Base.show(io::IO, A::AbstractEnsembleProblem) = summary(io,A)
+Base.show(io::IO, mime::MIME"text/plain", A::AbstractEnsembleProblem) = summary(io,A)
 TreeViews.hastreeview(x::DEProblem) = true
 function TreeViews.treelabel(io::IO,x::DEProblem,
                              mime::MIME"text/plain" = MIME"text/plain"())
@@ -140,10 +140,9 @@ struct NullParameters end
 Base.getindex(::NullParameters,i...) = error("Parameters were indexed but the parameters are `nothing`. You likely forgot to pass in parameters to the DEProblem!")
 Base.iterate(::NullParameters) = error("Parameters were indexed but the parameters are `nothing`. You likely forgot to pass in parameters to the DEProblem!")
 
-function Base.show(io::IO, A::AbstractPDEProblem)
+function Base.show(io::IO, mime::MIME"text/plain", A::AbstractPDEProblem)
   summary(io,A.prob)
   println(io)
-  println(io)
 end
 function Base.summary(io::IO, prob::AbstractPDEProblem)
   print(io,

src/solutions/solution_interface.jl

@@ -11,8 +11,6 @@ Base.setindex!(A::AbstractNoTimeSolution, v, i::Int) = (A.u[i] = v)
 Base.setindex!(A::AbstractNoTimeSolution, v, I::Vararg{Int, N}) where {N} = (A.u[I] = v)
 Base.size(A::AbstractNoTimeSolution) = size(A.u)
 
-Base.summary(io::IO, A::AbstractNoTimeSolution) = print(io,nameof(typeof(A))," with uType ",eltype(A.u))
-Base.show(io::IO, A::AbstractNoTimeSolution) = (print(io,"u: ");show(io, A.u))
 Base.show(io::IO, m::MIME"text/plain", A::AbstractNoTimeSolution) = (print(io,"u: ");show(io,m,A.u))
 
 # Symbol Handling
@@ -113,15 +111,6 @@ function Base.summary(io::IO, A::AbstractTimeseriesSolution)
     type_color, eltype(A.t), no_color)
 end
 
-function Base.show(io::IO, A::AbstractTimeseriesSolution)
-  println(io,string("retcode: ",A.retcode))
-  println(io,string("Interpolation: "),interp_summary(A.interp))
-  print(io,"t: ")
-  show(io, A.t)
-  println(io)
-  print(io,"u: ")
-  show(io, A.u)
-end
 function Base.show(io::IO, m::MIME"text/plain", A::AbstractTimeseriesSolution)
   println(io,string("retcode: ",A.retcode))
   println(io,string("Interpolation: "),interp_summary(A.interp))

test/downstream/ensemble_zero_length.jl

@@ -1,4 +1,4 @@
-using OrdinaryDiffEq, Test
+using OrdinaryDiffEq, Test, LinearAlgebra
 prob = ODEProblem((u,p,t)->1.01u,0.5,(0.0,1.0), save_start=false, save_end=false)
 function prob_func(prob,i,repeat)
   remake(prob,u0=rand()*prob.u0)
@@ -12,3 +12,10 @@ ts = 0.0:0.1:1.0
 using SciMLBase.EnsembleAnalysis
 sim = solve(ensemble_prob,Tsit5(),EnsembleThreads(),trajectories=10,saveat=0.1)
 timeseries_point_meancov(sim,ts)
+
+function prob_sol(_p)
+  prob = ODEProblem((u,p,t)->p.*u, _p, (0.0,1.0), _p, save_start=false, save_end=false)
+  sim = solve(prob,Tsit5())
+end
+mapres = SciMLBase.responsible_map(prob_sol, [0.5, diagm([1.0, 1.0])])
+@test length(mapres) == 2