Merge branch 'master' into format

Author: ChrisRackauckas

Project.toml

@@ -1,7 +1,7 @@
 name = "SciMLBase"
 uuid = "0bca4576-84f4-4d90-8ffe-ffa030f20462"
 authors = ["Chris Rackauckas <[email protected]> and contributors"]
-version = "2.94.1"
+version = "2.96.0"
 
 [deps]
 ADTypes = "47edcb42-4c32-4615-8424-f2b9edc5f35b"
@@ -85,7 +85,7 @@ RecipesBase = "1.3.4"
 RecursiveArrayTools = "3.27.2"
 Reexport = "1"
 RuntimeGeneratedFunctions = "0.5.12"
-SciMLOperators = "0.4.0, 1"
+SciMLOperators = "0.4, 1.3"
 SciMLStructures = "1.1"
 StableRNGs = "1.0"
 StaticArrays = "1.7"

ext/SciMLBaseChainRulesCoreExt.jl

@@ -65,6 +65,15 @@ function ChainRulesCore.rrule(::Type{ODEProblem}, args...; kwargs...)
     ODEProblem(args...; kwargs...), ODEProblemAdjoint
 end
 
+function ChainRulesCore.rrule(::Type{
+    <:ODEProblem{iip, T}}, args...; kwargs...) where {iip, T}
+    function ODEProblemAdjoint(ȳ)
+        (NoTangent(), ȳ.f, ȳ.u0, ȳ.tspan, ȳ.p, ȳ.kwargs, ȳ.problem_type)
+    end
+
+    ODEProblem(args...; kwargs...), ODEProblemAdjoint
+end
+
 function ChainRulesCore.rrule(::Type{SDEProblem}, args...; kwargs...)
     function SDEProblemAdjoint(ȳ)
         (NoTangent(), ȳ.f, ȳ.g, ȳ.u0, ȳ.tspan, ȳ.p, ȳ.kwargs, ȳ.problem_type)

src/scimlfunctions.jl

@@ -2571,19 +2571,23 @@ end
 ######### Backwards Compatibility Overloads
 
 (f::ODEFunction)(args...) = f.f(args...)
-function (f::ODEFunction)(du, u, p, t)
-    if f.f isa AbstractSciMLOperator
-        f.f(du, u, u, p, t)
-    else
-        f.f(du, u, p, t)
-    end
-end
-function (f::ODEFunction)(u, p, t)
-    if f.f isa AbstractSciMLOperator
-        f.f(u, u, p, t)
-    else
-        f.f(u, p, t)
-    end
+
+@static if isdefined(SciMLOperators, :isv1)
+  function (f::ODEFunction)(du, u, p, t) 
+      if f.f isa AbstractSciMLOperator
+          f.f(du, u, u, p, t)
+      else
+          f.f(du, u, p, t)
+      end
+  end
+
+  function (f::ODEFunction)(u, p, t) 
+      if f.f isa AbstractSciMLOperator
+          f.f(u, u, p, t)
+      else
+          f.f(u, p, t)
+      end
+  end
 end
 
 (f::NonlinearFunction)(args...) = f.f(args...)
@@ -2779,7 +2783,7 @@ function unwrapped_f(f::ODEFunction, newf = unwrapped_f(f.f))
     if specialization(f) === NoSpecialize
         ODEFunction{isinplace(f), specialization(f), Any, Any, Any,
             Any, Any, Any, Any, typeof(f.jac_prototype),
-            typeof(f.sparsity), Any, Any, Any,
+            typeof(f.sparsity), Any, Any, Any, Any,
             Any, typeof(f.colorvec),
             typeof(f.sys), Union{Nothing, OverrideInitData}, Union{Nothing, ODE_NLProbData}}(
             newf, f.mass_matrix, f.analytic, f.tgrad, f.jac,