Merge pull request #877 from SciML/staticarrays

Excise staticarrays for staticarrayscore

Author: ChrisRackauckas

Project.toml

@@ -26,7 +26,7 @@ SciMLBase = "0bca4576-84f4-4d90-8ffe-ffa030f20462"
 Setfield = "efcf1570-3423-57d1-acb7-fd33fddbac46"
 SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
 Static = "aedffcd0-7271-4cad-89d0-dc628f76c6d3"
-StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
+StaticArraysCore = "1e83bf80-4336-4d27-bf5d-d5a4f845583c"
 Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
 Tricks = "410a4b4d-49e4-4fbc-ab6d-cb71b17b3775"
 ZygoteRules = "700de1a5-db45-46bc-99cf-38207098b444"
@@ -72,7 +72,7 @@ Requires = "1.0"
 SciMLBase = "1.84"
 Setfield = "0.8, 1"
 Static = "0.7, 0.8"
-StaticArrays = "1.0"
+StaticArraysCore = "1.4"
 Tricks = "0.1.6"
 ZygoteRules = "0.2"
 julia = "1.6"
@@ -92,10 +92,11 @@ Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
 ReverseDiff = "37e2e3b7-166d-5795-8a7a-e32c996b4267"
 SafeTestsets = "1bc83da4-3b8d-516f-aca4-4fe02f6d838f"
 Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
+StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 Tracker = "9f7883ad-71c0-57eb-9f7f-b5c9e6d3789c"
 Unitful = "1986cc42-f94f-5a68-af5c-568840ba703d"
 Zygote = "e88e6eb3-aa80-5325-afca-941959d7151f"
 
 [targets]
-test = ["Distributed", "GeneralizedGenerated", "Measurements", "MonteCarloMeasurements", "Unitful", "LabelledArrays", "ForwardDiff", "InteractiveUtils", "Plots", "Pkg", "Random", "SafeTestsets", "Statistics", "Test", "Distributions"]
+test = ["Distributed", "GeneralizedGenerated", "Measurements", "MonteCarloMeasurements", "Unitful", "LabelledArrays", "ForwardDiff", "InteractiveUtils", "Plots", "Pkg", "Random","StaticArrays", "SafeTestsets", "Statistics", "Test", "Distributions"]

src/DiffEqBase.jl

@@ -9,7 +9,7 @@ end
 
 using ArrayInterfaceCore
 
-using StaticArrays # data arrays
+using StaticArraysCore # data arrays
 
 using LinearAlgebra, Printf
 

src/common_defaults.jl

@@ -15,7 +15,7 @@ end
 @inline recursive_length(u::AbstractArray{<:AbstractArray}) = sum(recursive_length, u)
 @inline recursive_length(u::RecursiveArrayTools.ArrayPartition) = sum(recursive_length, u.x)
 @inline recursive_length(u::RecursiveArrayTools.VectorOfArray) = sum(recursive_length, u.u)
-@inline function recursive_length(u::AbstractArray{<:StaticArray{S, <:Number}}) where {S}
+@inline function recursive_length(u::AbstractArray{<:StaticArraysCore.StaticArray{S, <:Number}}) where {S}
     prod(Size(eltype(u))) * length(u)
 end
 
@@ -29,7 +29,7 @@ end
     Base.FastMath.sqrt_fast(real(x) / max(length(u), 1))
 end
 
-@inline function ODE_DEFAULT_NORM(u::StaticArrays.StaticArray{<:Tuple, T},
+@inline function ODE_DEFAULT_NORM(u::StaticArraysCore.StaticArray{<:Tuple, T},
                                   t) where {T <: Union{AbstractFloat, Complex}}
     Base.FastMath.sqrt_fast(real(sum(abs2, u)) / max(length(u), 1))
 end