Merge branch 'master' into md-links

Author: abhro

Project.toml

@@ -1,7 +1,7 @@
 name = "SciMLBase"
 uuid = "0bca4576-84f4-4d90-8ffe-ffa030f20462"
 authors = ["Chris Rackauckas <[email protected]> and contributors"]
-version = "2.115.0"
+version = "2.116.2"
 
 [deps]
 ADTypes = "47edcb42-4c32-4615-8424-f2b9edc5f35b"
@@ -57,6 +57,7 @@ SciMLBaseDistributionsExt = "Distributions"
 SciMLBaseForwardDiffExt = "ForwardDiff"
 SciMLBaseMLStyleExt = "MLStyle"
 SciMLBaseMakieExt = "Makie"
+SciMLBaseMeasurementsExt = "Measurements"
 SciMLBaseMonteCarloMeasurementsExt = "MonteCarloMeasurements"
 SciMLBaseMooncakeExt = "Mooncake"
 SciMLBasePartialFunctionsExt = "PartialFunctions"

ext/SciMLBaseMeasurementsExt.jl

@@ -1,18 +1,18 @@
 module SciMLBaseMeasurementsExt
 
 using Measurements
-using SciMLBase: value
+using SciMLBase: SciMLBase
 
 function SciMLBase.promote_u0(u0::AbstractArray{<:Measurements.Measurement},
         p::AbstractArray{<:Measurements.Measurement}, t0)
     u0
 end
 SciMLBase.promote_u0(u0, p::AbstractArray{<:Measurements.Measurement}, t0) = eltype(p).(u0)
 
-value(x::Type{Measurements.Measurement{T}}) where {T} = T
-value(x::Measurements.Measurement) = Measurements.value(x)
+SciMLBase.value(x::Type{Measurements.Measurement{T}}) where {T} = T
+SciMLBase.value(x::Measurements.Measurement) = Measurements.value(x)
 
-unitfulvalue(x::Type{Measurements.Measurement{T}}) where {T} = T
-unitfulvalue(x::Measurements.Measurement) = Measurements.value(x)
+SciMLBase.unitfulvalue(x::Type{Measurements.Measurement{T}}) where {T} = T
+SciMLBase.unitfulvalue(x::Measurements.Measurement) = Measurements.value(x)
 
 end

src/SciMLBase.jl

@@ -14,7 +14,7 @@ using Distributed
 using Markdown
 using Printf
 import Preferences
-using PreallocationTools: get_tmp, DiffCache
+using PreallocationTools: get_tmp, DiffCache, FixedSizeDiffCache
 
 import Logging, ArrayInterface
 import IteratorInterfaceExtensions

src/errors.jl

@@ -120,8 +120,6 @@ function Base.showerror(io::IO, e::CommonKwargError)
     unrecognized = collect(keys(e.kwargs))[notin]
     print(io, "Unrecognized keyword arguments: ")
     printstyled(io, unrecognized; bold = true, color = :red)
-    print(io, "\n\n")
-    println(io, TruncatedStacktraces.VERBOSE_MSG)
 end
 
 @enum KeywordArgError KeywordArgWarn KeywordArgSilent
@@ -147,7 +145,6 @@ struct IncompatibleInitialConditionError <: Exception end
 
 function Base.showerror(io::IO, e::IncompatibleInitialConditionError)
     print(io, INCOMPATIBLE_U0_MESSAGE)
-    println(io, TruncatedStacktraces.VERBOSE_MSG)
 end
 
 const NO_DEFAULT_ALGORITHM_MESSAGE = """
@@ -164,7 +161,6 @@ struct NoDefaultAlgorithmError <: Exception end
 
 function Base.showerror(io::IO, e::NoDefaultAlgorithmError)
     print(io, NO_DEFAULT_ALGORITHM_MESSAGE)
-    println(io, TruncatedStacktraces.VERBOSE_MSG)
 end
 
 const NO_TSPAN_MESSAGE = """
@@ -175,7 +171,6 @@ struct NoTspanError <: Exception end
 
 function Base.showerror(io::IO, e::NoTspanError)
     print(io, NO_TSPAN_MESSAGE)
