Merge pull request #945 from prbzrg/have-algext

Simplify `:alg` extraction
SciML · Oct 19, 2023 · d9c3e74 · d9c3e74
2 parents 301dd29 + 319fd62
commit d9c3e74
Show file tree

Hide file tree

Showing 4 changed files with 92 additions and 117 deletions.
diff --git a/ext/DiffEqBaseReverseDiffExt.jl b/ext/DiffEqBaseReverseDiffExt.jl
@@ -76,23 +76,23 @@ end
 end
 
 # `ReverseDiff.TrackedArray`
-function DiffEqBase.solve_up(prob::DiffEqBase.DEProblem,
+function DiffEqBase.solve_up(prob::DiffEqBase.AbstractDEProblem,
     sensealg::Union{
         SciMLBase.AbstractOverloadingSensitivityAlgorithm,
         Nothing}, u0::ReverseDiff.TrackedArray,
     p::ReverseDiff.TrackedArray, args...; kwargs...)
     ReverseDiff.track(DiffEqBase.solve_up, prob, sensealg, u0, p, args...; kwargs...)
 end
 
-function DiffEqBase.solve_up(prob::DiffEqBase.DEProblem,
+function DiffEqBase.solve_up(prob::DiffEqBase.AbstractDEProblem,
     sensealg::Union{
         SciMLBase.AbstractOverloadingSensitivityAlgorithm,
         Nothing}, u0, p::ReverseDiff.TrackedArray,
     args...; kwargs...)
     ReverseDiff.track(DiffEqBase.solve_up, prob, sensealg, u0, p, args...; kwargs...)
 end
 
-function DiffEqBase.solve_up(prob::DiffEqBase.DEProblem,
+function DiffEqBase.solve_up(prob::DiffEqBase.AbstractDEProblem,
     sensealg::Union{
         SciMLBase.AbstractOverloadingSensitivityAlgorithm,
         Nothing}, u0::ReverseDiff.TrackedArray, p,
@@ -101,7 +101,7 @@ function DiffEqBase.solve_up(prob::DiffEqBase.DEProblem,
 end
 
 # `AbstractArray{<:ReverseDiff.TrackedReal}`
-function DiffEqBase.solve_up(prob::DiffEqBase.DEProblem,
+function DiffEqBase.solve_up(prob::DiffEqBase.AbstractDEProblem,
     sensealg::Union{
         SciMLBase.AbstractOverloadingSensitivityAlgorithm,
         Nothing},
@@ -112,7 +112,7 @@ function DiffEqBase.solve_up(prob::DiffEqBase.DEProblem,
         kwargs...)
 end
 
-function DiffEqBase.solve_up(prob::DiffEqBase.DEProblem,
+function DiffEqBase.solve_up(prob::DiffEqBase.AbstractDEProblem,
     sensealg::Union{
         SciMLBase.AbstractOverloadingSensitivityAlgorithm,
         Nothing}, u0,
@@ -121,7 +121,7 @@ function DiffEqBase.solve_up(prob::DiffEqBase.DEProblem,
     DiffEqBase.solve_up(prob, sensealg, u0, reduce(vcat, p), args...; kwargs...)
 end
 
-function DiffEqBase.solve_up(prob::DiffEqBase.DEProblem,
+function DiffEqBase.solve_up(prob::DiffEqBase.AbstractDEProblem,
     sensealg::Union{
         SciMLBase.AbstractOverloadingSensitivityAlgorithm,
         Nothing}, u0::ReverseDiff.TrackedArray,

diff --git a/ext/DiffEqBaseTrackerExt.jl b/ext/DiffEqBaseTrackerExt.jl
@@ -67,23 +67,23 @@ end
 end
 @inline DiffEqBase.ODE_DEFAULT_NORM(u::Tracker.TrackedReal, t::Tracker.TrackedReal) = abs(u)
 
-function DiffEqBase.solve_up(prob::DiffEqBase.DEProblem,
+function DiffEqBase.solve_up(prob::DiffEqBase.AbstractDEProblem,
     sensealg::Union{
         SciMLBase.AbstractOverloadingSensitivityAlgorithm,
         Nothing}, u0::Tracker.TrackedArray,
     p::Tracker.TrackedArray, args...; kwargs...)
     Tracker.track(DiffEqBase.solve_up, prob, sensealg, u0, p, args...; kwargs...)
 end
 
-function DiffEqBase.solve_up(prob::DiffEqBase.DEProblem,
+function DiffEqBase.solve_up(prob::DiffEqBase.AbstractDEProblem,
     sensealg::Union{
         SciMLBase.AbstractOverloadingSensitivityAlgorithm,
         Nothing}, u0::Tracker.TrackedArray, p, args...;
     kwargs...)
     Tracker.track(DiffEqBase.solve_up, prob, sensealg, u0, p, args...; kwargs...)
 end
 
-function DiffEqBase.solve_up(prob::DiffEqBase.DEProblem,
+function DiffEqBase.solve_up(prob::DiffEqBase.AbstractDEProblem,
     sensealg::Union{
         SciMLBase.AbstractOverloadingSensitivityAlgorithm,
         Nothing}, u0, p::Tracker.TrackedArray, args...;

diff --git a/src/DiffEqBase.jl b/src/DiffEqBase.jl
@@ -48,19 +48,19 @@ PrecompileTools.@recompile_invalidations begin
     import PreallocationTools
 
     import FunctionWrappersWrappers
-    
+
     using SciMLBase
 
     using SciMLOperators: AbstractSciMLOperator, AbstractSciMLScalarOperator
 
-    using SciMLBase: @def, DEIntegrator, DEProblem,
+    using SciMLBase: @def, DEIntegrator, AbstractDEProblem,
         AbstractDiffEqInterpolation,
         DECallback, AbstractDEOptions, DECache, AbstractContinuousCallback,
         AbstractDiscreteCallback, AbstractLinearProblem, AbstractNonlinearProblem,
         AbstractOptimizationProblem, AbstractSteadyStateProblem,
         AbstractJumpProblem,
         AbstractNoiseProblem, AbstractEnsembleProblem, AbstractDynamicalODEProblem,
-        DEAlgorithm, StandardODEProblem, AbstractIntegralProblem,
+        AbstractDEAlgorithm, StandardODEProblem, AbstractIntegralProblem,
         AbstractSensitivityAlgorithm, AbstractODEAlgorithm,
         AbstractSDEAlgorithm, AbstractDDEAlgorithm, AbstractDAEAlgorithm,
         AbstractSDDEAlgorithm, AbstractRODEAlgorithm, DAEInitializationAlgorithm,