switch to scimloperators

Project.toml

@@ -1,7 +1,7 @@
 name = "SciMLBase"
 uuid = "0bca4576-84f4-4d90-8ffe-ffa030f20462"
 authors = ["Chris Rackauckas <[email protected]> and contributors"]
-version = "1.45.0"
+version = "1.46.0"
 
 [deps]
 ArrayInterfaceCore = "30b0a656-2188-435a-8636-2ec0e6a096e2"
@@ -15,6 +15,8 @@ Logging = "56ddb016-857b-54e1-b83d-db4d58db5568"
 Markdown = "d6f4376e-aef5-505a-96c1-9c027394607a"
 RecipesBase = "3cdcf5f2-1ef4-517c-9805-6587b60abb01"
 RecursiveArrayTools = "731186ca-8d62-57ce-b412-fbd966d074cd"
+Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
+SciMLOperators = "c0aeaf25-5076-4817-a8d5-81caf7dfa961"
 StaticArraysCore = "1e83bf80-4336-4d27-bf5d-d5a4f845583c"
 Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
 Tables = "bd369af6-aec1-5ad0-b16a-f7cc5008161c"

src/SciMLBase.jl

@@ -8,6 +8,13 @@ using Statistics
 using Distributed
 using Markdown
 
+using Reexport
+@reexport using SciMLOperators
+using SciMLOperators: AbstractSciMLOperator, AbstractSciMLLinearOperator,
+                      IdentityOperator, ComposedOperator, ScaledOperator,
+                      InvertedOperator, InvertibleOperator,
+                      DEFAULT_UPDATE_FUNC
+
 import Logging, ArrayInterfaceCore
 import IteratorInterfaceExtensions
 import CommonSolve: solve, init, solve!
@@ -450,26 +457,6 @@ $(TYPEDEF)
 abstract type AbstractSensitivitySolution{T, N, S} <: AbstractTimeseriesSolution{T, N, S} end
 
 # Misc
-"""
-$(TYPEDEF)
-"""
-abstract type AbstractSciMLOperator{T} end
-
-"""
-$(TYPEDEF)
-"""
-abstract type AbstractDiffEqOperator{T} <: AbstractSciMLOperator{T} end
-
-"""
-$(TYPEDEF)
-"""
-abstract type AbstractDiffEqLinearOperator{T} <: AbstractDiffEqOperator{T} end
-
-"""
-$(TYPEDEF)
-"""
-abstract type AbstractDiffEqCompositeOperator{T} <: AbstractDiffEqLinearOperator{T} end
-
 """
 $(TYPEDEF)
 
@@ -543,11 +530,6 @@ include("function_wrappers.jl")
 include("scimlfunctions.jl")
 include("alg_traits.jl")
 
-include("operators/operators.jl")
-include("operators/basic_operators.jl")
-include("operators/diffeq_operator.jl")
-include("operators/common_defaults.jl")
-
 include("problems/problem_utils.jl")
 include("problems/discrete_problems.jl")
 include("problems/steady_state_problems.jl")
@@ -609,6 +591,65 @@ const SciMLSolution = AbstractSciMLSolution
 
 export DEAlgorithm, SciMLAlgorithm, DEProblem, DEAlgorithm, DESolution, SciMLSolution
 
+# deprecated operator interface
+const AbstractDiffEqOperator = AbstractSciMLOperator
+const AbstractDiffEqLinearOperator = AbstractSciMLLinearOperator
+const AbstractDiffEqCompositeOperator = ComposedOperator
+
+const DiffEqScaledOperator = ScaledOperator
+function DiffEqScaledOperator(args...; kwargs...)
+    @warn "SciMLBase.DiffEqScaledOperator is deprecated.
+    Use SciMLOperators.ScaledOperator instead"
+
+    ScaledOperator(args...; kwargs...)
+end
+
+const FactorizedDiffEqArrayOperator = InvertedOperator
+function FactorizedDiffEqArrayOperator(args...; kwargs...)
+    @warn "SciMLBase.FactorizedDiffEqArrayOperator is deprecated.
+    Use SciMLOperators.InvertedOperator instead"
+
+    InvertedOperator(args...; kwargs...)
+end
+
+const DiffEqIdentity = IdentityOperator
+function DiffEqIdentity(u)
+    @warn "SciMLBase.DiffEqIdentity is deprecated.
+    Use SciMLOperators.IdentityOperator instead"
+
+    IdentityOperator{size(u, 1)}()
+end
+
+const DiffEqScalar = SciMLOperators.ScalarOperator
+function DiffEqScalar(args...; kwargs...)
+    @warn "SciMLBase.DiffEqScalar is deprecated.
+    Use SciMLOperators.ScaledOperator instead"
+
+    ScalarOperator(args...; kwargs...)
+end
+
+const AffineDiffEqOperator = SciMLOperators.AffineOperator
+function AffineDiffEqOperator(As, bs, cache = nothing)
+    @warn "SciMLBase.AffineDiffEqOperator is deprecated.
+    Use SciMLOperators.AffineOperator instead"
+
+    A = AddedOperator(As)
+    b = sum(bs)
+    B = IdentityOperator{size(b, 1)}()
+    AffineOperator(A, B, b)
+end
+
+const DiffEqArrayOperator = SciMLOperators.MatrixOperator
+function DiffEqArrayOperator(args...; kwargs...)
+    @warn "SciMLBase.DiffEqArrayOperator is deprecated.
+    Use SciMLOperators.MatrixOperator instead"
+
+    MatrixOperator(args...; kwargs...)
+end
+
+export DiffEqScaledOperator, FactorizedDiffEqArrayOperator, DiffEqIdentity,
+       DiffEqScalar, AffineDiffEqOperator, DiffEqArrayOperator
+
 # Exports
 export AllObserved
 
@@ -653,10 +694,6 @@ export EnsembleAnalysis, EnsembleSummary
 
 export tuples, intervals, TimeChoiceIterator
 
-export AffineDiffEqOperator, DiffEqScaledOperator
-
-export DiffEqScalar, DiffEqArrayOperator, DiffEqIdentity
-
 export step!, deleteat!, addat!, get_tmp_cache,
        full_cache, user_cache, u_cache, du_cache,
        rand_cache, ratenoise_cache,
@@ -669,9 +706,6 @@ export step!, deleteat!, addat!, get_tmp_cache,
        set_u!, check_error, change_t_via_interpolation!, addsteps!,
        isdiscrete, reeval_internals_due_to_modification!
 
-export update_coefficients!, update_coefficients,
-       has_adjoint, has_expmv!, has_expmv, has_exp, has_mul, has_mul!, has_ldiv, has_ldiv!
-
 export ContinuousCallback, DiscreteCallback, CallbackSet, VectorContinuousCallback
 
 end