-    println(io, TruncatedStacktraces.VERBOSE_MSG)
 end
 
 const NAN_TSPAN_MESSAGE = """
@@ -189,7 +184,6 @@ struct NaNTspanError <: Exception end
 
 function Base.showerror(io::IO, e::NaNTspanError)
     print(io, NAN_TSPAN_MESSAGE)
-    println(io, TruncatedStacktraces.VERBOSE_MSG)
 end
 
 const NON_SOLVER_MESSAGE = """
@@ -207,7 +201,6 @@ struct NonSolverError <: Exception end
 
 function Base.showerror(io::IO, e::NonSolverError)
     print(io, NON_SOLVER_MESSAGE)
-    println(io, TruncatedStacktraces.VERBOSE_MSG)
 end
 
 const NOISE_SIZE_MESSAGE = """
@@ -235,7 +228,6 @@ function Base.showerror(io::IO, e::NoiseSizeIncompatabilityError)
     println(io, NOISE_SIZE_MESSAGE)
     println(io, "size(prob.noise_rate_prototype,2) = $(e.prototypesize)")
     println(io, "length(prob.noise.W[1]) = $(e.noisesize)")
-    println(io, TruncatedStacktraces.VERBOSE_MSG)
 end
 
 const PROBSOLVER_PAIRING_MESSAGE = """
@@ -256,7 +248,6 @@ function Base.showerror(io::IO, e::ProblemSolverPairingError)
     println(io, "Solver type: $(SciMLBase.__parameterless_type(typeof(e.alg)))")
     println(io,
         "Problem types compatible with the chosen solver: $(compatible_problem_types(e.prob,e.alg))")
-    println(io, TruncatedStacktraces.VERBOSE_MSG)
 end
 
 function compatible_problem_types(prob, alg)
@@ -297,7 +288,6 @@ struct DirectAutodiffError <: Exception end
 
 function Base.showerror(io::IO, e::DirectAutodiffError)
     println(io, DIRECT_AUTODIFF_INCOMPATABILITY_MESSAGE)
-    println(io, TruncatedStacktraces.VERBOSE_MSG)
 end
 
 const NONNUMBER_ELTYPE_MESSAGE = """
@@ -336,7 +326,6 @@ end
 function Base.showerror(io::IO, e::NonNumberEltypeError)
     print(io, NONNUMBER_ELTYPE_MESSAGE)
     print(io, e.eltype)
-    println(io, TruncatedStacktraces.VERBOSE_MSG)
 end
 
 const GENERIC_NUMBER_TYPE_ERROR_MESSAGE = """
@@ -362,7 +351,6 @@ function Base.showerror(io::IO, e::GenericNumberTypeError)
     println(io, "Solver: $(e.alg)")
     println(io, "u0 type: $(e.uType)")
     print(io, "Timespan type: $(e.tType)")
-    println(io, TruncatedStacktraces.VERBOSE_MSG)
 end
 
 const COMPLEX_SUPPORT_ERROR_MESSAGE = """
@@ -381,7 +369,6 @@ end
 function Base.showerror(io::IO, e::ComplexSupportError)
     println(io, COMPLEX_SUPPORT_ERROR_MESSAGE)
     println(io, "Solver: $(e.alg)")
-    println(io, TruncatedStacktraces.VERBOSE_MSG)
 end
 
 const COMPLEX_TSPAN_ERROR_MESSAGE = """
@@ -396,7 +383,6 @@ struct ComplexTspanError <: Exception end
 
 function Base.showerror(io::IO, e::ComplexTspanError)
     println(io, COMPLEX_TSPAN_ERROR_MESSAGE)
-    println(io, TruncatedStacktraces.VERBOSE_MSG)
 end
 
 const TUPLE_STATE_ERROR_MESSAGE = """
@@ -434,7 +420,6 @@ struct TupleStateError <: Exception end
 
 function Base.showerror(io::IO, e::TupleStateError)
     println(io, TUPLE_STATE_ERROR_MESSAGE)
-    println(io, TruncatedStacktraces.VERBOSE_MSG)
 end
 
 const MASS_MATRIX_ERROR_MESSAGE = """
@@ -455,7 +440,6 @@ function Base.showerror(io::IO, e::IncompatibleMassMatrixError)
     println(io, e.sz)
     print(io, "length(u0): ")
     println(e.len)
