add reduce_tup, rm Static

Author: jClugstor

Project.toml

@@ -1,7 +1,7 @@
 name = "SciMLBase"
 uuid = "0bca4576-84f4-4d90-8ffe-ffa030f20462"
-authors = ["Chris Rackauckas <[email protected]> and contributors"]
 version = "2.111.0"
+authors = ["Chris Rackauckas <[email protected]> and contributors"]
 
 [deps]
 ADTypes = "47edcb42-4c32-4615-8424-f2b9edc5f35b"
@@ -29,7 +29,6 @@ Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
 RuntimeGeneratedFunctions = "7e49a35a-f44a-4d26-94aa-eba1b4ca6b47"
 SciMLOperators = "c0aeaf25-5076-4817-a8d5-81caf7dfa961"
 SciMLStructures = "53ae85a6-f571-4167-b2af-e1d143709226"
-Static = "aedffcd0-7271-4cad-89d0-dc628f76c6d3"
 StaticArraysCore = "1e83bf80-4336-4d27-bf5d-d5a4f845583c"
 Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
 SymbolicIndexingInterface = "2efcf032-c050-4f8e-a9bb-153293bab1f5"
@@ -54,19 +53,19 @@ Zygote = "e88e6eb3-aa80-5325-afca-941959d7151f"
 
 [extensions]
 SciMLBaseChainRulesCoreExt = "ChainRulesCore"
+SciMLBaseDistributionsExt = "Distributions"
+SciMLBaseForwardDiffExt = "ForwardDiff"
 SciMLBaseMLStyleExt = "MLStyle"
 SciMLBaseMakieExt = "Makie"
+SciMLBaseMonteCarloMeasurementsExt = "MonteCarloMeasurements"
+SciMLBaseMooncakeExt = "Mooncake"
 SciMLBasePartialFunctionsExt = "PartialFunctions"
 SciMLBasePyCallExt = "PyCall"
 SciMLBasePythonCallExt = "PythonCall"
 SciMLBaseRCallExt = "RCall"
-SciMLBaseZygoteExt = ["Zygote", "ChainRulesCore"]
-SciMLBaseDistributionsExt = "Distributions"
-SciMLBaseMonteCarloMeasurementsExt = "MonteCarloMeasurements"
-SciMLBaseMooncakeExt = "Mooncake"
 SciMLBaseReverseDiffExt = "ReverseDiff"
 SciMLBaseTrackerExt = "Tracker"
-SciMLBaseForwardDiffExt = "ForwardDiff"
+SciMLBaseZygoteExt = ["Zygote", "ChainRulesCore"]
 
 [compat]
 ADTypes = "0.2.5,1.0.0"
@@ -89,10 +88,10 @@ Logging = "1.10"
 MLStyle = "0.4.17"
 Makie = "0.20, 0.21, 0.22, 0.23, 0.24"
 Markdown = "1.10"
-Moshi = "0.3"
-Mooncake = "0.4"
 Measurements = "2"
 MonteCarloMeasurements = "1"
+Mooncake = "0.4"
+Moshi = "0.3"
 PartialFunctions = "1.1"
 PreallocationTools = "0.4.31"
 PrecompileTools = "1.2"
@@ -109,7 +108,6 @@ RuntimeGeneratedFunctions = "0.5.12"
 SciMLOperators = "1.3"
 SciMLStructures = "1.1"
 StableRNGs = "1.0"
-Static = "1"
 StaticArrays = "1.7"
 StaticArraysCore = "1.4"
 Statistics = "1.10"
@@ -137,4 +135,4 @@ UnicodePlots = "b8865327-cd53-5732-bb35-84acbb429228"
 Zygote = "e88e6eb3-aa80-5325-afca-941959d7151f"
 
 [targets]
-test = ["Aqua", "ForwardDiff", "MLStyle", "PartialFunctions", "Pkg", "SafeTestsets", "Serialization", "StableRNGs", "StaticArrays", "Tables", "Test", "UnicodePlots", "Zygote", "Distributions", "MonteCarloMeasurements", "Measurements", "ReverseDiff", "Tracker"]
+test = ["Aqua", "ForwardDiff", "MLStyle", "PartialFunctions", "Pkg", "SafeTestsets", "Serialization", "StableRNGs", "StaticArrays", "Tables", "Test", "UnicodePlots", "Zygote"]

ext/SciMLBaseForwardDiffExt.jl

@@ -9,10 +9,6 @@ import SciMLBase:
     ODEProblem, SDEProblem, RODEProblem, DDEProblem, PDEProblem, DAEProblem,
     RecursiveArrayTools, totallength, sse, anyeltypedual
 
-import Static: reduce_tup
-
-
-
 eltypedual(x) = eltype(x) <: ForwardDiff.Dual
 isdualtype(::Type{<:ForwardDiff.Dual}) = true
 

src/SciMLBase.jl

@@ -27,7 +27,6 @@ import Accessors: @set, @reset, @delete, @insert
 using Moshi.Data: @data
 using Moshi.Match: @match
 import Moshi.Derive: @derive
-import Static: reduce_tup
 import StaticArraysCore: StaticArraysCore, SArray
 import Adapt: adapt_structure, adapt
 

src/solve.jl

@@ -487,3 +487,32 @@ _reshape(v::Number, siz) = v
 _reshape(v::AbstractSciMLScalarOperator, siz) = v
 
 set_mooncakeoriginator_if_mooncake(x::SciMLBase.ADOriginator) = x
+
+# Copied from Static.jl https://github.com/SciML/Static.jl/blob/b50279cc9b33741fd60f382c789fbaef8622d964/src/Static.jl#L743
+@generated function reduce_tup(f::F, inds::Tuple{Vararg{Any, N}}) where {F, N}
+    q = Expr(:block, Expr(:meta, :inline, :propagate_inbounds))
+    if N == 1
+        push!(q.args, :(inds[1]))
+        return q
+    end
+    syms = Vector{Symbol}(undef, N)
+    i = 0
+    for n in 1:N
+        syms[n] = iₙ = Symbol(:i_, (i += 1))
+        push!(q.args, Expr(:(=), iₙ, Expr(:ref, :inds, n)))
+    end
+    W = 1 << (8sizeof(N) - 2 - leading_zeros(N))
+    while W > 0
+        _N = length(syms)
+        for _ in (2W):W:_N
+            for w in 1:W
+                new_sym = Symbol(:i_, (i += 1))
+                push!(q.args, Expr(:(=), new_sym, Expr(:call, :f, syms[w], syms[w + W])))
+                syms[w] = new_sym
+            end
+            deleteat!(syms, (1 + W):(2W))
+        end
+        W >>>= 1
+    end
+    q
+end