From ea3959e84463e2ac0d7e5c402d5750056cd331cc Mon Sep 17 00:00:00 2001 From: Vedant Puri Date: Sun, 5 Feb 2023 19:56:51 -0500 Subject: [PATCH 1/2] switch diffeqoperators to scimloperators --- src/DiffEqBase.jl | 4 ++-- src/solve.jl | 2 +- test/affine_operators_tests.jl | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/DiffEqBase.jl b/src/DiffEqBase.jl index e40d7b133..86fcb3293 100644 --- a/src/DiffEqBase.jl +++ b/src/DiffEqBase.jl @@ -44,8 +44,8 @@ import PreallocationTools import FunctionWrappersWrappers @reexport using SciMLBase -using SciMLBase: @def, DEIntegrator, DEProblem, AbstractDiffEqOperator, - AbstractDiffEqLinearOperator, AbstractDiffEqInterpolation, +using SciMLBase: @def, DEIntegrator, DEProblem, AbstractSciMLOperator, + AbstractDiffEqInterpolation, DECallback, AbstractDEOptions, DECache, AbstractContinuousCallback, AbstractDiscreteCallback, AbstractLinearProblem, AbstractNonlinearProblem, AbstractOptimizationProblem, AbstractSteadyStateProblem, diff --git a/src/solve.jl b/src/solve.jl index 4f61feeac..43303a95c 100644 --- a/src/solve.jl +++ b/src/solve.jl @@ -1053,7 +1053,7 @@ function promote_f(f::F, ::Val{specialize}, u0, p, t) where {F, specialize} end @static if VERSION >= v"1.8-" - f = if f isa ODEFunction && isinplace(f) && !(f.f isa AbstractDiffEqOperator) && + f = if f isa ODEFunction && isinplace(f) && !(f.f isa AbstractSciMLOperator) && # Some reinitialization code still uses NLSolvers stuff which doesn't # properly tag, so opt-out if potentially a mass matrix DAE f.mass_matrix isa UniformScaling && diff --git a/test/affine_operators_tests.jl b/test/affine_operators_tests.jl index 89c188fa8..7126bdc9b 100644 --- a/test/affine_operators_tests.jl +++ b/test/affine_operators_tests.jl @@ -1,8 +1,9 @@ using DiffEqBase +using SciMLBase using Test using Random -mutable struct TestDiffEqOperator{T} <: DiffEqBase.AbstractDiffEqLinearOperator{T} +mutable struct TestDiffEqOperator{T} <: SciMLBase.AbstractDiffEqLinearOperator{T} m::Int n::Int end From ecd003d314bf5fe9e7e4541eb048fb9624d22b54 Mon Sep 17 00:00:00 2001 From: Vedant Puri Date: Sun, 5 Feb 2023 20:05:10 -0500 Subject: [PATCH 2/2] update scimlbase compat --- Project.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Project.toml b/Project.toml index 9cccc398b..e4fd6191b 100644 --- a/Project.toml +++ b/Project.toml @@ -63,7 +63,7 @@ PreallocationTools = "0.4" RecursiveArrayTools = "2" Reexport = "1.0" Requires = "1.0" -SciMLBase = "1.73" +SciMLBase = "1.82" Setfield = "0.8, 1" Static = "0.7, 0.8" StaticArrays = "1.0"