-    println(io, TruncatedStacktraces.VERBOSE_MSG)
 end
 
 const LATE_BINDING_TSTOPS_ERROR_MESSAGE = """
@@ -468,5 +452,4 @@ struct LateBindingTstopsNotSupportedError <: Exception end
 
 function Base.showerror(io::IO, e::LateBindingTstopsNotSupportedError)
     println(io, LATE_BINDING_TSTOPS_ERROR_MESSAGE)
-    println(io, TruncatedStacktraces.VERBOSE_MSG)
 end

src/scimlfunctions.jl

@@ -2261,7 +2261,7 @@ All of the remaining functions are optional for improving or accelerating
 the usage of `f` and `bc`. These include:
 
 - `cost(u, p)`: the target to be minimized, similar with the `cost` function
-  in [`OptimizationFunction`](@ref). This is used to define the objective function
+  in `OptimizationFunction`. This is used to define the objective function
   of the BVP, which can be minimized by optimization solvers.
 - `equality(res, u, t)`: equality constraints functions for the BVP.
 - `inequality(res, u, t)`: inequality constraints functions for the BVP.
@@ -4279,7 +4279,6 @@ function OptimizationFunction{iip}(f, adtype::AbstractADType = NoAD();
         lag_hess_colorvec = nothing,
         initialization_data = __has_initialization_data(f) ? f.initialization_data :
                               nothing) where {iip}
-    isinplace(f, 2; has_two_dispatches = false, isoptimization = true)
     sys = sys_or_symbolcache(sys, syms, paramsyms)
     OptimizationFunction{
         iip, typeof(adtype), typeof(f), typeof(grad), typeof(fg), typeof(hess),
@@ -4948,6 +4947,7 @@ __has_Wfact(f) = hasfield(typeof(f), :Wfact)
 __has_Wfact_t(f) = hasfield(typeof(f), :Wfact_t)
 __has_W_prototype(f) = hasfield(typeof(f), :W_prototype)
 __has_paramjac(f) = hasfield(typeof(f), :paramjac)
+__has_controljac(f) = hasfield(typeof(f), :controljac)
 __has_jac_prototype(f) = hasfield(typeof(f), :jac_prototype)
 __has_controljac_prototype(f) = hasfield(typeof(f), :controljac_prototype)
 __has_sparsity(f) = hasfield(typeof(f), :sparsity)

src/solve.jl

@@ -29,7 +29,6 @@ end
 function Base.showerror(io::IO, e::NonConcreteEltypeError)
     print(io, NONCONCRETE_ELTYPE_MESSAGE)
     print(io, e.eltype)
-    println(io, TruncatedStacktraces.VERBOSE_MSG)
 end
 
 # Skip the DiffEqBase handling
@@ -462,6 +461,7 @@ end
 
 anyeltypedual(x) = anyeltypedual(x, Val{0})
 anyeltypedual(x, counter) = Any
+anyeltypedual(x::FixedSizeDiffCache, counter = 0) = Any
 
 value(x) = x
 unitfulvalue(x) = x
@@ -530,7 +530,6 @@ struct AdjointNotFoundError <: Exception end
 
 function Base.showerror(io::IO, e::AdjointNotFoundError)
     print(io, ADJOINT_NOT_FOUND_MESSAGE)
-    println(io, TruncatedStacktraces.VERBOSE_MSG)
 end
 
 function _concrete_solve_adjoint(args...; kwargs...)
@@ -547,7 +546,6 @@ struct ForwardSensitivityNotFoundError <: Exception end
 
 function Base.showerror(io::IO, e::ForwardSensitivityNotFoundError)
     print(io, FORWARD_SENSITIVITY_NOT_FOUND_MESSAGE)
-    println(io, TruncatedStacktraces.VERBOSE_MSG)
 end
 
 function _concrete_solve_forward(args...; kwargs...)

test/function_building_error_messages.jl

@@ -507,6 +507,14 @@ optf(u, p) = 1.0
 OptimizationFunction(optf)
 OptimizationProblem(optf, 1.0)
 
+# Test OptimizationFunction{iip} respects explicit iip parameter
+# This function would fail isinplace check due to method ambiguity
+struct ProblematicOptFunction end
+(::ProblematicOptFunction)(x, p) = sum(x .^ 2)
+# But when iip is explicitly provided, it should work without calling isinplace
+@test_nowarn OptimizationFunction{false}(ProblematicOptFunction())
+@test_nowarn OptimizationFunction{true}(ProblematicOptFunction())
+
 # BVPFunction
 
 bfoop(u, p, t) = u