Skip to content

Commit 43aea2d

Browse files
Merge pull request #870 from vpuri3/scimlops
switch diffeqoperators to scimloperators
2 parents 3317eb2 + e761566 commit 43aea2d

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

src/DiffEqBase.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ import PreallocationTools
4444
import FunctionWrappersWrappers
4545
@reexport using SciMLBase
4646

47-
using SciMLBase: @def, DEIntegrator, DEProblem, AbstractDiffEqOperator,
48-
AbstractDiffEqLinearOperator, AbstractDiffEqInterpolation,
47+
using SciMLBase: @def, DEIntegrator, DEProblem, AbstractSciMLOperator,
48+
AbstractDiffEqInterpolation,
4949
DECallback, AbstractDEOptions, DECache, AbstractContinuousCallback,
5050
AbstractDiscreteCallback, AbstractLinearProblem, AbstractNonlinearProblem,
5151
AbstractOptimizationProblem, AbstractSteadyStateProblem,

src/solve.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1053,7 +1053,7 @@ function promote_f(f::F, ::Val{specialize}, u0, p, t) where {F, specialize}
10531053
end
10541054

10551055
@static if VERSION >= v"1.8-"
1056-
f = if f isa ODEFunction && isinplace(f) && !(f.f isa AbstractDiffEqOperator) &&
1056+
f = if f isa ODEFunction && isinplace(f) && !(f.f isa AbstractSciMLOperator) &&
10571057
# Some reinitialization code still uses NLSolvers stuff which doesn't
10581058
# properly tag, so opt-out if potentially a mass matrix DAE
10591059
f.mass_matrix isa UniformScaling &&

test/affine_operators_tests.jl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
using DiffEqBase
2+
using SciMLBase
23
using Test
34
using Random
45

5-
mutable struct TestDiffEqOperator{T} <: DiffEqBase.AbstractDiffEqLinearOperator{T}
6+
mutable struct TestDiffEqOperator{T} <: SciMLBase.AbstractDiffEqLinearOperator{T}
67
m::Int
78
n::Int
89
end

0 commit comments

Comments
 (0)