Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

switch diffeqoperators to scimloperators #870

Merged
merged 3 commits into from
Feb 12, 2023
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions src/DiffEqBase.jl
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion src/solve.jl
Original file line number Diff line number Diff line change
Expand Up @@ -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 &&
Expand Down
3 changes: 2 additions & 1 deletion test/affine_operators_tests.jl
Original file line number Diff line number Diff line change
@@ -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
Expand Down