Merge pull request #1067 from SciML/sparse

Move SparseArrays to Ext

Author: ChrisRackauckas

Project.toml

@@ -28,7 +28,6 @@ Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
 SciMLBase = "0bca4576-84f4-4d90-8ffe-ffa030f20462"
 SciMLOperators = "c0aeaf25-5076-4817-a8d5-81caf7dfa961"
 Setfield = "efcf1570-3423-57d1-acb7-fd33fddbac46"
-SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
 Static = "aedffcd0-7271-4cad-89d0-dc628f76c6d3"
 StaticArraysCore = "1e83bf80-4336-4d27-bf5d-d5a4f845583c"
 Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
@@ -45,6 +44,7 @@ MPI = "da04e1cc-30fd-572f-bb4f-1f8673147195"
 Measurements = "eff96d63-e80a-5855-80a2-b1b0885c5ab7"
 MonteCarloMeasurements = "0987c9cc-fe09-11e8-30f0-b96dd679fdca"
 ReverseDiff = "37e2e3b7-166d-5795-8a7a-e32c996b4267"
+SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
 Tracker = "9f7883ad-71c0-57eb-9f7f-b5c9e6d3789c"
 Unitful = "1986cc42-f94f-5a68-af5c-568840ba703d"
 
@@ -58,6 +58,7 @@ DiffEqBaseMPIExt = "MPI"
 DiffEqBaseMeasurementsExt = "Measurements"
 DiffEqBaseMonteCarloMeasurementsExt = "MonteCarloMeasurements"
 DiffEqBaseReverseDiffExt = "ReverseDiff"
+DiffEqBaseSparseArraysExt = "SparseArrays"
 DiffEqBaseTrackerExt = "Tracker"
 DiffEqBaseUnitfulExt = "Unitful"
 
@@ -121,11 +122,12 @@ Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"
 Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
 ReverseDiff = "37e2e3b7-166d-5795-8a7a-e32c996b4267"
 SafeTestsets = "1bc83da4-3b8d-516f-aca4-4fe02f6d838f"
+SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
 StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
 Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 Tracker = "9f7883ad-71c0-57eb-9f7f-b5c9e6d3789c"
 Unitful = "1986cc42-f94f-5a68-af5c-568840ba703d"
 
 [targets]
-test = ["Distributed", "Measurements", "MonteCarloMeasurements", "Unitful", "LabelledArrays", "ForwardDiff", "InteractiveUtils", "Plots", "Pkg", "Random", "StaticArrays", "SafeTestsets", "Statistics", "Test", "Distributions", "Aqua", "BenchmarkTools"]
+test = ["Distributed", "Measurements", "MonteCarloMeasurements", "Unitful", "LabelledArrays", "ForwardDiff", "SparseArrays", "InteractiveUtils", "Plots", "Pkg", "Random", "StaticArrays", "SafeTestsets", "Statistics", "Test", "Distributions", "Aqua", "BenchmarkTools"]

ext/DiffEqBaseSparseArraysExt.jl

@@ -0,0 +1,13 @@
+module DiffEqBaseSparseArraysExt
+
+import SparseArrays
+import DiffEqBase: NAN_CHECK, INFINITE_OR_GIANT
+
+function NAN_CHECK(x::SparseArrays.AbstractSparseMatrixCSC)
+    any(NAN_CHECK, SparseArrays.nonzeros(x))
+end
+function INFINITE_OR_GIANT(x::SparseArrays.AbstractSparseMatrixCSC)
+    any(INFINITE_OR_GIANT, SparseArrays.nonzeros(x))
+end
+
+end

src/DiffEqBase.jl

@@ -25,7 +25,6 @@ using FastBroadcast: @.., True, False
 using Static: reduce_tup
 
 import RecursiveArrayTools
-import SparseArrays
 import TruncatedStacktraces
 
 using Setfield

src/common_defaults.jl

@@ -102,9 +102,6 @@ function NAN_CHECK(x::Union{AbstractArray, RecursiveArrayTools.AbstractVectorOfA
         NAN_CHECK, x)
 end
 NAN_CHECK(x::RecursiveArrayTools.ArrayPartition) = any(NAN_CHECK, x.x)
-function NAN_CHECK(x::SparseArrays.AbstractSparseMatrixCSC)
-    any(NAN_CHECK, SparseArrays.nonzeros(x))
-end
 
 INFINITE_OR_GIANT(x::Number) = !isfinite(x)
 function INFINITE_OR_GIANT(x::Union{
@@ -113,9 +110,6 @@ function INFINITE_OR_GIANT(x::Union{
         INFINITE_OR_GIANT, x)
 end
 INFINITE_OR_GIANT(x::RecursiveArrayTools.ArrayPartition) = any(INFINITE_OR_GIANT, x.x)
-function INFINITE_OR_GIANT(x::SparseArrays.AbstractSparseMatrixCSC)
-    any(INFINITE_OR_GIANT, SparseArrays.nonzeros(x))
-end
 ODE_DEFAULT_UNSTABLE_CHECK(dt, u, p, t) = false
 function ODE_DEFAULT_UNSTABLE_CHECK(dt, u::Union{Number, AbstractArray{<:Number}}, p, t)
     INFINITE_OR_GIANT(u)

test/termination_conditions.jl

@@ -5,7 +5,6 @@ u = rand(4)
 uprev = rand(4)
 
 const TERMINATION_CONDITIONS = [
-    SimpleNonlinearSolveTerminationMode(),
     RelTerminationMode(), NormTerminationMode(), RelNormTerminationMode(),
     AbsTerminationMode(), AbsNormTerminationMode(), RelSafeTerminationMode(),
     AbsSafeTerminationMode(), RelSafeBestTerminationMode(), AbsSafeBestTerminationMode()