diff --git a/Project.toml b/Project.toml index 24b7d175ee7..fae032b6b27 100644 --- a/Project.toml +++ b/Project.toml @@ -69,8 +69,6 @@ SciMLOperators = "c0aeaf25-5076-4817-a8d5-81caf7dfa961" SciMLStructures = "53ae85a6-f571-4167-b2af-e1d143709226" SimpleNonlinearSolve = "727e6d20-b764-4bd8-a329-72de5adea6c7" SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf" -Static = "aedffcd0-7271-4cad-89d0-dc628f76c6d3" -StaticArrayInterface = "0d7ed370-da01-4f52-bd93-41d350b8b718" StaticArrays = "90137ffa-7385-5640-81b9-e52037218182" TruncatedStacktraces = "781d530d-4396-4725-bb49-402e4bee1e77" @@ -119,7 +117,7 @@ DocStringExtensions = "0.9.5" EnumX = "1.0.5" ExplicitImports = "1.13.1" ExponentialUtilities = "1.27" -FastBroadcast = "0.3.5" +FastBroadcast = "1.2" FastClosures = "0.3.2" FillArrays = "1.13" FiniteDiff = "2.27" @@ -170,14 +168,12 @@ Polyester = "0.7.18" PreallocationTools = "0.4.31, 1" PrecompileTools = "1.2.1" Preferences = "1.4.3" -RecursiveArrayTools = "3.36" +RecursiveArrayTools = "3.51" Reexport = "1.2.2" SciMLBase = "2.143" SciMLOperators = "1.8" SciMLStructures = "1.7" SimpleNonlinearSolve = "2.7" -Static = "1.2" -StaticArrayInterface = "1.8" StaticArrays = "1.9.14" StableRNGs = "1" StructArrays = "0.6, 0.7" diff --git a/lib/DelayDiffEq/Project.toml b/lib/DelayDiffEq/Project.toml index 2ce455de586..e3f98f8208e 100644 --- a/lib/DelayDiffEq/Project.toml +++ b/lib/DelayDiffEq/Project.toml @@ -66,7 +66,7 @@ DiffEqCallbacks = "4" DiffEqDevTools = "2.44.4" DiffEqNoiseProcess = "5" ExplicitImports = "1.13.1" -FastBroadcast = "0.3.5" +FastBroadcast = "1.2" FiniteDiff = "2.27" ForwardDiff = "0.10.38, 1" LinearAlgebra = "1" @@ -88,7 +88,7 @@ OrdinaryDiffEqSSPRK = "1.5.0" OrdinaryDiffEqTsit5 = "1.4.0" OrdinaryDiffEqVerner = "1.5.0" Random = "<0.0.1, 1" -RecursiveArrayTools = "3" +RecursiveArrayTools = "3.51" Reexport = "1.0" SafeTestsets = "0.1.0" SciMLBase = "2.115.0" diff --git a/lib/DiffEqBase/Project.toml b/lib/DiffEqBase/Project.toml index 540d8f3755d..0fda67a443b 100644 --- a/lib/DiffEqBase/Project.toml +++ b/lib/DiffEqBase/Project.toml @@ -25,7 +25,6 @@ SciMLBase = "0bca4576-84f4-4d90-8ffe-ffa030f20462" SciMLOperators = "c0aeaf25-5076-4817-a8d5-81caf7dfa961" SciMLStructures = "53ae85a6-f571-4167-b2af-e1d143709226" Setfield = "efcf1570-3423-57d1-acb7-fd33fddbac46" -Static = "aedffcd0-7271-4cad-89d0-dc628f76c6d3" StaticArraysCore = "1e83bf80-4336-4d27-bf5d-d5a4f845583c" SymbolicIndexingInterface = "2efcf032-c050-4f8e-a9bb-153293bab1f5" TruncatedStacktraces = "781d530d-4396-4725-bb49-402e4bee1e77" @@ -81,7 +80,7 @@ Distributions = "0.25" DynamicQuantities = "1" DocStringExtensions = "0.9" Enzyme = "0.13.100" -FastBroadcast = "0.3.5" +FastBroadcast = "1.2" FastClosures = "0.3.2" FastPower = "1.1" FlexUnits = "0.4" @@ -104,7 +103,7 @@ Pkg = "1.9" PrecompileTools = "1" Printf = "1.9" Random = "1.9" -RecursiveArrayTools = "3.1" +RecursiveArrayTools = "3.51" Reexport = "1.0" ReverseDiff = "1" SafeTestsets = "0.1" @@ -113,7 +112,6 @@ SciMLOperators = "1" SciMLStructures = "1.5" Setfield = "1" SparseArrays = "1.9" -Static = "1" StaticArrays = "1" StaticArraysCore = "1.4" SymbolicIndexingInterface = "0.3.39" diff --git a/lib/DiffEqBase/ext/DiffEqBaseForwardDiffExt.jl b/lib/DiffEqBase/ext/DiffEqBaseForwardDiffExt.jl index 4cdb0d9cdcd..ca0e35edf5e 100644 --- a/lib/DiffEqBase/ext/DiffEqBaseForwardDiffExt.jl +++ b/lib/DiffEqBase/ext/DiffEqBaseForwardDiffExt.jl @@ -4,7 +4,7 @@ using DiffEqBase, ForwardDiff using DiffEqBase.ArrayInterface using DiffEqBase: Void, FunctionWrappersWrappers, OrdinaryDiffEqTag, AbstractTimeseriesSolution, - RecursiveArrayTools, reduce_tup, _promote_tspan, has_continuous_callback + RecursiveArrayTools, _promote_tspan, has_continuous_callback import DiffEqBase: hasdualpromote, wrapfun_oop, wrapfun_iip, prob2dtmin, promote_tspan, ODE_DEFAULT_NORM import SciMLBase: isdualtype, DualEltypeChecker, sse, __sum diff --git a/lib/DiffEqBase/src/DiffEqBase.jl b/lib/DiffEqBase/src/DiffEqBase.jl index da07f30bc88..4e1530fec4b 100644 --- a/lib/DiffEqBase/src/DiffEqBase.jl +++ b/lib/DiffEqBase/src/DiffEqBase.jl @@ -22,9 +22,8 @@ using FunctionWrappers: FunctionWrapper using MuladdMacro -using FastBroadcast: @.., True, False +using FastBroadcast: @.., Serial, Threaded -using Static: reduce_tup import RecursiveArrayTools import TruncatedStacktraces diff --git a/lib/DiffEqBase/src/calculate_residuals.jl b/lib/DiffEqBase/src/calculate_residuals.jl index 03c90a992f6..dd590df353e 100644 --- a/lib/DiffEqBase/src/calculate_residuals.jl +++ b/lib/DiffEqBase/src/calculate_residuals.jl @@ -90,7 +90,7 @@ end # Inplace Versions """ - DiffEqBase.calculate_residuals!(out, ũ, u₀, u₁, α, ρ, thread=False()) + DiffEqBase.calculate_residuals!(out, ũ, u₀, u₁, α, ρ, thread=Serial()) Save element-wise residuals ```math @@ -99,13 +99,13 @@ Save element-wise residuals in `out`. The argument `thread` determines whether internal broadcasting on -appropriate CPU arrays should be serial (`thread = False()`, default) -or use multiple threads (`thread = True()`) when Julia is started +appropriate CPU arrays should be serial (`thread = Serial()`, default) +or use multiple threads (`thread = Threaded()`) when Julia is started with multiple threads. """ @inline function calculate_residuals!( out, ũ, u₀, u₁, α, ρ, internalnorm, t, - thread::Union{False, True} = False() + thread::Union{Serial, Threaded, Bool} = Serial() ) @.. broadcast = false thread = thread out = calculate_residuals( ũ, u₀, u₁, α, ρ, internalnorm, @@ -116,7 +116,7 @@ end @inline function calculate_residuals!( out::Array, ũ::Array, u₀::Array, u₁::Array, α::Number, - ρ::Number, internalnorm::F, t, ::False + ρ::Number, internalnorm::F, t, ::Serial ) where {F} @inbounds @simd ivdep for i in eachindex(out, ũ, u₀, u₁) out[i] = calculate_residuals(ũ[i], u₀[i], u₁[i], α, ρ, internalnorm, t) @@ -125,7 +125,7 @@ end end """ - calculate_residuals!(out, u₀, u₁, α, ρ, thread=False()) + calculate_residuals!(out, u₀, u₁, α, ρ, thread=Serial()) Save element-wise residuals ```math @@ -134,20 +134,20 @@ Save element-wise residuals in `out`. The argument `thread` determines whether internal broadcasting on -appropriate CPU arrays should be serial (`thread = False()`, default) -or use multiple threads (`thread = True()`) when Julia is started +appropriate CPU arrays should be serial (`thread = Serial()`, default) +or use multiple threads (`thread = Threaded()`) when Julia is started with multiple threads. """ @inline function calculate_residuals!( out, u₀, u₁, α, ρ, internalnorm, t, - thread::Union{False, True} = False() + thread::Union{Serial, Threaded, Bool} = Serial() ) @.. broadcast = false thread = thread out = calculate_residuals(u₀, u₁, α, ρ, internalnorm, t) return nothing end """ - calculate_residuals!(out, E₁, E₂, u₀, u₁, α, ρ, δ, scalarnorm, thread=False()) + calculate_residuals!(out, E₁, E₂, u₀, u₁, α, ρ, δ, scalarnorm, thread=Serial()) Calculate element-wise residuals ```math @@ -155,13 +155,13 @@ Calculate element-wise residuals ``` The argument `thread` determines whether internal broadcasting on -appropriate CPU arrays should be serial (`thread = False()`, default) -or use multiple threads (`thread = True()`) when Julia is started +appropriate CPU arrays should be serial (`thread = Serial()`, default) +or use multiple threads (`thread = Threaded()`) when Julia is started with multiple threads. """ @inline function calculate_residuals!( out, E₁, E₂, u₀, u₁, α, ρ, δ, scalarnorm, t, - thread::Union{False, True} = False() + thread::Union{Serial, Threaded, Bool} = Serial() ) @.. broadcast = false thread = thread out = calculate_residuals( E₁, E₂, u₀, u₁, α, ρ, δ, diff --git a/lib/OrdinaryDiffEqAdamsBashforthMoulton/Project.toml b/lib/OrdinaryDiffEqAdamsBashforthMoulton/Project.toml index 676cb846a8b..acbff864958 100644 --- a/lib/OrdinaryDiffEqAdamsBashforthMoulton/Project.toml +++ b/lib/OrdinaryDiffEqAdamsBashforthMoulton/Project.toml @@ -6,7 +6,6 @@ version = "1.10.0" [deps] MuladdMacro = "46d2c3a1-f734-5fdb-9937-b9b9aeba4221" Polyester = "f517fe37-dbe3-4b94-8317-1923a5111588" -Static = "aedffcd0-7271-4cad-89d0-dc628f76c6d3" FastBroadcast = "7034ab61-46d4-4ed7-9d0f-46aef9175898" OrdinaryDiffEqLowOrderRK = "1344f307-1e59-4825-a18e-ace9aa3fa4c6" RecursiveArrayTools = "731186ca-8d62-57ce-b412-fbd966d074cd" @@ -32,19 +31,18 @@ DiffEqBase = {path = "../DiffEqBase"} [compat] Pkg = "1" Test = "<0.0.1, 1" -FastBroadcast = "0.3" +FastBroadcast = "1.2" Random = "<0.0.1, 1" DiffEqDevTools = "2.44.4" MuladdMacro = "0.2" Polyester = "0.7" SciMLBase = "2.116" OrdinaryDiffEqCore = "3" -Static = "1.2" OrdinaryDiffEqLowOrderRK = "1.5.0" Aqua = "0.8.11" julia = "1.10" JET = "0.9, 0.11" -RecursiveArrayTools = "3.36" +RecursiveArrayTools = "3.51" ODEProblemLibrary = "1" AllocCheck = "0.2" DiffEqBase = "6.194" diff --git a/lib/OrdinaryDiffEqAdamsBashforthMoulton/src/OrdinaryDiffEqAdamsBashforthMoulton.jl b/lib/OrdinaryDiffEqAdamsBashforthMoulton/src/OrdinaryDiffEqAdamsBashforthMoulton.jl index 268ec929221..0d5c36a2747 100644 --- a/lib/OrdinaryDiffEqAdamsBashforthMoulton/src/OrdinaryDiffEqAdamsBashforthMoulton.jl +++ b/lib/OrdinaryDiffEqAdamsBashforthMoulton/src/OrdinaryDiffEqAdamsBashforthMoulton.jl @@ -14,7 +14,7 @@ import OrdinaryDiffEqCore: OrdinaryDiffEqMutableCache, OrdinaryDiffEqConstantCac import OrdinaryDiffEqLowOrderRK: BS3ConstantCache, BS3Cache, RK4ConstantCache, RK4Cache import RecursiveArrayTools: recursivefill! using MuladdMacro, FastBroadcast -import Static: False +using FastBroadcast: Serial import OrdinaryDiffEqCore using Reexport diff --git a/lib/OrdinaryDiffEqAdamsBashforthMoulton/src/adams_bashforth_moulton_caches.jl b/lib/OrdinaryDiffEqAdamsBashforthMoulton/src/adams_bashforth_moulton_caches.jl index 81cc2361bfe..39913f2a9ce 100644 --- a/lib/OrdinaryDiffEqAdamsBashforthMoulton/src/adams_bashforth_moulton_caches.jl +++ b/lib/OrdinaryDiffEqAdamsBashforthMoulton/src/adams_bashforth_moulton_caches.jl @@ -420,7 +420,7 @@ function alg_cache( btmp = zero(u) bs3cache = BS3Cache( u, uprev, bk1, bk2, bk3, bk4, butilde, btmp, batmp, tab, - trivial_limiter!, trivial_limiter!, False() + trivial_limiter!, trivial_limiter!, Serial() ) fsalfirst = zero(rate_prototype) k4 = zero(rate_prototype) @@ -527,7 +527,7 @@ function alg_cache( recursivefill!(ratmp, false) rk4cache = RK4Cache( u, uprev, rk1, rk2, rk3, rk4, rk, rtmp, ratmp, trivial_limiter!, - trivial_limiter!, False() + trivial_limiter!, Serial() ) fsalfirst = zero(rate_prototype) k4 = zero(rate_prototype) @@ -636,7 +636,7 @@ function alg_cache( recursivefill!(ratmp, false) rk4cache = RK4Cache( u, uprev, rk1, rk2, rk3, rk4, rk, rtmp, ratmp, trivial_limiter!, - trivial_limiter!, False() + trivial_limiter!, Serial() ) fsalfirst = zero(rate_prototype) k4 = zero(rate_prototype) @@ -750,7 +750,7 @@ function alg_cache( btmp = zero(u) bs3cache = BS3Cache( u, uprev, bk1, bk2, bk3, bk4, butilde, btmp, batmp, tab, - trivial_limiter!, trivial_limiter!, False() + trivial_limiter!, trivial_limiter!, Serial() ) fsalfirst = zero(rate_prototype) k4 = zero(rate_prototype) @@ -869,7 +869,7 @@ function alg_cache( recursivefill!(ratmp, false) rk4cache = RK4Cache( u, uprev, rk1, rk2, rk3, rk4, rk, rtmp, ratmp, trivial_limiter!, - trivial_limiter!, False() + trivial_limiter!, Serial() ) fsalfirst = zero(rate_prototype) k4 = zero(rate_prototype) @@ -988,7 +988,7 @@ function alg_cache( recursivefill!(ratmp, false) rk4cache = RK4Cache( u, uprev, rk1, rk2, rk3, rk4, rk, rtmp, ratmp, trivial_limiter!, - trivial_limiter!, False() + trivial_limiter!, Serial() ) fsalfirst = zero(rate_prototype) k4 = zero(rate_prototype) diff --git a/lib/OrdinaryDiffEqAdamsBashforthMoulton/src/algorithms.jl b/lib/OrdinaryDiffEqAdamsBashforthMoulton/src/algorithms.jl index 61a8cce6c62..9843ad7bcaf 100644 --- a/lib/OrdinaryDiffEqAdamsBashforthMoulton/src/algorithms.jl +++ b/lib/OrdinaryDiffEqAdamsBashforthMoulton/src/algorithms.jl @@ -4,11 +4,11 @@ Problems. Computational Mathematics (2nd revised ed.), Springer (1996) doi: https://doi.org/10.1007/978-3-540-78862-1""" keyword_default_description = """ -- `thread`: determines whether internal broadcasting on appropriate CPU arrays should be serial (`thread = OrdinaryDiffEq.False()`) or use multiple threads (`thread = OrdinaryDiffEq.True()`) when Julia is started with multiple threads. +- `thread`: determines whether internal broadcasting on appropriate CPU arrays should be serial (`thread = OrdinaryDiffEq.Serial()`) or use multiple threads (`thread = Threaded()`) when Julia is started with multiple threads. """ keyword_default = """ -thread = OrdinaryDiffEq.False(), +thread = OrdinaryDiffEq.Serial(), """ @doc generic_solver_docstring( @@ -21,7 +21,7 @@ thread = OrdinaryDiffEq.False(), keyword_default ) Base.@kwdef struct AB3{Thread} <: OrdinaryDiffEqAlgorithm - thread::Thread = False() + thread::Thread = Serial() end @doc generic_solver_docstring( @@ -34,7 +34,7 @@ end keyword_default ) Base.@kwdef struct AB4{Thread} <: OrdinaryDiffEqAlgorithm - thread::Thread = False() + thread::Thread = Serial() end @doc generic_solver_docstring( @@ -47,7 +47,7 @@ end keyword_default ) Base.@kwdef struct AB5{Thread} <: OrdinaryDiffEqAlgorithm - thread::Thread = False() + thread::Thread = Serial() end @doc generic_solver_docstring( @@ -61,7 +61,7 @@ end keyword_default ) Base.@kwdef struct ABM32{Thread} <: OrdinaryDiffEqAlgorithm - thread::Thread = False() + thread::Thread = Serial() end @doc generic_solver_docstring( @@ -75,7 +75,7 @@ end keyword_default ) Base.@kwdef struct ABM43{Thread} <: OrdinaryDiffEqAlgorithm - thread::Thread = False() + thread::Thread = Serial() end @doc generic_solver_docstring( @@ -89,7 +89,7 @@ end keyword_default ) Base.@kwdef struct ABM54{Thread} <: OrdinaryDiffEqAlgorithm - thread::Thread = False() + thread::Thread = Serial() end # Variable Step Size Adams methods @@ -104,7 +104,7 @@ end keyword_default ) Base.@kwdef struct VCAB3{Thread} <: OrdinaryDiffEqAdaptiveAlgorithm - thread::Thread = False() + thread::Thread = Serial() end @doc generic_solver_docstring( @@ -117,7 +117,7 @@ end keyword_default ) Base.@kwdef struct VCAB4{Thread} <: OrdinaryDiffEqAdaptiveAlgorithm - thread::Thread = False() + thread::Thread = Serial() end @doc generic_solver_docstring( @@ -130,7 +130,7 @@ end keyword_default ) Base.@kwdef struct VCAB5{Thread} <: OrdinaryDiffEqAdaptiveAlgorithm - thread::Thread = False() + thread::Thread = Serial() end @doc generic_solver_docstring( @@ -143,7 +143,7 @@ end keyword_default ) Base.@kwdef struct VCABM3{Thread} <: OrdinaryDiffEqAdaptiveAlgorithm - thread::Thread = False() + thread::Thread = Serial() end @doc generic_solver_docstring( @@ -156,7 +156,7 @@ end keyword_default ) Base.@kwdef struct VCABM4{Thread} <: OrdinaryDiffEqAdaptiveAlgorithm - thread::Thread = False() + thread::Thread = Serial() end @doc generic_solver_docstring( @@ -169,7 +169,7 @@ end keyword_default ) Base.@kwdef struct VCABM5{Thread} <: OrdinaryDiffEqAdaptiveAlgorithm - thread::Thread = False() + thread::Thread = Serial() end # Variable Order and Variable Step Size Adams methods @@ -184,5 +184,5 @@ end keyword_default ) Base.@kwdef struct VCABM{Thread} <: OrdinaryDiffEqAdamsVarOrderVarStepAlgorithm - thread::Thread = False() + thread::Thread = Serial() end diff --git a/lib/OrdinaryDiffEqAdamsBashforthMoulton/test/regression_test_threading.jl b/lib/OrdinaryDiffEqAdamsBashforthMoulton/test/regression_test_threading.jl index a16b16dd0bb..3808b2da91b 100644 --- a/lib/OrdinaryDiffEqAdamsBashforthMoulton/test/regression_test_threading.jl +++ b/lib/OrdinaryDiffEqAdamsBashforthMoulton/test/regression_test_threading.jl @@ -1,7 +1,7 @@ using OrdinaryDiffEqAdamsBashforthMoulton, ODEProblemLibrary import OrdinaryDiffEqCore: OrdinaryDiffEqAdaptiveAlgorithm using Test -using Static +using FastBroadcast: Serial, Threaded algorithms = [ AB3, AB4, AB5, ABM32, ABM43, ABM54, VCAB3, VCAB4, VCAB5, VCABM3, VCABM4, VCABM5, VCABM, @@ -12,11 +12,11 @@ problem = ODEProblemLibrary.prob_ode_linear @testset "Regression test for threading versions vs non threading versions" begin @testset "$ALG" for ALG in algorithms if ALG isa OrdinaryDiffEqAdaptiveAlgorithm - sol_thread = solve(problem, ALG(Static.True())) - sol_nothread = solve(problem, ALG(Static.False())) + sol_thread = solve(problem, ALG(Threaded())) + sol_nothread = solve(problem, ALG(Serial())) else - sol_thread = solve(problem, ALG(Static.True()), dt = 1 // 2^9) - sol_nothread = solve(problem, ALG(Static.False()), dt = 1 // 2^9) + sol_thread = solve(problem, ALG(Threaded()), dt = 1 // 2^9) + sol_nothread = solve(problem, ALG(Serial()), dt = 1 // 2^9) end @test all(sol_nothread .== sol_thread) end diff --git a/lib/OrdinaryDiffEqBDF/Project.toml b/lib/OrdinaryDiffEqBDF/Project.toml index 58a9bc15c9a..90143e6be60 100644 --- a/lib/OrdinaryDiffEqBDF/Project.toml +++ b/lib/OrdinaryDiffEqBDF/Project.toml @@ -47,7 +47,7 @@ Pkg = "1" NonlinearSolve = "4.12" ForwardDiff = "0.10.38, 1" Test = "<0.0.1, 1" -FastBroadcast = "0.3" +FastBroadcast = "1.2" Random = "<0.0.1, 1" DiffEqDevTools = "2.44.4" DifferentiationInterface = "0.6.54, 0.7" @@ -69,7 +69,7 @@ JET = "0.9, 0.11" StaticArrays = "1.9" julia = "1.10" ADTypes = "1.16" -RecursiveArrayTools = "3.36" +RecursiveArrayTools = "3.51" ODEProblemLibrary = "1" OrdinaryDiffEqNonlinearSolve = "1.16.0" AllocCheck = "0.2" diff --git a/lib/OrdinaryDiffEqCore/Project.toml b/lib/OrdinaryDiffEqCore/Project.toml index 28a488ebe7c..190029b6b24 100644 --- a/lib/OrdinaryDiffEqCore/Project.toml +++ b/lib/OrdinaryDiffEqCore/Project.toml @@ -13,7 +13,6 @@ ConcreteStructs = "2569d6c7-a4a2-43d3-a901-331e8e4be471" StaticArraysCore = "1e83bf80-4336-4d27-bf5d-d5a4f845583c" FunctionWrappersWrappers = "77dc65aa-8811-40c2-897b-53d922fa7daf" FastBroadcast = "7034ab61-46d4-4ed7-9d0f-46aef9175898" -StaticArrayInterface = "0d7ed370-da01-4f52-bd93-41d350b8b718" MuladdMacro = "46d2c3a1-f734-5fdb-9937-b9b9aeba4221" PrecompileTools = "aea7be01-6a6a-4083-8856-8a6e6704d82a" EnumX = "4e289a0a-7415-4d19-859d-a7e5c4648b56" @@ -23,7 +22,6 @@ TruncatedStacktraces = "781d530d-4396-4725-bb49-402e4bee1e77" SciMLBase = "0bca4576-84f4-4d90-8ffe-ffa030f20462" FastClosures = "9aa1b823-49e4-5ca5-8b0f-3971ec8bab6a" DataStructures = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8" -Static = "aedffcd0-7271-4cad-89d0-dc628f76c6d3" DocStringExtensions = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae" ArrayInterface = "4fba245c-0d91-5ea0-9b3e-6abc04ee57a9" Preferences = "21216c6a-2e73-6563-6e65-726566657250" @@ -59,12 +57,11 @@ ConcreteStructs = "0.2" StaticArraysCore = "1.4.3" SciMLStructures = "1.7" FunctionWrappersWrappers = "0.1" -FastBroadcast = "0.3" +FastBroadcast = "1.2" Random = "<0.0.1, 1" DiffEqDevTools = "2.44.4" Test = "<0.0.1, 1" Pkg = "1" -StaticArrayInterface = "1.8" EnzymeCore = "0.7, 0.8" MuladdMacro = "0.2" PrecompileTools = "1.2, 1.3" @@ -77,7 +74,6 @@ SciMLLogging = "1.7.1" FastClosures = "0.3" DataStructures = "0.19" SparseArrays = "1" -Static = "1.2" Aqua = "0.8.11" DocStringExtensions = "0.9" ArrayInterface = "7.19" @@ -88,7 +84,7 @@ JET = "0.9, 0.11" julia = "1.10" ADTypes = "1.16" InteractiveUtils = "1.10" -RecursiveArrayTools = "3.36" +RecursiveArrayTools = "3.51" FastPower = "1.1" Logging = "1.10" Mooncake = "0.4, 0.5" diff --git a/lib/OrdinaryDiffEqCore/src/OrdinaryDiffEqCore.jl b/lib/OrdinaryDiffEqCore/src/OrdinaryDiffEqCore.jl index 16311defff1..e0222c47886 100644 --- a/lib/OrdinaryDiffEqCore/src/OrdinaryDiffEqCore.jl +++ b/lib/OrdinaryDiffEqCore/src/OrdinaryDiffEqCore.jl @@ -68,7 +68,7 @@ import DiffEqBase: get_tstops, get_tstops_array, get_tstops_max using DiffEqBase: check_error!, @def, _vec, _reshape -using FastBroadcast: @.., True, False +using FastBroadcast: @.., Serial, Threaded using SciMLBase: NoInit, CheckInit, OverrideInit, AbstractDEProblem, _unwrap_val, ODEAliasSpecifier diff --git a/lib/OrdinaryDiffEqCore/src/doc_utils.jl b/lib/OrdinaryDiffEqCore/src/doc_utils.jl index f80ee4a856e..8cd32bda7b7 100644 --- a/lib/OrdinaryDiffEqCore/src/doc_utils.jl +++ b/lib/OrdinaryDiffEqCore/src/doc_utils.jl @@ -64,13 +64,13 @@ function explicit_rk_docstring( keyword_default = """ stage_limiter! = OrdinaryDiffEq.trivial_limiter!, step_limiter! = OrdinaryDiffEq.trivial_limiter!, - thread = OrdinaryDiffEq.False(), + thread = Serial(), """ * extra_keyword_default keyword_default_description = """ - `stage_limiter!`: function of the form `limiter!(u, integrator, p, t)` - `step_limiter!`: function of the form `limiter!(u, integrator, p, t)` - - `thread`: determines whether internal broadcasting on appropriate CPU arrays should be serial (`thread = OrdinaryDiffEq.False()`) or use multiple threads (`thread = OrdinaryDiffEq.True()`) when Julia is started with multiple threads. + - `thread`: determines whether internal broadcasting on appropriate CPU arrays should be serial (`thread = Serial()`) or use multiple threads (`thread = Threaded()`) when Julia is started with multiple threads. """ * extra_keyword_description return generic_solver_docstring( diff --git a/lib/OrdinaryDiffEqCore/test/gpu/Project.toml b/lib/OrdinaryDiffEqCore/test/gpu/Project.toml index b23f8a71a70..d326e8fc09b 100644 --- a/lib/OrdinaryDiffEqCore/test/gpu/Project.toml +++ b/lib/OrdinaryDiffEqCore/test/gpu/Project.toml @@ -27,8 +27,8 @@ Adapt = "4" CUDA = "4, 5" ComponentArrays = "0.15" DiffEqBase = "6" -FastBroadcast = "0.3" +FastBroadcast = "1.2" OrdinaryDiffEq = "6" OrdinaryDiffEqCore = "1, 2, 3" -RecursiveArrayTools = "3" +RecursiveArrayTools = "3.51" StaticArrays = "1" diff --git a/lib/OrdinaryDiffEqDifferentiation/Project.toml b/lib/OrdinaryDiffEqDifferentiation/Project.toml index 9f540673981..55fc7ce4811 100644 --- a/lib/OrdinaryDiffEqDifferentiation/Project.toml +++ b/lib/OrdinaryDiffEqDifferentiation/Project.toml @@ -13,12 +13,11 @@ DiffEqBase = {path = "../DiffEqBase"} Pkg = "1" ForwardDiff = "0.10.38, 1" FunctionWrappersWrappers = "0.1" -FastBroadcast = "0.3" +FastBroadcast = "1.2" Random = "<0.0.1, 1" DiffEqDevTools = "2.44.4" Test = "<0.0.1, 1" FiniteDiff = "2.27" -StaticArrayInterface = "1.8" DifferentiationInterface = "0.6.54, 0.7" LinearSolve = "3.61" ConstructionBase = "1.5.8" @@ -51,7 +50,6 @@ ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210" FunctionWrappersWrappers = "77dc65aa-8811-40c2-897b-53d922fa7daf" FastBroadcast = "7034ab61-46d4-4ed7-9d0f-46aef9175898" FiniteDiff = "6a86dc24-6348-571c-b903-95158fe2bd41" -StaticArrayInterface = "0d7ed370-da01-4f52-bd93-41d350b8b718" DifferentiationInterface = "a0c0ee7d-e4b9-4e03-894e-1c5f64a51d63" LinearSolve = "7ed4a6bd-45f5-4d41-b270-4a48e9bafcae" ConstructionBase = "187b0558-2788-49d3-abe0-74a17ed4e7c9" diff --git a/lib/OrdinaryDiffEqExplicitRK/Project.toml b/lib/OrdinaryDiffEqExplicitRK/Project.toml index dadf258140e..182c7f4aef5 100644 --- a/lib/OrdinaryDiffEqExplicitRK/Project.toml +++ b/lib/OrdinaryDiffEqExplicitRK/Project.toml @@ -30,7 +30,7 @@ DiffEqBase = {path = "../DiffEqBase"} [compat] Pkg = "1" Test = "<0.0.1, 1" -FastBroadcast = "0.3" +FastBroadcast = "1.2" Random = "<0.0.1, 1" DiffEqDevTools = "2.44.4" MuladdMacro = "0.2" @@ -41,7 +41,7 @@ OrdinaryDiffEqCore = "3" Aqua = "0.8.11" julia = "1.10" JET = "0.9, 0.11" -RecursiveArrayTools = "3.36" +RecursiveArrayTools = "3.51" AllocCheck = "0.2" DiffEqBase = "6.194" SafeTestsets = "0.1.0" diff --git a/lib/OrdinaryDiffEqExponentialRK/Project.toml b/lib/OrdinaryDiffEqExponentialRK/Project.toml index bac9b70074e..5f15ebb8d74 100644 --- a/lib/OrdinaryDiffEqExponentialRK/Project.toml +++ b/lib/OrdinaryDiffEqExponentialRK/Project.toml @@ -38,7 +38,7 @@ DiffEqBase = {path = "../DiffEqBase"} Pkg = "1" OrdinaryDiffEqTsit5 = "1.4.0" Test = "<0.0.1, 1" -FastBroadcast = "0.3" +FastBroadcast = "1.2" Random = "<0.0.1, 1" DiffEqDevTools = "2.44.4" MuladdMacro = "0.2" @@ -55,7 +55,7 @@ Aqua = "0.8.11" julia = "1.10" JET = "0.9, 0.11" ADTypes = "1.16" -RecursiveArrayTools = "3.36" +RecursiveArrayTools = "3.51" AllocCheck = "0.2" DiffEqBase = "6.194" Reexport = "1.2" diff --git a/lib/OrdinaryDiffEqExtrapolation/Project.toml b/lib/OrdinaryDiffEqExtrapolation/Project.toml index f86e36a548e..e4660b9d3ff 100644 --- a/lib/OrdinaryDiffEqExtrapolation/Project.toml +++ b/lib/OrdinaryDiffEqExtrapolation/Project.toml @@ -34,7 +34,7 @@ DiffEqBase = {path = "../DiffEqBase"} [compat] Pkg = "1" Test = "<0.0.1, 1" -FastBroadcast = "0.3" +FastBroadcast = "1.2" Random = "<0.0.1, 1" DiffEqDevTools = "2.44.4" MuladdMacro = "0.2" @@ -47,7 +47,7 @@ Aqua = "0.8.11" julia = "1.10" JET = "0.9, 0.11" ADTypes = "1.16" -RecursiveArrayTools = "3.36" +RecursiveArrayTools = "3.51" FastPower = "1.1" AllocCheck = "0.2" RecursiveFactorization = "0.2" diff --git a/lib/OrdinaryDiffEqExtrapolation/src/algorithms.jl b/lib/OrdinaryDiffEqExtrapolation/src/algorithms.jl index c7d306c5b93..d8e458ad9b1 100644 --- a/lib/OrdinaryDiffEqExtrapolation/src/algorithms.jl +++ b/lib/OrdinaryDiffEqExtrapolation/src/algorithms.jl @@ -20,13 +20,13 @@ reference = """@inproceedings{elrod2022parallelizing, - `max_order`: maximum order of the adaptive order algorithm. - `min_order`: minimum order of the adaptive order algorithm. - `init_order`: initial order of the adaptive order algorithm. - - `thread`: determines whether internal broadcasting on appropriate CPU arrays should be serial (`thread = OrdinaryDiffEq.False()`) or use multiple threads (`thread = OrdinaryDiffEq.True()`) when Julia is started with multiple threads. + - `thread`: determines whether internal broadcasting on appropriate CPU arrays should be serial (`thread = Serial()`) or use multiple threads (`thread = Threaded()`) when Julia is started with multiple threads. """, """ max_order::Int = 10, min_order::Int = 1, init_order = 3, - thread = OrdinaryDiffEq.False(), + thread = Serial(), """ ) Base.@kwdef struct AitkenNeville{TO} <: OrdinaryDiffEqExtrapolationVarOrderVarStepAlgorithm @@ -46,14 +46,14 @@ Similar to Hairer's SEULEX.", - `max_order`: maximum order of the adaptive order algorithm. - `min_order`: minimum order of the adaptive order algorithm. - `init_order`: initial order of the adaptive order algorithm. - - `thread`: determines whether internal broadcasting on appropriate CPU arrays should be serial (`thread = OrdinaryDiffEq.False()`) or use multiple threads (`thread = OrdinaryDiffEq.True()`) when Julia is started with multiple threads. + - `thread`: determines whether internal broadcasting on appropriate CPU arrays should be serial (`thread = Serial()`) or use multiple threads (`thread = Threaded()`) when Julia is started with multiple threads. - `sequence`: the step-number sequences, also called the subdividing sequence. Possible values are `:harmonic`, `:romberg` or `:bulirsch`. """, extra_keyword_default = """ max_order = 12, min_order = 3, init_order = 5, - thread = OrdinaryDiffEq.False(), + thread = Serial(), sequence = :harmonic """ ) @@ -129,7 +129,7 @@ end - `max_order`: maximum order of the adaptive order algorithm. - `min_order`: minimum order of the adaptive order algorithm. - `init_order`: initial order of the adaptive order algorithm. - - `thread`: determines whether internal broadcasting on appropriate CPU arrays should be serial (`thread = OrdinaryDiffEq.False()`) or use multiple threads (`thread = OrdinaryDiffEq.True()`) when Julia is started with multiple threads. + - `thread`: determines whether internal broadcasting on appropriate CPU arrays should be serial (`thread = Serial()`) or use multiple threads (`thread = Threaded()`) when Julia is started with multiple threads. - `sequence`: the step-number sequences, also called the subdividing sequence. Possible values are `:harmonic`, `:romberg` or `:bulirsch`. - `sequence_factor`: denotes which even multiple of sequence to take while evaluating internal discretizations. """, @@ -137,7 +137,7 @@ end max_order = 10, min_order = 1, init_order = 5, - thread = OrdinaryDiffEq.True(), + thread = Threaded(), sequence = :harmonic, sequence_factor = 2, """ @@ -205,14 +205,14 @@ end - `max_order`: maximum order of the adaptive order algorithm. - `min_order`: minimum order of the adaptive order algorithm. - `init_order`: initial order of the adaptive order algorithm. - - `thread`: determines whether internal broadcasting on appropriate CPU arrays should be serial (`thread = OrdinaryDiffEq.False()`) or use multiple threads (`thread = OrdinaryDiffEq.True()`) when Julia is started with multiple threads. + - `thread`: determines whether internal broadcasting on appropriate CPU arrays should be serial (`thread = Serial()`) or use multiple threads (`thread = Threaded()`) when Julia is started with multiple threads. - `sequence`: the step-number sequences, also called the subdividing sequence. Possible values are `:harmonic`, `:romberg` or `:bulirsch`. """, extra_keyword_default = """ max_order = 10, min_order = 1, init_order = 5, - thread = OrdinaryDiffEq.False(), + thread = Serial(), sequence = :harmonic, """ ) @@ -292,7 +292,7 @@ end - `max_order`: maximum order of the adaptive order algorithm. - `min_order`: minimum order of the adaptive order algorithm. - `init_order`: initial order of the adaptive order algorithm. - - `thread`: determines whether internal broadcasting on appropriate CPU arrays should be serial (`thread = OrdinaryDiffEq.False()`) or use multiple threads (`thread = OrdinaryDiffEq.True()`) when Julia is started with multiple threads. + - `thread`: determines whether internal broadcasting on appropriate CPU arrays should be serial (`thread = Serial()`) or use multiple threads (`thread = Threaded()`) when Julia is started with multiple threads. - `sequence`: the step-number sequences, also called the subdividing sequence. Possible values are `:harmonic`, `:romberg` or `:bulirsch`. - `sequence_factor`: denotes which even multiple of sequence to take while evaluating internal discretizations. """, @@ -300,7 +300,7 @@ end max_order = 10, min_order = 2, init_order = 5, - thread = OrdinaryDiffEq.True(), + thread = Threaded(), sequence = :harmonic, sequence_factor = 2, """ @@ -370,14 +370,14 @@ end - `max_order`: maximum order of the adaptive order algorithm. - `min_order`: minimum order of the adaptive order algorithm. - `init_order`: initial order of the adaptive order algorithm. - - `thread`: determines whether internal broadcasting on appropriate CPU arrays should be serial (`thread = OrdinaryDiffEq.False()`) or use multiple threads (`thread = OrdinaryDiffEq.True()`) when Julia is started with multiple threads. + - `thread`: determines whether internal broadcasting on appropriate CPU arrays should be serial (`thread = Serial()`) or use multiple threads (`thread = Threaded()`) when Julia is started with multiple threads. - `sequence`: the step-number sequences, also called the subdividing sequence. Possible values are `:harmonic`, `:romberg` or `:bulirsch`. """, extra_keyword_default = """ max_order = 10, min_order = 2, init_order = 5, - thread = OrdinaryDiffEq.False(), + thread = Serial(), sequence = :harmonic, """ ) @@ -459,7 +459,7 @@ end - `max_order`: maximum order of the adaptive order algorithm. - `min_order`: minimum order of the adaptive order algorithm. - `init_order`: initial order of the adaptive order algorithm. - - `thread`: determines whether internal broadcasting on appropriate CPU arrays should be serial (`thread = OrdinaryDiffEq.False()`) or use multiple threads (`thread = OrdinaryDiffEq.True()`) when Julia is started with multiple threads. + - `thread`: determines whether internal broadcasting on appropriate CPU arrays should be serial (`thread = Serial()`) or use multiple threads (`thread = Threaded()`) when Julia is started with multiple threads. - `sequence`: the step-number sequences, also called the subdividing sequence. Possible values are `:harmonic`, `:romberg` or `:bulirsch`. - `sequence_factor`: denotes which even multiple of sequence to take while evaluating internal discretizations. """, @@ -467,7 +467,7 @@ end max_order = 10, min_order = 3, init_order = 5, - thread = OrdinaryDiffEq.False(), + thread = Serial(), sequence = :harmonic, sequence_factor = 2, """ diff --git a/lib/OrdinaryDiffEqFIRK/Project.toml b/lib/OrdinaryDiffEqFIRK/Project.toml index bd0bf7db0f7..347d5f6ead1 100644 --- a/lib/OrdinaryDiffEqFIRK/Project.toml +++ b/lib/OrdinaryDiffEqFIRK/Project.toml @@ -39,7 +39,7 @@ DiffEqBase = {path = "../DiffEqBase"} [compat] Pkg = "1" Test = "<0.0.1, 1" -FastBroadcast = "0.3" +FastBroadcast = "1.2" Random = "<0.0.1, 1" DiffEqDevTools = "2.44.4" FastGaussQuadrature = "1.0.2" @@ -55,7 +55,7 @@ GenericSchur = "0.5" julia = "1.10" JET = "0.9, 0.11" ADTypes = "1.16" -RecursiveArrayTools = "3.36" +RecursiveArrayTools = "3.51" FastPower = "1.1" ODEProblemLibrary = "1" OrdinaryDiffEqNonlinearSolve = "1.16.0" diff --git a/lib/OrdinaryDiffEqFeagin/Project.toml b/lib/OrdinaryDiffEqFeagin/Project.toml index 3c30ba32779..dea514d7ed6 100644 --- a/lib/OrdinaryDiffEqFeagin/Project.toml +++ b/lib/OrdinaryDiffEqFeagin/Project.toml @@ -6,7 +6,6 @@ version = "1.9.0" [deps] MuladdMacro = "46d2c3a1-f734-5fdb-9937-b9b9aeba4221" Polyester = "f517fe37-dbe3-4b94-8317-1923a5111588" -Static = "aedffcd0-7271-4cad-89d0-dc628f76c6d3" FastBroadcast = "7034ab61-46d4-4ed7-9d0f-46aef9175898" RecursiveArrayTools = "731186ca-8d62-57ce-b412-fbd966d074cd" DiffEqBase = "2b5f629d-d688-5b77-993f-72d75c75574e" @@ -31,18 +30,17 @@ DiffEqBase = {path = "../DiffEqBase"} [compat] Pkg = "1" Test = "<0.0.1, 1" -FastBroadcast = "0.3" +FastBroadcast = "1.2" Random = "<0.0.1, 1" DiffEqDevTools = "2.44.4" MuladdMacro = "0.2" Polyester = "0.7" SciMLBase = "2.116" OrdinaryDiffEqCore = "3" -Static = "1.2" Aqua = "0.8.11" julia = "1.10" JET = "0.9, 0.11" -RecursiveArrayTools = "3.36" +RecursiveArrayTools = "3.51" ODEProblemLibrary = "1" AllocCheck = "0.2" DiffEqBase = "6.194" diff --git a/lib/OrdinaryDiffEqFeagin/src/OrdinaryDiffEqFeagin.jl b/lib/OrdinaryDiffEqFeagin/src/OrdinaryDiffEqFeagin.jl index ab3fec071d7..94fbddf270b 100644 --- a/lib/OrdinaryDiffEqFeagin/src/OrdinaryDiffEqFeagin.jl +++ b/lib/OrdinaryDiffEqFeagin/src/OrdinaryDiffEqFeagin.jl @@ -12,7 +12,7 @@ import OrdinaryDiffEqCore: alg_order, calculate_residuals!, _ode_interpolant!, _ode_addsteps! using FastBroadcast, Polyester, MuladdMacro, RecursiveArrayTools using DiffEqBase: @def, @tight_loop_macros -using Static: False +using FastBroadcast: Serial import OrdinaryDiffEqCore using Reexport diff --git a/lib/OrdinaryDiffEqFunctionMap/Project.toml b/lib/OrdinaryDiffEqFunctionMap/Project.toml index 6ff7c1fbbc5..a792f0929bc 100644 --- a/lib/OrdinaryDiffEqFunctionMap/Project.toml +++ b/lib/OrdinaryDiffEqFunctionMap/Project.toml @@ -5,7 +5,6 @@ version = "1.10.0" [deps] MuladdMacro = "46d2c3a1-f734-5fdb-9937-b9b9aeba4221" -Static = "aedffcd0-7271-4cad-89d0-dc628f76c6d3" FastBroadcast = "7034ab61-46d4-4ed7-9d0f-46aef9175898" RecursiveArrayTools = "731186ca-8d62-57ce-b412-fbd966d074cd" DiffEqBase = "2b5f629d-d688-5b77-993f-72d75c75574e" @@ -29,17 +28,16 @@ DiffEqBase = {path = "../DiffEqBase"} [compat] Pkg = "1" Test = "<0.0.1, 1" -FastBroadcast = "0.3" +FastBroadcast = "1.2" Random = "<0.0.1, 1" DiffEqDevTools = "2.44.4" MuladdMacro = "0.2" SciMLBase = "2.116" OrdinaryDiffEqCore = "3" -Static = "1.2" Aqua = "0.8.11" julia = "1.10" JET = "0.9, 0.11" -RecursiveArrayTools = "3.36" +RecursiveArrayTools = "3.51" AllocCheck = "0.2" DiffEqBase = "6.194" SafeTestsets = "0.1.0" diff --git a/lib/OrdinaryDiffEqFunctionMap/src/OrdinaryDiffEqFunctionMap.jl b/lib/OrdinaryDiffEqFunctionMap/src/OrdinaryDiffEqFunctionMap.jl index aa6e519438d..5217b73d8a0 100644 --- a/lib/OrdinaryDiffEqFunctionMap/src/OrdinaryDiffEqFunctionMap.jl +++ b/lib/OrdinaryDiffEqFunctionMap/src/OrdinaryDiffEqFunctionMap.jl @@ -11,7 +11,7 @@ using DiffEqBase import RecursiveArrayTools: recursivecopy! import FastBroadcast: @.. import MuladdMacro: @muladd -import Static: False +using FastBroadcast: Serial import OrdinaryDiffEqCore using Reexport diff --git a/lib/OrdinaryDiffEqHighOrderRK/Project.toml b/lib/OrdinaryDiffEqHighOrderRK/Project.toml index 2884c551380..0a9cdaecd7f 100644 --- a/lib/OrdinaryDiffEqHighOrderRK/Project.toml +++ b/lib/OrdinaryDiffEqHighOrderRK/Project.toml @@ -5,7 +5,6 @@ version = "1.10.0" [deps] MuladdMacro = "46d2c3a1-f734-5fdb-9937-b9b9aeba4221" -Static = "aedffcd0-7271-4cad-89d0-dc628f76c6d3" FastBroadcast = "7034ab61-46d4-4ed7-9d0f-46aef9175898" RecursiveArrayTools = "731186ca-8d62-57ce-b412-fbd966d074cd" DiffEqBase = "2b5f629d-d688-5b77-993f-72d75c75574e" @@ -30,17 +29,16 @@ DiffEqBase = {path = "../DiffEqBase"} [compat] Pkg = "1" Test = "<0.0.1, 1" -FastBroadcast = "0.3" +FastBroadcast = "1.2" Random = "<0.0.1, 1" DiffEqDevTools = "2.44.4" MuladdMacro = "0.2" SciMLBase = "2.116" OrdinaryDiffEqCore = "3" -Static = "1.2" Aqua = "0.8.11" julia = "1.10" JET = "0.9, 0.11" -RecursiveArrayTools = "3.36" +RecursiveArrayTools = "3.51" ODEProblemLibrary = "1" AllocCheck = "0.2" DiffEqBase = "6.194" diff --git a/lib/OrdinaryDiffEqHighOrderRK/src/OrdinaryDiffEqHighOrderRK.jl b/lib/OrdinaryDiffEqHighOrderRK/src/OrdinaryDiffEqHighOrderRK.jl index 409a6238d1e..b99588f5bde 100644 --- a/lib/OrdinaryDiffEqHighOrderRK/src/OrdinaryDiffEqHighOrderRK.jl +++ b/lib/OrdinaryDiffEqHighOrderRK/src/OrdinaryDiffEqHighOrderRK.jl @@ -12,7 +12,7 @@ import OrdinaryDiffEqCore: alg_order, qmax_default, qmin_default, beta2_default, copyat_or_push!, get_fsalfirstlast, unwrap_alg, _ode_interpolant, _ode_interpolant!, DerivativeOrderNotPossibleError, full_cache, isdp8 -import Static: False +using FastBroadcast: Serial import MuladdMacro: @muladd using DiffEqBase import FastBroadcast: @.. diff --git a/lib/OrdinaryDiffEqHighOrderRK/src/algorithms.jl b/lib/OrdinaryDiffEqHighOrderRK/src/algorithms.jl index 5e9dadd31c6..45e8823e7cd 100644 --- a/lib/OrdinaryDiffEqHighOrderRK/src/algorithms.jl +++ b/lib/OrdinaryDiffEqHighOrderRK/src/algorithms.jl @@ -9,11 +9,11 @@ Base.@kwdef struct TanYam7{StageLimiter, StepLimiter, Thread} <: OrdinaryDiffEqAdaptiveAlgorithm stage_limiter!::StageLimiter = trivial_limiter! step_limiter!::StepLimiter = trivial_limiter! - thread::Thread = False() + thread::Thread = Serial() end # for backwards compatibility function TanYam7(stage_limiter!, step_limiter! = trivial_limiter!) - return TanYam7(stage_limiter!, step_limiter!, False()) + return TanYam7(stage_limiter!, step_limiter!, Serial()) end @doc explicit_rk_docstring( @@ -32,11 +32,11 @@ Base.@kwdef struct TsitPap8{StageLimiter, StepLimiter, Thread} <: OrdinaryDiffEqAdaptiveAlgorithm stage_limiter!::StageLimiter = trivial_limiter! step_limiter!::StepLimiter = trivial_limiter! - thread::Thread = False() + thread::Thread = Serial() end # for backwards compatibility function TsitPap8(stage_limiter!, step_limiter! = trivial_limiter!) - return TsitPap8(stage_limiter!, step_limiter!, False()) + return TsitPap8(stage_limiter!, step_limiter!, Serial()) end @doc explicit_rk_docstring( @@ -49,11 +49,11 @@ end Base.@kwdef struct DP8{StageLimiter, StepLimiter, Thread} <: OrdinaryDiffEqAdaptiveAlgorithm stage_limiter!::StageLimiter = trivial_limiter! step_limiter!::StepLimiter = trivial_limiter! - thread::Thread = False() + thread::Thread = Serial() end # for backwards compatibility function DP8(stage_limiter!, step_limiter! = trivial_limiter!) - return DP8(stage_limiter!, step_limiter!, False()) + return DP8(stage_limiter!, step_limiter!, Serial()) end @doc explicit_rk_docstring( @@ -75,10 +75,10 @@ Base.@kwdef struct PFRK87{StageLimiter, StepLimiter, Thread, T} <: OrdinaryDiffEqAdaptiveAlgorithm stage_limiter!::StageLimiter = trivial_limiter! step_limiter!::StepLimiter = trivial_limiter! - thread::Thread = False() + thread::Thread = Serial() omega::T = 0.0 end # for backwards compatibility function PFRK87(stage_limiter!, step_limiter! = trivial_limiter!; omega = 0.0) - return PFRK87(stage_limiter!, step_limiter!, False(), omega) + return PFRK87(stage_limiter!, step_limiter!, Serial(), omega) end diff --git a/lib/OrdinaryDiffEqIMEXMultistep/Project.toml b/lib/OrdinaryDiffEqIMEXMultistep/Project.toml index aa6874e0c51..fdbbf2f65c8 100644 --- a/lib/OrdinaryDiffEqIMEXMultistep/Project.toml +++ b/lib/OrdinaryDiffEqIMEXMultistep/Project.toml @@ -29,7 +29,7 @@ DiffEqBase = {path = "../DiffEqBase"} [compat] Pkg = "1" Test = "<0.0.1, 1" -FastBroadcast = "0.3" +FastBroadcast = "1.2" Random = "<0.0.1, 1" DiffEqDevTools = "2.44.4" OrdinaryDiffEqDifferentiation = "2" diff --git a/lib/OrdinaryDiffEqLinear/Project.toml b/lib/OrdinaryDiffEqLinear/Project.toml index bd3c816c883..8b39d54ef18 100644 --- a/lib/OrdinaryDiffEqLinear/Project.toml +++ b/lib/OrdinaryDiffEqLinear/Project.toml @@ -44,7 +44,7 @@ OrdinaryDiffEqCore = "3" Aqua = "0.8.11" julia = "1.10" JET = "0.9, 0.11" -RecursiveArrayTools = "3.36" +RecursiveArrayTools = "3.51" AllocCheck = "0.2" DiffEqBase = "6.194" SafeTestsets = "0.1.0" diff --git a/lib/OrdinaryDiffEqLowOrderRK/Project.toml b/lib/OrdinaryDiffEqLowOrderRK/Project.toml index d95fb3b2715..0599b009751 100644 --- a/lib/OrdinaryDiffEqLowOrderRK/Project.toml +++ b/lib/OrdinaryDiffEqLowOrderRK/Project.toml @@ -8,7 +8,6 @@ MuladdMacro = "46d2c3a1-f734-5fdb-9937-b9b9aeba4221" LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e" FastBroadcast = "7034ab61-46d4-4ed7-9d0f-46aef9175898" RecursiveArrayTools = "731186ca-8d62-57ce-b412-fbd966d074cd" -Static = "aedffcd0-7271-4cad-89d0-dc628f76c6d3" DiffEqBase = "2b5f629d-d688-5b77-993f-72d75c75574e" SciMLBase = "0bca4576-84f4-4d90-8ffe-ffa030f20462" OrdinaryDiffEqCore = "bbf590c4-e513-4bbe-9b18-05decba2e5d8" @@ -31,18 +30,17 @@ DiffEqBase = {path = "../DiffEqBase"} [compat] Pkg = "1" Test = "<0.0.1, 1" -FastBroadcast = "0.3" +FastBroadcast = "1.2" Random = "<0.0.1, 1" DiffEqDevTools = "2.44.4" MuladdMacro = "0.2" LinearAlgebra = "1.10" SciMLBase = "2.116" OrdinaryDiffEqCore = "3" -Static = "1.2" Aqua = "0.8.11" julia = "1.10" JET = "0.9, 0.11" -RecursiveArrayTools = "3.36" +RecursiveArrayTools = "3.51" ODEProblemLibrary = "1" AllocCheck = "0.2" DiffEqBase = "6.194" diff --git a/lib/OrdinaryDiffEqLowOrderRK/src/OrdinaryDiffEqLowOrderRK.jl b/lib/OrdinaryDiffEqLowOrderRK/src/OrdinaryDiffEqLowOrderRK.jl index 6fd7580456a..c68f6134b78 100644 --- a/lib/OrdinaryDiffEqLowOrderRK/src/OrdinaryDiffEqLowOrderRK.jl +++ b/lib/OrdinaryDiffEqLowOrderRK/src/OrdinaryDiffEqLowOrderRK.jl @@ -22,7 +22,7 @@ import MuladdMacro: @muladd import FastBroadcast: @.. import LinearAlgebra: norm import RecursiveArrayTools: recursivefill!, recursive_unitless_bottom_eltype -import Static: False +using FastBroadcast: Serial using DiffEqBase: @def, @tight_loop_macros import DiffEqBase: prepare_alg import OrdinaryDiffEqCore diff --git a/lib/OrdinaryDiffEqLowOrderRK/src/algorithms.jl b/lib/OrdinaryDiffEqLowOrderRK/src/algorithms.jl index ca83f3cb93c..1faf1c0f5c8 100644 --- a/lib/OrdinaryDiffEqLowOrderRK/src/algorithms.jl +++ b/lib/OrdinaryDiffEqLowOrderRK/src/algorithms.jl @@ -28,11 +28,11 @@ Base.@kwdef struct Heun{StageLimiter, StepLimiter, Thread} <: OrdinaryDiffEqAdaptiveAlgorithm stage_limiter!::StageLimiter = trivial_limiter! step_limiter!::StepLimiter = trivial_limiter! - thread::Thread = False() + thread::Thread = Serial() end # for backwards compatibility function Heun(stage_limiter!, step_limiter! = trivial_limiter!) - return Heun(stage_limiter!, step_limiter!, False()) + return Heun(stage_limiter!, step_limiter!, Serial()) end @doc explicit_rk_docstring( @@ -46,11 +46,11 @@ Base.@kwdef struct Ralston{StageLimiter, StepLimiter, Thread} <: OrdinaryDiffEqAdaptiveAlgorithm stage_limiter!::StageLimiter = trivial_limiter! step_limiter!::StepLimiter = trivial_limiter! - thread::Thread = False() + thread::Thread = Serial() end # for backwards compatibility function Ralston(stage_limiter!, step_limiter! = trivial_limiter!) - return Ralston(stage_limiter!, step_limiter!, False()) + return Ralston(stage_limiter!, step_limiter!, Serial()) end @doc explicit_rk_docstring( @@ -64,11 +64,11 @@ Base.@kwdef struct Midpoint{StageLimiter, StepLimiter, Thread} <: OrdinaryDiffEqAdaptiveAlgorithm stage_limiter!::StageLimiter = trivial_limiter! step_limiter!::StepLimiter = trivial_limiter! - thread::Thread = False() + thread::Thread = Serial() end # for backwards compatibility function Midpoint(stage_limiter!, step_limiter! = trivial_limiter!) - return Midpoint(stage_limiter!, step_limiter!, False()) + return Midpoint(stage_limiter!, step_limiter!, Serial()) end @doc explicit_rk_docstring( @@ -88,11 +88,11 @@ end Base.@kwdef struct RK4{StageLimiter, StepLimiter, Thread} <: OrdinaryDiffEqAdaptiveAlgorithm stage_limiter!::StageLimiter = trivial_limiter! step_limiter!::StepLimiter = trivial_limiter! - thread::Thread = False() + thread::Thread = Serial() end # for backwards compatibility function RK4(stage_limiter!, step_limiter! = trivial_limiter!) - return RK4(stage_limiter!, step_limiter!, False()) + return RK4(stage_limiter!, step_limiter!, Serial()) end @doc explicit_rk_docstring( @@ -112,11 +112,11 @@ end Base.@kwdef struct BS3{StageLimiter, StepLimiter, Thread} <: OrdinaryDiffEqAdaptiveAlgorithm stage_limiter!::StageLimiter = trivial_limiter! step_limiter!::StepLimiter = trivial_limiter! - thread::Thread = False() + thread::Thread = Serial() end # for backwards compatibility function BS3(stage_limiter!, step_limiter! = trivial_limiter!) - return BS3(stage_limiter!, step_limiter!, False()) + return BS3(stage_limiter!, step_limiter!, Serial()) end @doc explicit_rk_docstring( @@ -137,11 +137,11 @@ Base.@kwdef struct OwrenZen3{StageLimiter, StepLimiter, Thread} <: OrdinaryDiffEqAdaptiveAlgorithm stage_limiter!::StageLimiter = trivial_limiter! step_limiter!::StepLimiter = trivial_limiter! - thread::Thread = False() + thread::Thread = Serial() end # for backwards compatibility function OwrenZen3(stage_limiter!, step_limiter! = trivial_limiter!) - return OwrenZen3(stage_limiter!, step_limiter!, False()) + return OwrenZen3(stage_limiter!, step_limiter!, Serial()) end @doc explicit_rk_docstring( @@ -162,11 +162,11 @@ Base.@kwdef struct OwrenZen4{StageLimiter, StepLimiter, Thread} <: OrdinaryDiffEqAdaptiveAlgorithm stage_limiter!::StageLimiter = trivial_limiter! step_limiter!::StepLimiter = trivial_limiter! - thread::Thread = False() + thread::Thread = Serial() end # for backwards compatibility function OwrenZen4(stage_limiter!, step_limiter! = trivial_limiter!) - return OwrenZen4(stage_limiter!, step_limiter!, False()) + return OwrenZen4(stage_limiter!, step_limiter!, Serial()) end @doc explicit_rk_docstring( @@ -187,11 +187,11 @@ Base.@kwdef struct OwrenZen5{StageLimiter, StepLimiter, Thread} <: OrdinaryDiffEqAdaptiveAlgorithm stage_limiter!::StageLimiter = trivial_limiter! step_limiter!::StepLimiter = trivial_limiter! - thread::Thread = False() + thread::Thread = Serial() end # for backwards compatibility function OwrenZen5(stage_limiter!, step_limiter! = trivial_limiter!) - return OwrenZen5(stage_limiter!, step_limiter!, False()) + return OwrenZen5(stage_limiter!, step_limiter!, Serial()) end @doc explicit_rk_docstring( @@ -213,7 +213,7 @@ end Base.@kwdef struct BS5{StageLimiter, StepLimiter, Thread, L} <: OrdinaryDiffEqAdaptiveAlgorithm stage_limiter!::StageLimiter = trivial_limiter! step_limiter!::StepLimiter = trivial_limiter! - thread::Thread = False() + thread::Thread = Serial() lazy::L = Val{true}() end # Convert Bool lazy to Val for backwards compatibility @@ -222,7 +222,7 @@ function BS5(stage_limiter!::StageLimiter, step_limiter!::StepLimiter, thread::T end # for backwards compatibility function BS5(stage_limiter!, step_limiter! = trivial_limiter!; lazy = true) - return BS5(stage_limiter!, step_limiter!, False(), lazy) + return BS5(stage_limiter!, step_limiter!, Serial(), lazy) end @doc explicit_rk_docstring( @@ -242,11 +242,11 @@ end Base.@kwdef struct DP5{StageLimiter, StepLimiter, Thread} <: OrdinaryDiffEqAdaptiveAlgorithm stage_limiter!::StageLimiter = trivial_limiter! step_limiter!::StepLimiter = trivial_limiter! - thread::Thread = False() + thread::Thread = Serial() end # for backwards compatibility function DP5(stage_limiter!, step_limiter! = trivial_limiter!) - return DP5(stage_limiter!, step_limiter!, False()) + return DP5(stage_limiter!, step_limiter!, Serial()) end AutoDP5(alg; kwargs...) = AutoAlgSwitch(DP5(), alg; kwargs...) @@ -270,12 +270,12 @@ AutoDP5(alg; kwargs...) = AutoAlgSwitch(DP5(), alg; kwargs...) Base.@kwdef struct Anas5{StageLimiter, StepLimiter, Thread, T} <: OrdinaryDiffEqAlgorithm stage_limiter!::StageLimiter = trivial_limiter! step_limiter!::StepLimiter = trivial_limiter! - thread::Thread = False() + thread::Thread = Serial() w::T = 1 end # for backwards compatibility function Anas5(stage_limiter!, step_limiter! = trivial_limiter!; w = 1) - return Anas5(stage_limiter!, step_limiter!, False(), w) + return Anas5(stage_limiter!, step_limiter!, Serial(), w) end @doc explicit_rk_docstring( @@ -287,11 +287,11 @@ end Base.@kwdef struct RKO65{StageLimiter, StepLimiter, Thread} <: OrdinaryDiffEqAlgorithm stage_limiter!::StageLimiter = trivial_limiter! step_limiter!::StepLimiter = trivial_limiter! - thread::Thread = False() + thread::Thread = Serial() end # for backwards compatibility function RKO65(stage_limiter!, step_limiter! = trivial_limiter!) - return RKO65(stage_limiter!, step_limiter!, False()) + return RKO65(stage_limiter!, step_limiter!, Serial()) end @doc explicit_rk_docstring( @@ -313,13 +313,13 @@ Base.@kwdef struct FRK65{StageLimiter, StepLimiter, Thread, T} <: OrdinaryDiffEqAdaptiveAlgorithm stage_limiter!::StageLimiter = trivial_limiter! step_limiter!::StepLimiter = trivial_limiter! - thread::Thread = False() + thread::Thread = Serial() omega::T = 0.0 end # for backwards compatibility function FRK65(stage_limiter!, step_limiter! = trivial_limiter!; omega = 0.0) - return FRK65(stage_limiter!, step_limiter!, False(), omega) + return FRK65(stage_limiter!, step_limiter!, Serial(), omega) end @doc explicit_rk_docstring( @@ -341,11 +341,11 @@ end Base.@kwdef struct RKM{StageLimiter, StepLimiter, Thread} <: OrdinaryDiffEqAlgorithm stage_limiter!::StageLimiter = trivial_limiter! step_limiter!::StepLimiter = trivial_limiter! - thread::Thread = False() + thread::Thread = Serial() end # for backwards compatibility function RKM(stage_limiter!, step_limiter! = trivial_limiter!) - return RKM(stage_limiter!, step_limiter!, False()) + return RKM(stage_limiter!, step_limiter!, Serial()) end @doc explicit_rk_docstring( @@ -364,10 +364,10 @@ end Base.@kwdef struct Ralston4{StageLimiter, StepLimiter, Thread} <: OrdinaryDiffEqAlgorithm stage_limiter!::StageLimiter = trivial_limiter! step_limiter!::StepLimiter = trivial_limiter! - thread::Thread = False() + thread::Thread = Serial() end function Ralston4(stage_limiter!, step_limiter! = trivial_limiter!) - return Ralston4(stage_limiter!, step_limiter!, False()) + return Ralston4(stage_limiter!, step_limiter!, Serial()) end @doc explicit_rk_docstring( @@ -377,11 +377,11 @@ end Base.@kwdef struct MSRK5{StageLimiter, StepLimiter, Thread} <: OrdinaryDiffEqAlgorithm stage_limiter!::StageLimiter = trivial_limiter! step_limiter!::StepLimiter = trivial_limiter! - thread::Thread = False() + thread::Thread = Serial() end # for backwards compatibility function MSRK5(stage_limiter!, step_limiter! = trivial_limiter!) - return MSRK5(stage_limiter!, step_limiter!, False()) + return MSRK5(stage_limiter!, step_limiter!, Serial()) end @doc explicit_rk_docstring( @@ -391,11 +391,11 @@ end Base.@kwdef struct MSRK6{StageLimiter, StepLimiter, Thread} <: OrdinaryDiffEqAlgorithm stage_limiter!::StageLimiter = trivial_limiter! step_limiter!::StepLimiter = trivial_limiter! - thread::Thread = False() + thread::Thread = Serial() end # for backwards compatibility function MSRK6(stage_limiter!, step_limiter! = trivial_limiter!) - return MSRK6(stage_limiter!, step_limiter!, False()) + return MSRK6(stage_limiter!, step_limiter!, Serial()) end @doc explicit_rk_docstring( @@ -421,7 +421,7 @@ end Base.@kwdef struct PSRK4p7q6{StageLimiter, StepLimiter, Thread} <: OrdinaryDiffEqAlgorithm stage_limiter!::StageLimiter = trivial_limiter! step_limiter!::StepLimiter = trivial_limiter! - thread::Thread = False() + thread::Thread = Serial() end @doc explicit_rk_docstring( @@ -441,7 +441,7 @@ end Base.@kwdef struct PSRK3p5q4{StageLimiter, StepLimiter, Thread} <: OrdinaryDiffEqAlgorithm stage_limiter!::StageLimiter = trivial_limiter! step_limiter!::StepLimiter = trivial_limiter! - thread::Thread = False() + thread::Thread = Serial() end @doc explicit_rk_docstring( @@ -461,7 +461,7 @@ end Base.@kwdef struct PSRK3p6q5{StageLimiter, StepLimiter, Thread} <: OrdinaryDiffEqAlgorithm stage_limiter!::StageLimiter = trivial_limiter! step_limiter!::StepLimiter = trivial_limiter! - thread::Thread = False() + thread::Thread = Serial() end @doc explicit_rk_docstring( @@ -479,11 +479,11 @@ Base.@kwdef struct Stepanov5{StageLimiter, StepLimiter, Thread} <: OrdinaryDiffEqAdaptiveAlgorithm stage_limiter!::StageLimiter = trivial_limiter! step_limiter!::StepLimiter = trivial_limiter! - thread::Thread = False() + thread::Thread = Serial() end # for backwards compatibility function Stepanov5(stage_limiter!, step_limiter! = trivial_limiter!) - return Stepanov5(stage_limiter!, step_limiter!, False()) + return Stepanov5(stage_limiter!, step_limiter!, Serial()) end @doc explicit_rk_docstring( @@ -502,11 +502,11 @@ Base.@kwdef struct SIR54{StageLimiter, StepLimiter, Thread} <: OrdinaryDiffEqAdaptiveAlgorithm stage_limiter!::StageLimiter = trivial_limiter! step_limiter!::StepLimiter = trivial_limiter! - thread::Thread = False() + thread::Thread = Serial() end # for backwards compatibility function SIR54(stage_limiter!, step_limiter! = trivial_limiter!) - return SIR54(stage_limiter!, step_limiter!, False()) + return SIR54(stage_limiter!, step_limiter!, Serial()) end @doc explicit_rk_docstring( @@ -530,11 +530,11 @@ Base.@kwdef struct Alshina2{StageLimiter, StepLimiter, Thread} <: OrdinaryDiffEqAdaptiveAlgorithm stage_limiter!::StageLimiter = trivial_limiter! step_limiter!::StepLimiter = trivial_limiter! - thread::Thread = False() + thread::Thread = Serial() end # for backwards compatibility function Alshina2(stage_limiter!, step_limiter! = trivial_limiter!) - return Alshina2(stage_limiter!, step_limiter!, False()) + return Alshina2(stage_limiter!, step_limiter!, Serial()) end @doc explicit_rk_docstring( @@ -558,11 +558,11 @@ Base.@kwdef struct Alshina3{StageLimiter, StepLimiter, Thread} <: OrdinaryDiffEqAdaptiveAlgorithm stage_limiter!::StageLimiter = trivial_limiter! step_limiter!::StepLimiter = trivial_limiter! - thread::Thread = False() + thread::Thread = Serial() end # for backwards compatibility function Alshina3(stage_limiter!, step_limiter! = trivial_limiter!) - return Alshina3(stage_limiter!, step_limiter!, False()) + return Alshina3(stage_limiter!, step_limiter!, Serial()) end @doc explicit_rk_docstring( @@ -585,9 +585,9 @@ end Base.@kwdef struct Alshina6{StageLimiter, StepLimiter, Thread} <: OrdinaryDiffEqAlgorithm stage_limiter!::StageLimiter = trivial_limiter! step_limiter!::StepLimiter = trivial_limiter! - thread::Thread = False() + thread::Thread = Serial() end # for backwards compatibility function Alshina6(stage_limiter!, step_limiter! = trivial_limiter!) - return Alshina6(stage_limiter!, step_limiter!, False()) + return Alshina6(stage_limiter!, step_limiter!, Serial()) end diff --git a/lib/OrdinaryDiffEqLowStorageRK/Project.toml b/lib/OrdinaryDiffEqLowStorageRK/Project.toml index 996c0f3fda8..aecfad39eef 100644 --- a/lib/OrdinaryDiffEqLowStorageRK/Project.toml +++ b/lib/OrdinaryDiffEqLowStorageRK/Project.toml @@ -10,7 +10,6 @@ PrecompileTools = "aea7be01-6a6a-4083-8856-8a6e6704d82a" Polyester = "f517fe37-dbe3-4b94-8317-1923a5111588" SciMLBase = "0bca4576-84f4-4d90-8ffe-ffa030f20462" OrdinaryDiffEqCore = "bbf590c4-e513-4bbe-9b18-05decba2e5d8" -Static = "aedffcd0-7271-4cad-89d0-dc628f76c6d3" Preferences = "21216c6a-2e73-6563-6e65-726566657250" StaticArrays = "90137ffa-7385-5640-81b9-e52037218182" RecursiveArrayTools = "731186ca-8d62-57ce-b412-fbd966d074cd" @@ -36,7 +35,7 @@ DiffEqBase = {path = "../DiffEqBase"} [compat] Pkg = "1" Test = "<0.0.1, 1" -FastBroadcast = "0.3" +FastBroadcast = "1.2" Random = "<0.0.1, 1" DiffEqDevTools = "2.44.4" StructArrays = "0.6, 0.7" @@ -45,13 +44,12 @@ PrecompileTools = "1.2, 1.3" Polyester = "0.7" SciMLBase = "2.116" OrdinaryDiffEqCore = "3.4" -Static = "1.2" Aqua = "0.8.11" Preferences = "1.4" StaticArrays = "1.9" julia = "1.10" JET = "0.9, 0.11" -RecursiveArrayTools = "3.36" +RecursiveArrayTools = "3.51" ODEProblemLibrary = "1" AllocCheck = "0.2" DiffEqBase = "6.194" diff --git a/lib/OrdinaryDiffEqLowStorageRK/src/OrdinaryDiffEqLowStorageRK.jl b/lib/OrdinaryDiffEqLowStorageRK/src/OrdinaryDiffEqLowStorageRK.jl index e276f1b2131..b2dfa03d27e 100644 --- a/lib/OrdinaryDiffEqLowStorageRK/src/OrdinaryDiffEqLowStorageRK.jl +++ b/lib/OrdinaryDiffEqLowStorageRK/src/OrdinaryDiffEqLowStorageRK.jl @@ -14,7 +14,7 @@ import OrdinaryDiffEqCore: alg_order, alg_adaptive_order, calculate_residuals!, explicit_rk_docstring, get_fsalfirstlast using FastBroadcast, Polyester, MuladdMacro, RecursiveArrayTools, Adapt import StaticArrays: SArray, MVector, SVector, @SVector, StaticArray, MMatrix, SA -import Static: False +using FastBroadcast: Serial import RecursiveArrayTools: recursive_unitless_bottom_eltype import OrdinaryDiffEqCore diff --git a/lib/OrdinaryDiffEqLowStorageRK/src/algorithms.jl b/lib/OrdinaryDiffEqLowStorageRK/src/algorithms.jl index dda860ab349..76be48aa325 100644 --- a/lib/OrdinaryDiffEqLowStorageRK/src/algorithms.jl +++ b/lib/OrdinaryDiffEqLowStorageRK/src/algorithms.jl @@ -13,7 +13,7 @@ equations. Fixed timestep only.", "ORK256", Base.@kwdef struct ORK256{StageLimiter, StepLimiter, Thread} <: OrdinaryDiffEqAlgorithm stage_limiter!::StageLimiter = trivial_limiter! step_limiter!::StepLimiter = trivial_limiter! - thread::Thread = False() + thread::Thread = Serial() williamson_condition::Bool = true end # for backwards compatibility @@ -22,7 +22,7 @@ function ORK256( step_limiter! = trivial_limiter!; williamson_condition = true ) - return ORK256(stage_limiter!, step_limiter!, False(), williamson_condition) + return ORK256(stage_limiter!, step_limiter!, Serial(), williamson_condition) end @doc explicit_rk_docstring( @@ -43,7 +43,7 @@ geometric features of computational domain. Fixed timestep only.", Base.@kwdef struct DGLDDRK73_C{StageLimiter, StepLimiter, Thread} <: OrdinaryDiffEqAlgorithm stage_limiter!::StageLimiter = trivial_limiter! step_limiter!::StepLimiter = trivial_limiter! - thread::Thread = False() + thread::Thread = Serial() williamson_condition::Bool = true end # for backwards compatibility @@ -54,7 +54,7 @@ function DGLDDRK73_C( return DGLDDRK73_C( stage_limiter!, step_limiter!, - False(), + Serial(), williamson_condition ) end @@ -77,7 +77,7 @@ Base.@kwdef struct CarpenterKennedy2N54{StageLimiter, StepLimiter, Thread} <: OrdinaryDiffEqAlgorithm stage_limiter!::StageLimiter = trivial_limiter! step_limiter!::StepLimiter = trivial_limiter! - thread::Thread = False() + thread::Thread = Serial() williamson_condition::Bool = true end # for backwards compatibility @@ -86,7 +86,7 @@ function CarpenterKennedy2N54( step_limiter! = trivial_limiter!; williamson_condition = true ) - return CarpenterKennedy2N54(stage_limiter!, step_limiter!, False(), williamson_condition) + return CarpenterKennedy2N54(stage_limiter!, step_limiter!, Serial(), williamson_condition) end @doc explicit_rk_docstring( @@ -104,7 +104,7 @@ advection-dominated problems. Fixed timestep only.", Base.@kwdef struct NDBLSRK124{StageLimiter, StepLimiter, Thread} <: OrdinaryDiffEqAlgorithm stage_limiter!::StageLimiter = trivial_limiter! step_limiter!::StepLimiter = trivial_limiter! - thread::Thread = False() + thread::Thread = Serial() williamson_condition::Bool = true end # for backwards compatibility @@ -114,7 +114,7 @@ function NDBLSRK124( ) return NDBLSRK124( stage_limiter!, - step_limiter!, False(), + step_limiter!, Serial(), williamson_condition ) end @@ -134,7 +134,7 @@ advection-dominated problems. Fixed timestep only.", Base.@kwdef struct NDBLSRK144{StageLimiter, StepLimiter, Thread} <: OrdinaryDiffEqAlgorithm stage_limiter!::StageLimiter = trivial_limiter! step_limiter!::StepLimiter = trivial_limiter! - thread::Thread = False() + thread::Thread = Serial() williamson_condition::Bool = true end # for backwards compatibility @@ -142,9 +142,9 @@ function NDBLSRK144( stage_limiter!, step_limiter! = trivial_limiter!; williamson_condition = true ) - return NDBLSRK144{typeof(stage_limiter!), typeof(step_limiter!), False}( + return NDBLSRK144{typeof(stage_limiter!), typeof(step_limiter!), typeof(Serial())}( stage_limiter!, - step_limiter!, False(), + step_limiter!, Serial(), williamson_condition ) end @@ -160,14 +160,14 @@ Fixed timestep only.", "CFRLDDRK64", Base.@kwdef struct CFRLDDRK64{StageLimiter, StepLimiter, Thread} <: OrdinaryDiffEqAlgorithm stage_limiter!::StageLimiter = trivial_limiter! step_limiter!::StepLimiter = trivial_limiter! - thread::Thread = False() + thread::Thread = Serial() end # for backwards compatibility function CFRLDDRK64(stage_limiter!, step_limiter! = trivial_limiter!) return CFRLDDRK64( stage_limiter!, step_limiter!, - False() + Serial() ) end @@ -183,14 +183,14 @@ Fixed timestep only.", Base.@kwdef struct TSLDDRK74{StageLimiter, StepLimiter, Thread} <: OrdinaryDiffEqAlgorithm stage_limiter!::StageLimiter = trivial_limiter! step_limiter!::StepLimiter = trivial_limiter! - thread::Thread = False() + thread::Thread = Serial() end # for backwards compatibility function TSLDDRK74(stage_limiter!, step_limiter! = trivial_limiter!) return TSLDDRK74( stage_limiter!, step_limiter!, - False() + Serial() ) end @@ -212,7 +212,7 @@ geometric features of computational domain. Fixed timestep only.", Base.@kwdef struct DGLDDRK84_C{StageLimiter, StepLimiter, Thread} <: OrdinaryDiffEqAlgorithm stage_limiter!::StageLimiter = trivial_limiter! step_limiter!::StepLimiter = trivial_limiter! - thread::Thread = False() + thread::Thread = Serial() williamson_condition::Bool = true end # for backwards compatibility @@ -223,7 +223,7 @@ function DGLDDRK84_C( return DGLDDRK84_C( stage_limiter!, step_limiter!, - False(), + Serial(), williamson_condition ) end @@ -246,7 +246,7 @@ constrained. Fixed timestep only.", Base.@kwdef struct DGLDDRK84_F{StageLimiter, StepLimiter, Thread} <: OrdinaryDiffEqAlgorithm stage_limiter!::StageLimiter = trivial_limiter! step_limiter!::StepLimiter = trivial_limiter! - thread::Thread = False() + thread::Thread = Serial() williamson_condition::Bool = true end # for backwards compatibility @@ -257,7 +257,7 @@ function DGLDDRK84_F( return DGLDDRK84_F( stage_limiter!, step_limiter!, - False(), + Serial(), williamson_condition ) end @@ -278,7 +278,7 @@ end Base.@kwdef struct SHLDDRK64{StageLimiter, StepLimiter, Thread} <: OrdinaryDiffEqAlgorithm stage_limiter!::StageLimiter = trivial_limiter! step_limiter!::StepLimiter = trivial_limiter! - thread::Thread = False() + thread::Thread = Serial() williamson_condition::Bool = true end # for backwards compatibility @@ -287,7 +287,7 @@ function SHLDDRK64( step_limiter! = trivial_limiter!; williamson_condition = true ) - return SHLDDRK64(stage_limiter!, step_limiter!, False(), williamson_condition) + return SHLDDRK64(stage_limiter!, step_limiter!, Serial(), williamson_condition) end @doc explicit_rk_docstring( @@ -298,11 +298,11 @@ Fixed timestep only.", "RK46NL", Base.@kwdef struct RK46NL{StageLimiter, StepLimiter, Thread} <: OrdinaryDiffEqAlgorithm stage_limiter!::StageLimiter = trivial_limiter! step_limiter!::StepLimiter = trivial_limiter! - thread::Thread = False() + thread::Thread = Serial() end # for backwards compatibility function RK46NL(stage_limiter!, step_limiter! = trivial_limiter!) - return RK46NL(stage_limiter!, step_limiter!, False()) + return RK46NL(stage_limiter!, step_limiter!, Serial()) end @doc explicit_rk_docstring( @@ -318,14 +318,14 @@ Base.@kwdef struct ParsaniKetchesonDeconinck3S32{StageLimiter, StepLimiter, Thre OrdinaryDiffEqAlgorithm stage_limiter!::StageLimiter = trivial_limiter! step_limiter!::StepLimiter = trivial_limiter! - thread::Thread = False() + thread::Thread = Serial() end # for backwards compatibility function ParsaniKetchesonDeconinck3S32(stage_limiter!, step_limiter! = trivial_limiter!) - return ParsaniKetchesonDeconinck3S32{typeof(stage_limiter!), typeof(step_limiter!), False}( + return ParsaniKetchesonDeconinck3S32{typeof(stage_limiter!), typeof(step_limiter!), typeof(Serial())}( stage_limiter!, step_limiter!, - False() + Serial() ) end @@ -342,14 +342,14 @@ Base.@kwdef struct ParsaniKetchesonDeconinck3S82{StageLimiter, StepLimiter, Thre OrdinaryDiffEqAlgorithm stage_limiter!::StageLimiter = trivial_limiter! step_limiter!::StepLimiter = trivial_limiter! - thread::Thread = False() + thread::Thread = Serial() end # for backwards compatibility function ParsaniKetchesonDeconinck3S82(stage_limiter!, step_limiter! = trivial_limiter!) - return ParsaniKetchesonDeconinck3S82{typeof(stage_limiter!), typeof(step_limiter!), False}( + return ParsaniKetchesonDeconinck3S82{typeof(stage_limiter!), typeof(step_limiter!), typeof(Serial())}( stage_limiter!, step_limiter!, - False() + Serial() ) end @@ -366,14 +366,14 @@ Base.@kwdef struct ParsaniKetchesonDeconinck3S53{StageLimiter, StepLimiter, Thre OrdinaryDiffEqAlgorithm stage_limiter!::StageLimiter = trivial_limiter! step_limiter!::StepLimiter = trivial_limiter! - thread::Thread = False() + thread::Thread = Serial() end # for backwards compatibility function ParsaniKetchesonDeconinck3S53(stage_limiter!, step_limiter! = trivial_limiter!) - return ParsaniKetchesonDeconinck3S53{typeof(stage_limiter!), typeof(step_limiter!), False}( + return ParsaniKetchesonDeconinck3S53{typeof(stage_limiter!), typeof(step_limiter!), typeof(Serial())}( stage_limiter!, step_limiter!, - False() + Serial() ) end @@ -390,14 +390,14 @@ Base.@kwdef struct ParsaniKetchesonDeconinck3S173{StageLimiter, StepLimiter, Thr OrdinaryDiffEqAlgorithm stage_limiter!::StageLimiter = trivial_limiter! step_limiter!::StepLimiter = trivial_limiter! - thread::Thread = False() + thread::Thread = Serial() end # for backwards compatibility function ParsaniKetchesonDeconinck3S173(stage_limiter!, step_limiter! = trivial_limiter!) - return ParsaniKetchesonDeconinck3S173{typeof(stage_limiter!), typeof(step_limiter!), False}( + return ParsaniKetchesonDeconinck3S173{typeof(stage_limiter!), typeof(step_limiter!), typeof(Serial())}( stage_limiter!, step_limiter!, - False() + Serial() ) end @@ -414,14 +414,14 @@ Base.@kwdef struct ParsaniKetchesonDeconinck3S94{StageLimiter, StepLimiter, Thre OrdinaryDiffEqAlgorithm stage_limiter!::StageLimiter = trivial_limiter! step_limiter!::StepLimiter = trivial_limiter! - thread::Thread = False() + thread::Thread = Serial() end # for backwards compatibility function ParsaniKetchesonDeconinck3S94(stage_limiter!, step_limiter! = trivial_limiter!) - return ParsaniKetchesonDeconinck3S94{typeof(stage_limiter!), typeof(step_limiter!), False}( + return ParsaniKetchesonDeconinck3S94{typeof(stage_limiter!), typeof(step_limiter!), typeof(Serial())}( stage_limiter!, step_limiter!, - False() + Serial() ) end @@ -438,14 +438,14 @@ Base.@kwdef struct ParsaniKetchesonDeconinck3S184{StageLimiter, StepLimiter, Thr OrdinaryDiffEqAlgorithm stage_limiter!::StageLimiter = trivial_limiter! step_limiter!::StepLimiter = trivial_limiter! - thread::Thread = False() + thread::Thread = Serial() end # for backwards compatibility function ParsaniKetchesonDeconinck3S184(stage_limiter!, step_limiter! = trivial_limiter!) - return ParsaniKetchesonDeconinck3S184{typeof(stage_limiter!), typeof(step_limiter!), False}( + return ParsaniKetchesonDeconinck3S184{typeof(stage_limiter!), typeof(step_limiter!), typeof(Serial())}( stage_limiter!, step_limiter!, - False() + Serial() ) end @@ -462,14 +462,14 @@ Base.@kwdef struct ParsaniKetchesonDeconinck3S105{StageLimiter, StepLimiter, Thr OrdinaryDiffEqAlgorithm stage_limiter!::StageLimiter = trivial_limiter! step_limiter!::StepLimiter = trivial_limiter! - thread::Thread = False() + thread::Thread = Serial() end # for backwards compatibility function ParsaniKetchesonDeconinck3S105(stage_limiter!, step_limiter! = trivial_limiter!) - return ParsaniKetchesonDeconinck3S105{typeof(stage_limiter!), typeof(step_limiter!), False}( + return ParsaniKetchesonDeconinck3S105{typeof(stage_limiter!), typeof(step_limiter!), typeof(Serial())}( stage_limiter!, step_limiter!, - False() + Serial() ) end @@ -486,14 +486,14 @@ Base.@kwdef struct ParsaniKetchesonDeconinck3S205{StageLimiter, StepLimiter, Thr OrdinaryDiffEqAlgorithm stage_limiter!::StageLimiter = trivial_limiter! step_limiter!::StepLimiter = trivial_limiter! - thread::Thread = False() + thread::Thread = Serial() end # for backwards compatibility function ParsaniKetchesonDeconinck3S205(stage_limiter!, step_limiter! = trivial_limiter!) - return ParsaniKetchesonDeconinck3S205{typeof(stage_limiter!), typeof(step_limiter!), False}( + return ParsaniKetchesonDeconinck3S205{typeof(stage_limiter!), typeof(step_limiter!), typeof(Serial())}( stage_limiter!, step_limiter!, - False() + Serial() ) end @@ -515,14 +515,14 @@ Base.@kwdef struct CKLLSRK43_2{StageLimiter, StepLimiter, Thread} <: OrdinaryDiffEqAdaptiveAlgorithm stage_limiter!::StageLimiter = trivial_limiter! step_limiter!::StepLimiter = trivial_limiter! - thread::Thread = False() + thread::Thread = Serial() end # for backwards compatibility function CKLLSRK43_2(stage_limiter!, step_limiter! = trivial_limiter!) - return CKLLSRK43_2{typeof(stage_limiter!), typeof(step_limiter!), False}( + return CKLLSRK43_2{typeof(stage_limiter!), typeof(step_limiter!), typeof(Serial())}( stage_limiter!, step_limiter!, - False() + Serial() ) end @@ -544,14 +544,14 @@ Base.@kwdef struct CKLLSRK54_3C{StageLimiter, StepLimiter, Thread} <: OrdinaryDiffEqAdaptiveAlgorithm stage_limiter!::StageLimiter = trivial_limiter! step_limiter!::StepLimiter = trivial_limiter! - thread::Thread = False() + thread::Thread = Serial() end # for backwards compatibility function CKLLSRK54_3C(stage_limiter!, step_limiter! = trivial_limiter!) - return CKLLSRK54_3C{typeof(stage_limiter!), typeof(step_limiter!), False}( + return CKLLSRK54_3C{typeof(stage_limiter!), typeof(step_limiter!), typeof(Serial())}( stage_limiter!, step_limiter!, - False() + Serial() ) end @@ -573,14 +573,14 @@ Base.@kwdef struct CKLLSRK95_4S{StageLimiter, StepLimiter, Thread} <: OrdinaryDiffEqAdaptiveAlgorithm stage_limiter!::StageLimiter = trivial_limiter! step_limiter!::StepLimiter = trivial_limiter! - thread::Thread = False() + thread::Thread = Serial() end # for backwards compatibility function CKLLSRK95_4S(stage_limiter!, step_limiter! = trivial_limiter!) - return CKLLSRK95_4S{typeof(stage_limiter!), typeof(step_limiter!), False}( + return CKLLSRK95_4S{typeof(stage_limiter!), typeof(step_limiter!), typeof(Serial())}( stage_limiter!, step_limiter!, - False() + Serial() ) end @@ -602,14 +602,14 @@ Base.@kwdef struct CKLLSRK95_4C{StageLimiter, StepLimiter, Thread} <: OrdinaryDiffEqAdaptiveAlgorithm stage_limiter!::StageLimiter = trivial_limiter! step_limiter!::StepLimiter = trivial_limiter! - thread::Thread = False() + thread::Thread = Serial() end # for backwards compatibility function CKLLSRK95_4C(stage_limiter!, step_limiter! = trivial_limiter!) - return CKLLSRK95_4C{typeof(stage_limiter!), typeof(step_limiter!), False}( + return CKLLSRK95_4C{typeof(stage_limiter!), typeof(step_limiter!), typeof(Serial())}( stage_limiter!, step_limiter!, - False() + Serial() ) end @@ -631,14 +631,14 @@ Base.@kwdef struct CKLLSRK95_4M{StageLimiter, StepLimiter, Thread} <: OrdinaryDiffEqAdaptiveAlgorithm stage_limiter!::StageLimiter = trivial_limiter! step_limiter!::StepLimiter = trivial_limiter! - thread::Thread = False() + thread::Thread = Serial() end # for backwards compatibility function CKLLSRK95_4M(stage_limiter!, step_limiter! = trivial_limiter!) - return CKLLSRK95_4M{typeof(stage_limiter!), typeof(step_limiter!), False}( + return CKLLSRK95_4M{typeof(stage_limiter!), typeof(step_limiter!), typeof(Serial())}( stage_limiter!, step_limiter!, - False() + Serial() ) end @@ -660,14 +660,14 @@ Base.@kwdef struct CKLLSRK54_3C_3R{StageLimiter, StepLimiter, Thread} <: OrdinaryDiffEqAdaptiveAlgorithm stage_limiter!::StageLimiter = trivial_limiter! step_limiter!::StepLimiter = trivial_limiter! - thread::Thread = False() + thread::Thread = Serial() end # for backwards compatibility function CKLLSRK54_3C_3R(stage_limiter!, step_limiter! = trivial_limiter!) - return CKLLSRK54_3C_3R{typeof(stage_limiter!), typeof(step_limiter!), False}( + return CKLLSRK54_3C_3R{typeof(stage_limiter!), typeof(step_limiter!), typeof(Serial())}( stage_limiter!, step_limiter!, - False() + Serial() ) end @@ -689,14 +689,14 @@ Base.@kwdef struct CKLLSRK54_3M_3R{StageLimiter, StepLimiter, Thread} <: OrdinaryDiffEqAdaptiveAlgorithm stage_limiter!::StageLimiter = trivial_limiter! step_limiter!::StepLimiter = trivial_limiter! - thread::Thread = False() + thread::Thread = Serial() end # for backwards compatibility function CKLLSRK54_3M_3R(stage_limiter!, step_limiter! = trivial_limiter!) - return CKLLSRK54_3M_3R{typeof(stage_limiter!), typeof(step_limiter!), False}( + return CKLLSRK54_3M_3R{typeof(stage_limiter!), typeof(step_limiter!), typeof(Serial())}( stage_limiter!, step_limiter!, - False() + Serial() ) end @@ -718,14 +718,14 @@ Base.@kwdef struct CKLLSRK54_3N_3R{StageLimiter, StepLimiter, Thread} <: OrdinaryDiffEqAdaptiveAlgorithm stage_limiter!::StageLimiter = trivial_limiter! step_limiter!::StepLimiter = trivial_limiter! - thread::Thread = False() + thread::Thread = Serial() end # for backwards compatibility function CKLLSRK54_3N_3R(stage_limiter!, step_limiter! = trivial_limiter!) - return CKLLSRK54_3N_3R{typeof(stage_limiter!), typeof(step_limiter!), False}( + return CKLLSRK54_3N_3R{typeof(stage_limiter!), typeof(step_limiter!), typeof(Serial())}( stage_limiter!, step_limiter!, - False() + Serial() ) end @@ -747,14 +747,14 @@ Base.@kwdef struct CKLLSRK85_4C_3R{StageLimiter, StepLimiter, Thread} <: OrdinaryDiffEqAdaptiveAlgorithm stage_limiter!::StageLimiter = trivial_limiter! step_limiter!::StepLimiter = trivial_limiter! - thread::Thread = False() + thread::Thread = Serial() end # for backwards compatibility function CKLLSRK85_4C_3R(stage_limiter!, step_limiter! = trivial_limiter!) - return CKLLSRK85_4C_3R{typeof(stage_limiter!), typeof(step_limiter!), False}( + return CKLLSRK85_4C_3R{typeof(stage_limiter!), typeof(step_limiter!), typeof(Serial())}( stage_limiter!, step_limiter!, - False() + Serial() ) end @@ -776,14 +776,14 @@ Base.@kwdef struct CKLLSRK85_4M_3R{StageLimiter, StepLimiter, Thread} <: OrdinaryDiffEqAdaptiveAlgorithm stage_limiter!::StageLimiter = trivial_limiter! step_limiter!::StepLimiter = trivial_limiter! - thread::Thread = False() + thread::Thread = Serial() end # for backwards compatibility function CKLLSRK85_4M_3R(stage_limiter!, step_limiter! = trivial_limiter!) - return CKLLSRK85_4M_3R{typeof(stage_limiter!), typeof(step_limiter!), False}( + return CKLLSRK85_4M_3R{typeof(stage_limiter!), typeof(step_limiter!), typeof(Serial())}( stage_limiter!, step_limiter!, - False() + Serial() ) end @@ -805,14 +805,14 @@ Base.@kwdef struct CKLLSRK85_4P_3R{StageLimiter, StepLimiter, Thread} <: OrdinaryDiffEqAdaptiveAlgorithm stage_limiter!::StageLimiter = trivial_limiter! step_limiter!::StepLimiter = trivial_limiter! - thread::Thread = False() + thread::Thread = Serial() end # for backwards compatibility function CKLLSRK85_4P_3R(stage_limiter!, step_limiter! = trivial_limiter!) - return CKLLSRK85_4P_3R{typeof(stage_limiter!), typeof(step_limiter!), False}( + return CKLLSRK85_4P_3R{typeof(stage_limiter!), typeof(step_limiter!), typeof(Serial())}( stage_limiter!, step_limiter!, - False() + Serial() ) end @@ -834,14 +834,14 @@ Base.@kwdef struct CKLLSRK54_3N_4R{StageLimiter, StepLimiter, Thread} <: OrdinaryDiffEqAdaptiveAlgorithm stage_limiter!::StageLimiter = trivial_limiter! step_limiter!::StepLimiter = trivial_limiter! - thread::Thread = False() + thread::Thread = Serial() end # for backwards compatibility function CKLLSRK54_3N_4R(stage_limiter!, step_limiter! = trivial_limiter!) - return CKLLSRK54_3N_4R{typeof(stage_limiter!), typeof(step_limiter!), False}( + return CKLLSRK54_3N_4R{typeof(stage_limiter!), typeof(step_limiter!), typeof(Serial())}( stage_limiter!, step_limiter!, - False() + Serial() ) end @@ -863,14 +863,14 @@ Base.@kwdef struct CKLLSRK54_3M_4R{StageLimiter, StepLimiter, Thread} <: OrdinaryDiffEqAdaptiveAlgorithm stage_limiter!::StageLimiter = trivial_limiter! step_limiter!::StepLimiter = trivial_limiter! - thread::Thread = False() + thread::Thread = Serial() end # for backwards compatibility function CKLLSRK54_3M_4R(stage_limiter!, step_limiter! = trivial_limiter!) - return CKLLSRK54_3M_4R{typeof(stage_limiter!), typeof(step_limiter!), False}( + return CKLLSRK54_3M_4R{typeof(stage_limiter!), typeof(step_limiter!), typeof(Serial())}( stage_limiter!, step_limiter!, - False() + Serial() ) end @@ -891,14 +891,14 @@ Base.@kwdef struct CKLLSRK65_4M_4R{StageLimiter, StepLimiter, Thread} <: OrdinaryDiffEqAdaptiveAlgorithm stage_limiter!::StageLimiter = trivial_limiter! step_limiter!::StepLimiter = trivial_limiter! - thread::Thread = False() + thread::Thread = Serial() end # for backwards compatibility function CKLLSRK65_4M_4R(stage_limiter!, step_limiter! = trivial_limiter!) return CKLLSRK65_4M_4R( stage_limiter!, step_limiter!, - False() + Serial() ) end @@ -920,14 +920,14 @@ Base.@kwdef struct CKLLSRK85_4FM_4R{StageLimiter, StepLimiter, Thread} <: OrdinaryDiffEqAdaptiveAlgorithm stage_limiter!::StageLimiter = trivial_limiter! step_limiter!::StepLimiter = trivial_limiter! - thread::Thread = False() + thread::Thread = Serial() end # for backwards compatibility function CKLLSRK85_4FM_4R(stage_limiter!, step_limiter! = trivial_limiter!) return CKLLSRK85_4FM_4R( stage_limiter!, step_limiter!, - False() + Serial() ) end @@ -949,14 +949,14 @@ Base.@kwdef struct CKLLSRK75_4M_5R{StageLimiter, StepLimiter, Thread} <: OrdinaryDiffEqAdaptiveAlgorithm stage_limiter!::StageLimiter = trivial_limiter! step_limiter!::StepLimiter = trivial_limiter! - thread::Thread = False() + thread::Thread = Serial() end # for backwards compatibility function CKLLSRK75_4M_5R(stage_limiter!, step_limiter! = trivial_limiter!) - return CKLLSRK75_4M_5R{typeof(stage_limiter!), typeof(step_limiter!), False}( + return CKLLSRK75_4M_5R{typeof(stage_limiter!), typeof(step_limiter!), typeof(Serial())}( stage_limiter!, step_limiter!, - False() + Serial() ) end @@ -973,13 +973,13 @@ Base.@kwdef struct RDPK3Sp35{StageLimiter, StepLimiter, Thread} <: OrdinaryDiffEqAdaptiveAlgorithm stage_limiter!::StageLimiter = trivial_limiter! step_limiter!::StepLimiter = trivial_limiter! - thread::Thread = False() + thread::Thread = Serial() end # for backwards compatibility function RDPK3Sp35(stage_limiter!, step_limiter! = trivial_limiter!) - return RDPK3Sp35{typeof(stage_limiter!), typeof(step_limiter!), False}( + return RDPK3Sp35{typeof(stage_limiter!), typeof(step_limiter!), typeof(Serial())}( stage_limiter!, - step_limiter!, False() + step_limiter!, Serial() ) end @@ -997,14 +997,14 @@ Base.@kwdef struct RDPK3SpFSAL35{StageLimiter, StepLimiter, Thread} <: OrdinaryDiffEqAdaptiveAlgorithm stage_limiter!::StageLimiter = trivial_limiter! step_limiter!::StepLimiter = trivial_limiter! - thread::Thread = False() + thread::Thread = Serial() end # for backwards compatibility function RDPK3SpFSAL35(stage_limiter!, step_limiter! = trivial_limiter!) - return RDPK3SpFSAL35{typeof(stage_limiter!), typeof(step_limiter!), False}( + return RDPK3SpFSAL35{typeof(stage_limiter!), typeof(step_limiter!), typeof(Serial())}( stage_limiter!, step_limiter!, - False() + Serial() ) end @@ -1021,13 +1021,13 @@ Base.@kwdef struct RDPK3Sp49{StageLimiter, StepLimiter, Thread} <: OrdinaryDiffEqAdaptiveAlgorithm stage_limiter!::StageLimiter = trivial_limiter! step_limiter!::StepLimiter = trivial_limiter! - thread::Thread = False() + thread::Thread = Serial() end # for backwards compatibility function RDPK3Sp49(stage_limiter!, step_limiter! = trivial_limiter!) - return RDPK3Sp49{typeof(stage_limiter!), typeof(step_limiter!), False}( + return RDPK3Sp49{typeof(stage_limiter!), typeof(step_limiter!), typeof(Serial())}( stage_limiter!, - step_limiter!, False() + step_limiter!, Serial() ) end @@ -1045,14 +1045,14 @@ Base.@kwdef struct RDPK3SpFSAL49{StageLimiter, StepLimiter, Thread} <: OrdinaryDiffEqAdaptiveAlgorithm stage_limiter!::StageLimiter = trivial_limiter! step_limiter!::StepLimiter = trivial_limiter! - thread::Thread = False() + thread::Thread = Serial() end # for backwards compatibility function RDPK3SpFSAL49(stage_limiter!, step_limiter! = trivial_limiter!) - return RDPK3SpFSAL49{typeof(stage_limiter!), typeof(step_limiter!), False}( + return RDPK3SpFSAL49{typeof(stage_limiter!), typeof(step_limiter!), typeof(Serial())}( stage_limiter!, step_limiter!, - False() + Serial() ) end @@ -1069,13 +1069,13 @@ Base.@kwdef struct RDPK3Sp510{StageLimiter, StepLimiter, Thread} <: OrdinaryDiffEqAdaptiveAlgorithm stage_limiter!::StageLimiter = trivial_limiter! step_limiter!::StepLimiter = trivial_limiter! - thread::Thread = False() + thread::Thread = Serial() end # for backwards compatibility function RDPK3Sp510(stage_limiter!, step_limiter! = trivial_limiter!) - return RDPK3Sp510{typeof(stage_limiter!), typeof(step_limiter!), False}( + return RDPK3Sp510{typeof(stage_limiter!), typeof(step_limiter!), typeof(Serial())}( stage_limiter!, - step_limiter!, False() + step_limiter!, Serial() ) end @@ -1093,14 +1093,14 @@ Base.@kwdef struct RDPK3SpFSAL510{StageLimiter, StepLimiter, Thread} <: OrdinaryDiffEqAdaptiveAlgorithm stage_limiter!::StageLimiter = trivial_limiter! step_limiter!::StepLimiter = trivial_limiter! - thread::Thread = False() + thread::Thread = Serial() end # for backwards compatibility function RDPK3SpFSAL510(stage_limiter!, step_limiter! = trivial_limiter!) - return RDPK3SpFSAL510{typeof(stage_limiter!), typeof(step_limiter!), False}( + return RDPK3SpFSAL510{typeof(stage_limiter!), typeof(step_limiter!), typeof(Serial())}( stage_limiter!, step_limiter!, - False() + Serial() ) end @@ -1127,7 +1127,7 @@ struct HSLDDRK64{StageLimiter, StepLimiter, Thread} <: OrdinaryDiffEqAlgorithm williamson_condition::Bool function HSLDDRK64( stage_limiter! = trivial_limiter!, step_limiter! = trivial_limiter!; - williamson_condition = true, thread = False() + williamson_condition = true, thread = Serial() ) Base.depwarn("HSLDDRK64 is deprecated, use SHLDDRK64 instead.", :HSLDDRK64) return SHLDDRK64(; stage_limiter!, step_limiter!, thread, williamson_condition) @@ -1149,7 +1149,7 @@ advection-dominated problems. Fixed timestep only.", Base.@kwdef struct NDBLSRK134{StageLimiter, StepLimiter, Thread} <: OrdinaryDiffEqAlgorithm stage_limiter!::StageLimiter = trivial_limiter! step_limiter!::StepLimiter = trivial_limiter! - thread::Thread = False() + thread::Thread = Serial() williamson_condition::Bool = true end # for backwards compatibility @@ -1159,7 +1159,7 @@ function NDBLSRK134( ) return NDBLSRK134( stage_limiter!, - step_limiter!, False(), + step_limiter!, Serial(), williamson_condition ) end @@ -1180,14 +1180,14 @@ end Base.@kwdef struct SHLDDRK_2N{StageLimiter, StepLimiter, Thread} <: OrdinaryDiffEqAlgorithm stage_limiter!::StageLimiter = trivial_limiter! step_limiter!::StepLimiter = trivial_limiter! - thread::Thread = False() + thread::Thread = Serial() end # for backwards compatibility function SHLDDRK_2N(stage_limiter!, step_limiter! = trivial_limiter!) return SHLDDRK_2N( stage_limiter!, step_limiter!, - False() + Serial() ) end @@ -1207,13 +1207,13 @@ end Base.@kwdef struct SHLDDRK52{StageLimiter, StepLimiter, Thread} <: OrdinaryDiffEqAlgorithm stage_limiter!::StageLimiter = trivial_limiter! step_limiter!::StepLimiter = trivial_limiter! - thread::Thread = False() + thread::Thread = Serial() end # for backwards compatibility function SHLDDRK52(stage_limiter!, step_limiter! = trivial_limiter!) return SHLDDRK52( stage_limiter!, step_limiter!, - False() + Serial() ) end diff --git a/lib/OrdinaryDiffEqNewmark/Project.toml b/lib/OrdinaryDiffEqNewmark/Project.toml index 300325ddb15..c0d6d03b242 100644 --- a/lib/OrdinaryDiffEqNewmark/Project.toml +++ b/lib/OrdinaryDiffEqNewmark/Project.toml @@ -32,7 +32,7 @@ DiffEqBase = {path = "../DiffEqBase"} [compat] Pkg = "1" Test = "<0.0.1, 1" -FastBroadcast = "0.3.5" +FastBroadcast = "1.2" Random = "<0.0.1, 1" DiffEqDevTools = "2.44.4" MuladdMacro = "0.2.4" @@ -45,7 +45,7 @@ NonlinearSolveFirstOrder = "1.9.0" MacroTools = "0.5.13" JET = "0.9, 0.11" julia = "1.10" -RecursiveArrayTools = "3.36" +RecursiveArrayTools = "3.51" PreallocationTools = "0.4.34, 1" DiffEqBase = "6.194" Reexport = "1.2.2" diff --git a/lib/OrdinaryDiffEqNonlinearSolve/Project.toml b/lib/OrdinaryDiffEqNonlinearSolve/Project.toml index a13470338ef..017919e1bb2 100644 --- a/lib/OrdinaryDiffEqNonlinearSolve/Project.toml +++ b/lib/OrdinaryDiffEqNonlinearSolve/Project.toml @@ -50,7 +50,7 @@ Pkg = "1" NonlinearSolve = "4.12" ForwardDiff = "0.10.38, 1" Test = "<0.0.1, 1" -FastBroadcast = "0.3" +FastBroadcast = "1.2" Random = "<0.0.1, 1" DiffEqDevTools = "2.44.4" MuladdMacro = "0.2" @@ -74,7 +74,7 @@ StaticArrays = "1.9" julia = "1.10" JET = "0.9, 0.11" ADTypes = "1.16" -RecursiveArrayTools = "3.36" +RecursiveArrayTools = "3.51" ODEProblemLibrary = "1" PreallocationTools = "0.4, 1" AllocCheck = "0.2" diff --git a/lib/OrdinaryDiffEqNordsieck/Project.toml b/lib/OrdinaryDiffEqNordsieck/Project.toml index 5d5f1f3da85..fe46588d668 100644 --- a/lib/OrdinaryDiffEqNordsieck/Project.toml +++ b/lib/OrdinaryDiffEqNordsieck/Project.toml @@ -11,7 +11,6 @@ Polyester = "f517fe37-dbe3-4b94-8317-1923a5111588" LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e" SciMLBase = "0bca4576-84f4-4d90-8ffe-ffa030f20462" OrdinaryDiffEqCore = "bbf590c4-e513-4bbe-9b18-05decba2e5d8" -Static = "aedffcd0-7271-4cad-89d0-dc628f76c6d3" RecursiveArrayTools = "731186ca-8d62-57ce-b412-fbd966d074cd" DiffEqBase = "2b5f629d-d688-5b77-993f-72d75c75574e" Reexport = "189a3867-3050-52da-a836-e630ba90ab69" @@ -34,7 +33,7 @@ DiffEqBase = {path = "../DiffEqBase"} Pkg = "1" OrdinaryDiffEqTsit5 = "1.4.0" Test = "<0.0.1, 1" -FastBroadcast = "0.3" +FastBroadcast = "1.2" Random = "<0.0.1, 1" DiffEqDevTools = "2.44.4" MuladdMacro = "0.2" @@ -42,11 +41,10 @@ Polyester = "0.7" LinearAlgebra = "1.10" SciMLBase = "2.116" OrdinaryDiffEqCore = "3.4" -Static = "1.2" Aqua = "0.8.11" julia = "1.10" JET = "0.9, 0.11" -RecursiveArrayTools = "3.36" +RecursiveArrayTools = "3.51" ODEProblemLibrary = "1" AllocCheck = "0.2" DiffEqBase = "6.194" diff --git a/lib/OrdinaryDiffEqNordsieck/src/OrdinaryDiffEqNordsieck.jl b/lib/OrdinaryDiffEqNordsieck/src/OrdinaryDiffEqNordsieck.jl index 475d325996e..9766bbfaf11 100644 --- a/lib/OrdinaryDiffEqNordsieck/src/OrdinaryDiffEqNordsieck.jl +++ b/lib/OrdinaryDiffEqNordsieck/src/OrdinaryDiffEqNordsieck.jl @@ -14,7 +14,7 @@ import OrdinaryDiffEqCore: alg_order, alg_adaptive_order, qsteady_max_default, generic_solver_docstring using MuladdMacro, FastBroadcast, RecursiveArrayTools import LinearAlgebra: rmul! -import Static: False +using FastBroadcast: Serial using OrdinaryDiffEqTsit5: Tsit5ConstantCache, Tsit5Cache import OrdinaryDiffEqCore diff --git a/lib/OrdinaryDiffEqNordsieck/src/nordsieck_caches.jl b/lib/OrdinaryDiffEqNordsieck/src/nordsieck_caches.jl index e8e056775d9..4810d384211 100644 --- a/lib/OrdinaryDiffEqNordsieck/src/nordsieck_caches.jl +++ b/lib/OrdinaryDiffEqNordsieck/src/nordsieck_caches.jl @@ -84,7 +84,7 @@ function alg_cache( tmp = zero(u) tsit5cache = Tsit5Cache( u, uprev, k1, k2, k3, k4, k5, k6, k7, utilde, tmp, atmp, - trivial_limiter!, trivial_limiter!, False() + trivial_limiter!, trivial_limiter!, Serial() ) ################################################# N = 5 @@ -247,7 +247,7 @@ function alg_cache( tmp = zero(u) tsit5cache = Tsit5Cache( u, uprev, k1, k2, k3, k4, k5, k6, k7, utilde, tmp, atmp, - trivial_limiter!, trivial_limiter!, False() + trivial_limiter!, trivial_limiter!, Serial() ) ################################################# fsalfirst = zero(rate_prototype) diff --git a/lib/OrdinaryDiffEqPDIRK/Project.toml b/lib/OrdinaryDiffEqPDIRK/Project.toml index 86db05e9238..66e54a9c78c 100644 --- a/lib/OrdinaryDiffEqPDIRK/Project.toml +++ b/lib/OrdinaryDiffEqPDIRK/Project.toml @@ -36,7 +36,7 @@ AllocCheck = "0.2" Aqua = "0.8.11" DiffEqBase = "6.194" DiffEqDevTools = "2.44.4" -FastBroadcast = "0.3" +FastBroadcast = "1.2" JET = "0.9, 0.11" MuladdMacro = "0.2" Polyester = "0.7" diff --git a/lib/OrdinaryDiffEqPDIRK/src/algorithms.jl b/lib/OrdinaryDiffEqPDIRK/src/algorithms.jl index e7a855eda87..f35478e1982 100644 --- a/lib/OrdinaryDiffEqPDIRK/src/algorithms.jl +++ b/lib/OrdinaryDiffEqPDIRK/src/algorithms.jl @@ -14,12 +14,12 @@ extra_keyword_description = """ - `nlsolve`: TBD, - `extrapolant`: TBD, - - `thread`: determines whether internal broadcasting on appropriate CPU arrays should be serial (`thread = OrdinaryDiffEq.False()`) or use multiple threads (`thread = OrdinaryDiffEq.True()`) when Julia is started with multiple threads. + - `thread`: determines whether internal broadcasting on appropriate CPU arrays should be serial (`thread = Serial()`) or use multiple threads (`thread = Threaded()`) when Julia is started with multiple threads. """, extra_keyword_default = """ nlsolve = NLNewton(), extrapolant = :constant, - thread = OrdinaryDiffEq.True(), + thread = Threaded(), """ ) struct PDIRK44{CS, AD, F, F2, P, FDT, ST, CJ, TO} <: diff --git a/lib/OrdinaryDiffEqPRK/Project.toml b/lib/OrdinaryDiffEqPRK/Project.toml index b99f7adbaa2..fc9f64030b6 100644 --- a/lib/OrdinaryDiffEqPRK/Project.toml +++ b/lib/OrdinaryDiffEqPRK/Project.toml @@ -28,7 +28,7 @@ DiffEqBase = {path = "../DiffEqBase"} [compat] Pkg = "1" Test = "<0.0.1, 1" -FastBroadcast = "0.3" +FastBroadcast = "1.2" Random = "<0.0.1, 1" DiffEqDevTools = "2.44.4" MuladdMacro = "0.2" diff --git a/lib/OrdinaryDiffEqPRK/src/algorithms.jl b/lib/OrdinaryDiffEqPRK/src/algorithms.jl index 2468c606dbe..5156bce20da 100644 --- a/lib/OrdinaryDiffEqPRK/src/algorithms.jl +++ b/lib/OrdinaryDiffEqPRK/src/algorithms.jl @@ -11,8 +11,8 @@ pages={49--82}, year={1995}, publisher={SIAM}}""", - "- `thread`: determines whether internal broadcasting on appropriate CPU arrays should be serial (`thread = OrdinaryDiffEq.False()`) or use multiple threads (`thread = OrdinaryDiffEq.True()`) when Julia is started with multiple threads.", - "thread = OrdinaryDiffEq.True()," + "- `thread`: determines whether internal broadcasting on appropriate CPU arrays should be serial (`thread = Serial()`) or use multiple threads (`thread = Threaded()`) when Julia is started with multiple threads.", + "thread = Threaded()," ) Base.@kwdef struct KuttaPRK2p5{TO} <: OrdinaryDiffEqAlgorithm threading::TO = true diff --git a/lib/OrdinaryDiffEqQPRK/Project.toml b/lib/OrdinaryDiffEqQPRK/Project.toml index e50548a2775..d65886bdf25 100644 --- a/lib/OrdinaryDiffEqQPRK/Project.toml +++ b/lib/OrdinaryDiffEqQPRK/Project.toml @@ -5,7 +5,6 @@ version = "1.9.0" [deps] MuladdMacro = "46d2c3a1-f734-5fdb-9937-b9b9aeba4221" -Static = "aedffcd0-7271-4cad-89d0-dc628f76c6d3" FastBroadcast = "7034ab61-46d4-4ed7-9d0f-46aef9175898" RecursiveArrayTools = "731186ca-8d62-57ce-b412-fbd966d074cd" DiffEqBase = "2b5f629d-d688-5b77-993f-72d75c75574e" @@ -30,17 +29,16 @@ DiffEqBase = {path = "../DiffEqBase"} [compat] Pkg = "1" Test = "<0.0.1, 1" -FastBroadcast = "0.3" +FastBroadcast = "1.2" Random = "<0.0.1, 1" DiffEqDevTools = "2.44.4" MuladdMacro = "0.2" SciMLBase = "2.116" OrdinaryDiffEqCore = "3" -Static = "1.2" Aqua = "0.8.11" julia = "1.10" JET = "0.9, 0.11" -RecursiveArrayTools = "3.36" +RecursiveArrayTools = "3.51" ODEProblemLibrary = "1" AllocCheck = "0.2" DiffEqBase = "6.194" diff --git a/lib/OrdinaryDiffEqQPRK/src/OrdinaryDiffEqQPRK.jl b/lib/OrdinaryDiffEqQPRK/src/OrdinaryDiffEqQPRK.jl index e94e0e41a97..8bb7de03e45 100644 --- a/lib/OrdinaryDiffEqQPRK/src/OrdinaryDiffEqQPRK.jl +++ b/lib/OrdinaryDiffEqQPRK/src/OrdinaryDiffEqQPRK.jl @@ -8,7 +8,7 @@ import OrdinaryDiffEqCore: OrdinaryDiffEqAdaptiveAlgorithm, OrdinaryDiffEqConsta perform_step!, get_fsalfirstlast, constvalue, calculate_residuals!, calculate_residuals, full_cache -using Static: False +using FastBroadcast: Serial using MuladdMacro, FastBroadcast using RecursiveArrayTools: recursive_unitless_bottom_eltype, recursivefill! import OrdinaryDiffEqCore diff --git a/lib/OrdinaryDiffEqQPRK/src/algorithms.jl b/lib/OrdinaryDiffEqQPRK/src/algorithms.jl index d03724e02fa..572913bd4b5 100644 --- a/lib/OrdinaryDiffEqQPRK/src/algorithms.jl +++ b/lib/OrdinaryDiffEqQPRK/src/algorithms.jl @@ -8,9 +8,9 @@ Base.@kwdef struct QPRK98{StageLimiter, StepLimiter, Thread} <: OrdinaryDiffEqAdaptiveAlgorithm stage_limiter!::StageLimiter = trivial_limiter! step_limiter!::StepLimiter = trivial_limiter! - thread::Thread = False() + thread::Thread = Serial() end # for backwards compatibility function QPRK98(stage_limiter!, step_limiter! = trivial_limiter!) - return QPRK98(stage_limiter!, step_limiter!, False()) + return QPRK98(stage_limiter!, step_limiter!, Serial()) end diff --git a/lib/OrdinaryDiffEqRKN/Project.toml b/lib/OrdinaryDiffEqRKN/Project.toml index 93a74684b07..5288ac6cdaa 100644 --- a/lib/OrdinaryDiffEqRKN/Project.toml +++ b/lib/OrdinaryDiffEqRKN/Project.toml @@ -31,7 +31,7 @@ DiffEqBase = {path = "../DiffEqBase"} Statistics = "<0.0.1, 1" Pkg = "1" Test = "<0.0.1, 1" -FastBroadcast = "0.3" +FastBroadcast = "1.2" Random = "<0.0.1, 1" DiffEqDevTools = "2.44.4" MuladdMacro = "0.2" @@ -41,7 +41,7 @@ OrdinaryDiffEqCore = "3" Aqua = "0.8.11" julia = "1.10" JET = "0.9, 0.11" -RecursiveArrayTools = "3.36" +RecursiveArrayTools = "3.51" AllocCheck = "0.2" DiffEqBase = "6.194" SafeTestsets = "0.1.0" diff --git a/lib/OrdinaryDiffEqRosenbrock/Project.toml b/lib/OrdinaryDiffEqRosenbrock/Project.toml index 7fe1aae2212..668200323bb 100644 --- a/lib/OrdinaryDiffEqRosenbrock/Project.toml +++ b/lib/OrdinaryDiffEqRosenbrock/Project.toml @@ -22,7 +22,6 @@ Preferences = "21216c6a-2e73-6563-6e65-726566657250" RecursiveArrayTools = "731186ca-8d62-57ce-b412-fbd966d074cd" Reexport = "189a3867-3050-52da-a836-e630ba90ab69" SciMLBase = "0bca4576-84f4-4d90-8ffe-ffa030f20462" -Static = "aedffcd0-7271-4cad-89d0-dc628f76c6d3" [sources] DiffEqBase = {path = "../DiffEqBase"} @@ -38,7 +37,7 @@ DiffEqBase = "6.194" DiffEqDevTools = "2.44.4" DifferentiationInterface = "0.6.54, 0.7" Enzyme = "0.13" -FastBroadcast = "0.3" +FastBroadcast = "1.2" FiniteDiff = "2.27" ForwardDiff = "0.10.38, 1" JET = "0.9, 0.11" @@ -55,11 +54,10 @@ Polyester = "0.7" PrecompileTools = "1.2, 1.3" Preferences = "1.4" Random = "<0.0.1, 1" -RecursiveArrayTools = "3.36" +RecursiveArrayTools = "3.51" Reexport = "1.2" SafeTestsets = "0.1.0" SciMLBase = "2.116" -Static = "1.2" Test = "<0.0.1, 1" julia = "1.10" diff --git a/lib/OrdinaryDiffEqSDIRK/Project.toml b/lib/OrdinaryDiffEqSDIRK/Project.toml index 9a39149c718..1d9442ce749 100644 --- a/lib/OrdinaryDiffEqSDIRK/Project.toml +++ b/lib/OrdinaryDiffEqSDIRK/Project.toml @@ -38,7 +38,7 @@ DiffEqBase = {path = "../DiffEqBase"} [compat] Pkg = "1" Test = "<0.0.1, 1" -FastBroadcast = "0.3" +FastBroadcast = "1.2" Random = "<0.0.1, 1" DiffEqDevTools = "2.44.4" DifferentiationInterface = "0.6.54, 0.7" @@ -56,7 +56,7 @@ Preferences = "1.4" julia = "1.10" JET = "0.9, 0.11" ADTypes = "1.16" -RecursiveArrayTools = "3.36" +RecursiveArrayTools = "3.51" OrdinaryDiffEqNonlinearSolve = "1.16.0" AllocCheck = "0.2" DiffEqBase = "6.194" diff --git a/lib/OrdinaryDiffEqSIMDRK/Project.toml b/lib/OrdinaryDiffEqSIMDRK/Project.toml index 4a6a103cd4e..74c67e0f2ba 100644 --- a/lib/OrdinaryDiffEqSIMDRK/Project.toml +++ b/lib/OrdinaryDiffEqSIMDRK/Project.toml @@ -6,7 +6,6 @@ version = "1.6.0" [deps] MuladdMacro = "46d2c3a1-f734-5fdb-9937-b9b9aeba4221" OrdinaryDiffEqCore = "bbf590c4-e513-4bbe-9b18-05decba2e5d8" -Static = "aedffcd0-7271-4cad-89d0-dc628f76c6d3" SLEEFPirates = "476501e8-09a2-5ece-8869-fb82de89a1fa" Reexport = "189a3867-3050-52da-a836-e630ba90ab69" VectorizationBase = "3d5dd08c-fd9d-11e8-17fa-ed2836048c2f" @@ -25,7 +24,6 @@ Test = "<0.0.1, 1" DiffEqDevTools = "2.44.4" MuladdMacro = "0.2" OrdinaryDiffEqCore = "3" -Static = "0.7, 0.8, 1" SLEEFPirates = "0.6" VectorizationBase = "0.21" JET = "0.9, 0.11" diff --git a/lib/OrdinaryDiffEqSIMDRK/src/OrdinaryDiffEqSIMDRK.jl b/lib/OrdinaryDiffEqSIMDRK/src/OrdinaryDiffEqSIMDRK.jl index e27a0f539de..dd51b68eeea 100644 --- a/lib/OrdinaryDiffEqSIMDRK/src/OrdinaryDiffEqSIMDRK.jl +++ b/lib/OrdinaryDiffEqSIMDRK/src/OrdinaryDiffEqSIMDRK.jl @@ -1,6 +1,7 @@ module OrdinaryDiffEqSIMDRK -using MuladdMacro, Static +using MuladdMacro +using FastBroadcast: Serial using OrdinaryDiffEqCore: OrdinaryDiffEqAdaptiveAlgorithm, OrdinaryDiffEqConstantCache, trivial_limiter!, calculate_residuals, constvalue import OrdinaryDiffEqCore: initialize!, perform_step!, alg_cache diff --git a/lib/OrdinaryDiffEqSIMDRK/src/algorithms.jl b/lib/OrdinaryDiffEqSIMDRK/src/algorithms.jl index 09ce7b55fdd..e8e4d15e7c3 100644 --- a/lib/OrdinaryDiffEqSIMDRK/src/algorithms.jl +++ b/lib/OrdinaryDiffEqSIMDRK/src/algorithms.jl @@ -6,7 +6,7 @@ end function MER5v2(; stage_limiter! = trivial_limiter!, step_limiter! = trivial_limiter!, - thread = False() + thread = Serial() ) return MER5v2{typeof(stage_limiter!), typeof(step_limiter!), typeof(thread)}( stage_limiter!, @@ -17,9 +17,9 @@ end # for backwards compatibility function MER5v2(stage_limiter!, step_limiter! = trivial_limiter!) - return MER5v2{typeof(stage_limiter!), typeof(step_limiter!), False}( + return MER5v2{typeof(stage_limiter!), typeof(step_limiter!), typeof(Serial())}( stage_limiter!, - step_limiter!, False() + step_limiter!, Serial() ) end @@ -31,7 +31,7 @@ end function MER6v2(; stage_limiter! = trivial_limiter!, step_limiter! = trivial_limiter!, - thread = False() + thread = Serial() ) return MER6v2{typeof(stage_limiter!), typeof(step_limiter!), typeof(thread)}( stage_limiter!, @@ -42,9 +42,9 @@ end # for backwards compatibility function MER6v2(stage_limiter!, step_limiter! = trivial_limiter!) - return MER6v2{typeof(stage_limiter!), typeof(step_limiter!), False}( + return MER6v2{typeof(stage_limiter!), typeof(step_limiter!), typeof(Serial())}( stage_limiter!, - step_limiter!, False() + step_limiter!, Serial() ) end @@ -56,7 +56,7 @@ end function RK6v4(; stage_limiter! = trivial_limiter!, step_limiter! = trivial_limiter!, - thread = False() + thread = Serial() ) return RK6v4{typeof(stage_limiter!), typeof(step_limiter!), typeof(thread)}( stage_limiter!, @@ -67,9 +67,9 @@ end # for backwards compatibility function RK6v4(stage_limiter!, step_limiter! = trivial_limiter!) - return RK6v4{typeof(stage_limiter!), typeof(step_limiter!), False}( + return RK6v4{typeof(stage_limiter!), typeof(step_limiter!), typeof(Serial())}( stage_limiter!, - step_limiter!, False() + step_limiter!, Serial() ) end diff --git a/lib/OrdinaryDiffEqSSPRK/Project.toml b/lib/OrdinaryDiffEqSSPRK/Project.toml index eed4a3c39a1..97d41798863 100644 --- a/lib/OrdinaryDiffEqSSPRK/Project.toml +++ b/lib/OrdinaryDiffEqSSPRK/Project.toml @@ -10,7 +10,6 @@ PrecompileTools = "aea7be01-6a6a-4083-8856-8a6e6704d82a" Polyester = "f517fe37-dbe3-4b94-8317-1923a5111588" SciMLBase = "0bca4576-84f4-4d90-8ffe-ffa030f20462" OrdinaryDiffEqCore = "bbf590c4-e513-4bbe-9b18-05decba2e5d8" -Static = "aedffcd0-7271-4cad-89d0-dc628f76c6d3" Preferences = "21216c6a-2e73-6563-6e65-726566657250" StaticArrays = "90137ffa-7385-5640-81b9-e52037218182" RecursiveArrayTools = "731186ca-8d62-57ce-b412-fbd966d074cd" @@ -36,7 +35,7 @@ DiffEqBase = {path = "../DiffEqBase"} [compat] Pkg = "1" Test = "<0.0.1, 1" -FastBroadcast = "0.3" +FastBroadcast = "1.2" Random = "<0.0.1, 1" DiffEqDevTools = "2.44.4" StructArrays = "0.6, 0.7" @@ -45,13 +44,12 @@ PrecompileTools = "1.2, 1.3" Polyester = "0.7" SciMLBase = "2.116" OrdinaryDiffEqCore = "3" -Static = "1.2" Aqua = "0.8.11" Preferences = "1.4" StaticArrays = "1.9" julia = "1.10" JET = "0.9, 0.11" -RecursiveArrayTools = "3.36" +RecursiveArrayTools = "3.51" ODEProblemLibrary = "1" AllocCheck = "0.2" DiffEqBase = "6.194" diff --git a/lib/OrdinaryDiffEqSSPRK/src/OrdinaryDiffEqSSPRK.jl b/lib/OrdinaryDiffEqSSPRK/src/OrdinaryDiffEqSSPRK.jl index 244fb4d36d3..30ab000903a 100644 --- a/lib/OrdinaryDiffEqSSPRK/src/OrdinaryDiffEqSSPRK.jl +++ b/lib/OrdinaryDiffEqSSPRK/src/OrdinaryDiffEqSSPRK.jl @@ -15,7 +15,7 @@ import OrdinaryDiffEqCore: alg_order, calculate_residuals!, _ode_addsteps!, get_fsalfirstlast, copyat_or_push! using FastBroadcast, Polyester, MuladdMacro, RecursiveArrayTools using DiffEqBase: @def -using Static: False +using FastBroadcast: Serial import OrdinaryDiffEqCore using Reexport diff --git a/lib/OrdinaryDiffEqSSPRK/src/algorithms.jl b/lib/OrdinaryDiffEqSSPRK/src/algorithms.jl index 23379a116fc..681fa058d1d 100644 --- a/lib/OrdinaryDiffEqSSPRK/src/algorithms.jl +++ b/lib/OrdinaryDiffEqSSPRK/src/algorithms.jl @@ -9,14 +9,14 @@ Fixed timestep only.", Base.@kwdef struct SSPRK53_2N2{StageLimiter, StepLimiter, Thread} <: OrdinaryDiffEqAlgorithm stage_limiter!::StageLimiter = trivial_limiter! step_limiter!::StepLimiter = trivial_limiter! - thread::Thread = False() + thread::Thread = Serial() end # for backwards compatibility function SSPRK53_2N2(stage_limiter!, step_limiter! = trivial_limiter!) return SSPRK53_2N2( stage_limiter!, step_limiter!, - False() + Serial() ) end @@ -32,13 +32,13 @@ Fixed timestep only.", Base.@kwdef struct SSPRK22{StageLimiter, StepLimiter, Thread} <: OrdinaryDiffEqAlgorithm stage_limiter!::StageLimiter = trivial_limiter! step_limiter!::StepLimiter = trivial_limiter! - thread::Thread = False() + thread::Thread = Serial() end # for backwards compatibility function SSPRK22(stage_limiter!, step_limiter! = trivial_limiter!) return SSPRK22( stage_limiter!, - step_limiter!, False() + step_limiter!, Serial() ) end @@ -53,13 +53,13 @@ Fixed timestep only.", Base.@kwdef struct SSPRK53{StageLimiter, StepLimiter, Thread} <: OrdinaryDiffEqAlgorithm stage_limiter!::StageLimiter = trivial_limiter! step_limiter!::StepLimiter = trivial_limiter! - thread::Thread = False() + thread::Thread = Serial() end # for backwards compatibility function SSPRK53(stage_limiter!, step_limiter! = trivial_limiter!) return SSPRK53( stage_limiter!, - step_limiter!, False() + step_limiter!, Serial() ) end @@ -74,13 +74,13 @@ Fixed timestep only.", Base.@kwdef struct SSPRK63{StageLimiter, StepLimiter, Thread} <: OrdinaryDiffEqAlgorithm stage_limiter!::StageLimiter = trivial_limiter! step_limiter!::StepLimiter = trivial_limiter! - thread::Thread = False() + thread::Thread = Serial() end # for backwards compatibility function SSPRK63(stage_limiter!, step_limiter! = trivial_limiter!) return SSPRK63( stage_limiter!, - step_limiter!, False() + step_limiter!, Serial() ) end @@ -95,13 +95,13 @@ Fixed timestep only.", Base.@kwdef struct SSPRK83{StageLimiter, StepLimiter, Thread} <: OrdinaryDiffEqAlgorithm stage_limiter!::StageLimiter = trivial_limiter! step_limiter!::StepLimiter = trivial_limiter! - thread::Thread = False() + thread::Thread = Serial() end # for backwards compatibility function SSPRK83(stage_limiter!, step_limiter! = trivial_limiter!) return SSPRK83( stage_limiter!, - step_limiter!, False() + step_limiter!, Serial() ) end @@ -133,13 +133,13 @@ Base.@kwdef struct SSPRK43{StageLimiter, StepLimiter, Thread} <: OrdinaryDiffEqAdaptiveAlgorithm stage_limiter!::StageLimiter = trivial_limiter! step_limiter!::StepLimiter = trivial_limiter! - thread::Thread = False() + thread::Thread = Serial() end # for backwards compatibility function SSPRK43(stage_limiter!, step_limiter! = trivial_limiter!) return SSPRK43( stage_limiter!, - step_limiter!, False() + step_limiter!, Serial() ) end @@ -155,13 +155,13 @@ Base.@kwdef struct SSPRK432{StageLimiter, StepLimiter, Thread} <: OrdinaryDiffEqAdaptiveAlgorithm stage_limiter!::StageLimiter = trivial_limiter! step_limiter!::StepLimiter = trivial_limiter! - thread::Thread = False() + thread::Thread = Serial() end # for backwards compatibility function SSPRK432(stage_limiter!, step_limiter! = trivial_limiter!) return SSPRK432( stage_limiter!, - step_limiter!, False() + step_limiter!, Serial() ) end @@ -179,14 +179,14 @@ Base.@kwdef struct SSPRKMSVS32{StageLimiter, StepLimiter, Thread} <: OrdinaryDiffEqAdaptiveAlgorithm stage_limiter!::StageLimiter = trivial_limiter! step_limiter!::StepLimiter = trivial_limiter! - thread::Thread = False() + thread::Thread = Serial() end # for backwards compatibility function SSPRKMSVS32(stage_limiter!, step_limiter! = trivial_limiter!) return SSPRKMSVS32( stage_limiter!, step_limiter!, - False() + Serial() ) end @@ -201,13 +201,13 @@ Fixed timestep only.", Base.@kwdef struct SSPRK54{StageLimiter, StepLimiter, Thread} <: OrdinaryDiffEqAlgorithm stage_limiter!::StageLimiter = trivial_limiter! step_limiter!::StepLimiter = trivial_limiter! - thread::Thread = False() + thread::Thread = Serial() end # for backwards compatibility function SSPRK54(stage_limiter!, step_limiter! = trivial_limiter!) return SSPRK54( stage_limiter!, - step_limiter!, False() + step_limiter!, Serial() ) end @@ -222,14 +222,14 @@ Fixed timestep only.", Base.@kwdef struct SSPRK53_2N1{StageLimiter, StepLimiter, Thread} <: OrdinaryDiffEqAlgorithm stage_limiter!::StageLimiter = trivial_limiter! step_limiter!::StepLimiter = trivial_limiter! - thread::Thread = False() + thread::Thread = Serial() end # for backwards compatibility function SSPRK53_2N1(stage_limiter!, step_limiter! = trivial_limiter!) return SSPRK53_2N1( stage_limiter!, step_limiter!, - False() + Serial() ) end @@ -245,13 +245,13 @@ Fixed timestep only.", Base.@kwdef struct SSPRK104{StageLimiter, StepLimiter, Thread} <: OrdinaryDiffEqAlgorithm stage_limiter!::StageLimiter = trivial_limiter! step_limiter!::StepLimiter = trivial_limiter! - thread::Thread = False() + thread::Thread = Serial() end # for backwards compatibility function SSPRK104(stage_limiter!, step_limiter! = trivial_limiter!) return SSPRK104( stage_limiter!, - step_limiter!, False() + step_limiter!, Serial() ) end @@ -269,13 +269,13 @@ Base.@kwdef struct SSPRK932{StageLimiter, StepLimiter, Thread} <: OrdinaryDiffEqAdaptiveAlgorithm stage_limiter!::StageLimiter = trivial_limiter! step_limiter!::StepLimiter = trivial_limiter! - thread::Thread = False() + thread::Thread = Serial() end # for backwards compatibility function SSPRK932(stage_limiter!, step_limiter! = trivial_limiter!) return SSPRK932( stage_limiter!, - step_limiter!, False() + step_limiter!, Serial() ) end @@ -293,14 +293,14 @@ Base.@kwdef struct SSPRKMSVS43{StageLimiter, StepLimiter, Thread} <: OrdinaryDiffEqAdaptiveAlgorithm stage_limiter!::StageLimiter = trivial_limiter! step_limiter!::StepLimiter = trivial_limiter! - thread::Thread = False() + thread::Thread = Serial() end # for backwards compatibility function SSPRKMSVS43(stage_limiter!, step_limiter! = trivial_limiter!) return SSPRKMSVS43( stage_limiter!, step_limiter!, - False() + Serial() ) end @@ -315,13 +315,13 @@ Fixed timestep only.", Base.@kwdef struct SSPRK73{StageLimiter, StepLimiter, Thread} <: OrdinaryDiffEqAlgorithm stage_limiter!::StageLimiter = trivial_limiter! step_limiter!::StepLimiter = trivial_limiter! - thread::Thread = False() + thread::Thread = Serial() end # for backwards compatibility function SSPRK73(stage_limiter!, step_limiter! = trivial_limiter!) return SSPRK73( stage_limiter!, - step_limiter!, False() + step_limiter!, Serial() ) end @@ -336,13 +336,13 @@ Fixed timestep only.", Base.@kwdef struct SSPRK53_H{StageLimiter, StepLimiter, Thread} <: OrdinaryDiffEqAlgorithm stage_limiter!::StageLimiter = trivial_limiter! step_limiter!::StepLimiter = trivial_limiter! - thread::Thread = False() + thread::Thread = Serial() end # for backwards compatibility function SSPRK53_H(stage_limiter!, step_limiter! = trivial_limiter!) return SSPRK53_H( stage_limiter!, - step_limiter!, False() + step_limiter!, Serial() ) end @@ -358,13 +358,13 @@ Fixed timestep only.", Base.@kwdef struct SSPRK33{StageLimiter, StepLimiter, Thread} <: OrdinaryDiffEqAlgorithm stage_limiter!::StageLimiter = trivial_limiter! step_limiter!::StepLimiter = trivial_limiter! - thread::Thread = False() + thread::Thread = Serial() end # for backwards compatibility function SSPRK33(stage_limiter!, step_limiter! = trivial_limiter!) return SSPRK33( stage_limiter!, - step_limiter!, False() + step_limiter!, Serial() ) end @@ -383,14 +383,14 @@ end Base.@kwdef struct KYKSSPRK42{StageLimiter, StepLimiter, Thread} <: OrdinaryDiffEqAlgorithm stage_limiter!::StageLimiter = trivial_limiter! step_limiter!::StepLimiter = trivial_limiter! - thread::Thread = False() + thread::Thread = Serial() end # for backwards compatibility function KYKSSPRK42(stage_limiter!, step_limiter! = trivial_limiter!) return KYKSSPRK42( stage_limiter!, step_limiter!, - False() + Serial() ) end @@ -410,14 +410,14 @@ Base.@kwdef struct KYK2014DGSSPRK_3S2{StageLimiter, StepLimiter, Thread} <: OrdinaryDiffEqAlgorithm stage_limiter!::StageLimiter = trivial_limiter! step_limiter!::StepLimiter = trivial_limiter! - thread::Thread = False() + thread::Thread = Serial() end # for backwards compatibility function KYK2014DGSSPRK_3S2(stage_limiter!, step_limiter! = trivial_limiter!) return KYK2014DGSSPRK_3S2( stage_limiter!, step_limiter!, - False() + Serial() ) end @@ -439,7 +439,7 @@ Base.@kwdef struct pRRK22{T, StageLimiter, StepLimiter, Thread} <: OrdinaryDiffE kappa::T = 0.0 stage_limiter!::StageLimiter = trivial_limiter! step_limiter!::StepLimiter = trivial_limiter! - thread::Thread = False() + thread::Thread = Serial() end @doc explicit_rk_docstring( @@ -460,7 +460,7 @@ Base.@kwdef struct pRRK33{T, StageLimiter, StepLimiter, Thread} <: OrdinaryDiffE kappa::T = 0.0 stage_limiter!::StageLimiter = trivial_limiter! step_limiter!::StepLimiter = trivial_limiter! - thread::Thread = False() + thread::Thread = Serial() end @doc explicit_rk_docstring( @@ -481,5 +481,5 @@ Base.@kwdef struct pRRK54{T, StageLimiter, StepLimiter, Thread} <: OrdinaryDiffE kappa::T = 0.0 stage_limiter!::StageLimiter = trivial_limiter! step_limiter!::StepLimiter = trivial_limiter! - thread::Thread = False() + thread::Thread = Serial() end diff --git a/lib/OrdinaryDiffEqStabilizedIRK/Project.toml b/lib/OrdinaryDiffEqStabilizedIRK/Project.toml index cdb6c1b05ad..806e2c011d8 100644 --- a/lib/OrdinaryDiffEqStabilizedIRK/Project.toml +++ b/lib/OrdinaryDiffEqStabilizedIRK/Project.toml @@ -34,7 +34,7 @@ DiffEqBase = {path = "../DiffEqBase"} [compat] Pkg = "1" Test = "<0.0.1, 1" -FastBroadcast = "0.3" +FastBroadcast = "1.2" Random = "<0.0.1, 1" DiffEqDevTools = "2.44.4" MuladdMacro = "0.2" @@ -48,7 +48,7 @@ StaticArrays = "1.9" julia = "1.10" JET = "0.9, 0.11" ADTypes = "1.16" -RecursiveArrayTools = "3.36" +RecursiveArrayTools = "3.51" OrdinaryDiffEqNonlinearSolve = "1.16.0" AllocCheck = "0.2" DiffEqBase = "6.194" diff --git a/lib/OrdinaryDiffEqStabilizedRK/Project.toml b/lib/OrdinaryDiffEqStabilizedRK/Project.toml index 9d666b617e6..064a5c4cbca 100644 --- a/lib/OrdinaryDiffEqStabilizedRK/Project.toml +++ b/lib/OrdinaryDiffEqStabilizedRK/Project.toml @@ -31,7 +31,7 @@ DiffEqBase = {path = "../DiffEqBase"} [compat] Pkg = "1" Test = "<0.0.1, 1" -FastBroadcast = "0.3" +FastBroadcast = "1.2" Random = "<0.0.1, 1" DiffEqDevTools = "2.44.4" MuladdMacro = "0.2" @@ -42,7 +42,7 @@ Aqua = "0.8.11" StaticArrays = "1.9" julia = "1.10" JET = "0.9, 0.11" -RecursiveArrayTools = "3.36" +RecursiveArrayTools = "3.51" ODEProblemLibrary = "1" AllocCheck = "0.2" DiffEqBase = "6.194" diff --git a/lib/OrdinaryDiffEqSymplecticRK/Project.toml b/lib/OrdinaryDiffEqSymplecticRK/Project.toml index 23b2d312813..a73b7c966a8 100644 --- a/lib/OrdinaryDiffEqSymplecticRK/Project.toml +++ b/lib/OrdinaryDiffEqSymplecticRK/Project.toml @@ -35,7 +35,7 @@ Statistics = "<0.0.1, 1" Pkg = "1" OrdinaryDiffEqTsit5 = "1.4.0" Test = "<0.0.1, 1" -FastBroadcast = "0.3" +FastBroadcast = "1.2" Random = "<0.0.1, 1" DiffEqDevTools = "2.44.4" MuladdMacro = "0.2" @@ -47,7 +47,7 @@ OrdinaryDiffEqCore = "3" Aqua = "0.8.11" julia = "1.10" JET = "0.9, 0.11" -RecursiveArrayTools = "3.36" +RecursiveArrayTools = "3.51" AllocCheck = "0.2" DiffEqBase = "6.194" Reexport = "1.2" diff --git a/lib/OrdinaryDiffEqTaylorSeries/Project.toml b/lib/OrdinaryDiffEqTaylorSeries/Project.toml index 464c37d07a9..4a17f94b86d 100644 --- a/lib/OrdinaryDiffEqTaylorSeries/Project.toml +++ b/lib/OrdinaryDiffEqTaylorSeries/Project.toml @@ -14,7 +14,6 @@ Preferences = "21216c6a-2e73-6563-6e65-726566657250" RecursiveArrayTools = "731186ca-8d62-57ce-b412-fbd966d074cd" Reexport = "189a3867-3050-52da-a836-e630ba90ab69" SciMLBase = "0bca4576-84f4-4d90-8ffe-ffa030f20462" -Static = "aedffcd0-7271-4cad-89d0-dc628f76c6d3" SymbolicUtils = "d1185830-fcd6-423d-90d6-eec64667417b" Symbolics = "0c5d862f-8b57-4792-8d23-62f2024744c7" TaylorDiff = "b36ab563-344f-407b-a36a-4f200bebf99c" @@ -39,7 +38,7 @@ AllocCheck = "0.2" Aqua = "0.8.11" DiffEqBase = "6.194" DiffEqDevTools = "2.44.4" -FastBroadcast = "0.3" +FastBroadcast = "1.2" JET = "0.9, 0.11" LinearAlgebra = "1.10" MuladdMacro = "0.2" @@ -49,11 +48,10 @@ Pkg = "1" PrecompileTools = "1.2, 1.3" Preferences = "1.4" Random = "<0.0.1, 1" -RecursiveArrayTools = "3.36" +RecursiveArrayTools = "3.51" Reexport = "1.2" SafeTestsets = "0.1.0" SciMLBase = "2.116" -Static = "1.2" SymbolicUtils = "4" Symbolics = "7" TaylorDiff = "0.3.1" diff --git a/lib/OrdinaryDiffEqTaylorSeries/src/OrdinaryDiffEqTaylorSeries.jl b/lib/OrdinaryDiffEqTaylorSeries/src/OrdinaryDiffEqTaylorSeries.jl index 8a5be02b1f7..4ffba29f1fa 100644 --- a/lib/OrdinaryDiffEqTaylorSeries/src/OrdinaryDiffEqTaylorSeries.jl +++ b/lib/OrdinaryDiffEqTaylorSeries/src/OrdinaryDiffEqTaylorSeries.jl @@ -11,7 +11,7 @@ import OrdinaryDiffEqCore: alg_order, alg_stability_size, explicit_rk_docstring, CompositeAlgorithm, _ode_addsteps!, copyat_or_push!, AutoAlgSwitch, get_fsalfirstlast, full_cache, DerivativeOrderNotPossibleError -import Static: False +using FastBroadcast: Serial import MuladdMacro: @muladd import FastBroadcast: @.. import RecursiveArrayTools: recursivefill!, recursive_unitless_bottom_eltype diff --git a/lib/OrdinaryDiffEqTaylorSeries/src/algorithms.jl b/lib/OrdinaryDiffEqTaylorSeries/src/algorithms.jl index 162a66697f8..949da34d993 100644 --- a/lib/OrdinaryDiffEqTaylorSeries/src/algorithms.jl +++ b/lib/OrdinaryDiffEqTaylorSeries/src/algorithms.jl @@ -6,12 +6,12 @@ Base.@kwdef struct ExplicitTaylor2{StageLimiter, StepLimiter, Thread} <: OrdinaryDiffEqAlgorithm stage_limiter!::StageLimiter = trivial_limiter! step_limiter!::StepLimiter = trivial_limiter! - thread::Thread = False() + thread::Thread = Serial() end @truncate_stacktrace ExplicitTaylor2 3 # for backwards compatibility function ExplicitTaylor2(stage_limiter!, step_limiter! = trivial_limiter!) - return ExplicitTaylor2(stage_limiter!, step_limiter!, False()) + return ExplicitTaylor2(stage_limiter!, step_limiter!, Serial()) end @doc explicit_rk_docstring( @@ -23,5 +23,5 @@ Base.@kwdef struct ExplicitTaylor{P, StageLimiter, StepLimiter, Thread} <: order::Val{P} = Val{1}() stage_limiter!::StageLimiter = trivial_limiter! step_limiter!::StepLimiter = trivial_limiter! - thread::Thread = False() + thread::Thread = Serial() end diff --git a/lib/OrdinaryDiffEqTsit5/Project.toml b/lib/OrdinaryDiffEqTsit5/Project.toml index 38c97f7751c..5b4113e626a 100644 --- a/lib/OrdinaryDiffEqTsit5/Project.toml +++ b/lib/OrdinaryDiffEqTsit5/Project.toml @@ -11,7 +11,6 @@ LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e" TruncatedStacktraces = "781d530d-4396-4725-bb49-402e4bee1e77" SciMLBase = "0bca4576-84f4-4d90-8ffe-ffa030f20462" OrdinaryDiffEqCore = "bbf590c4-e513-4bbe-9b18-05decba2e5d8" -Static = "aedffcd0-7271-4cad-89d0-dc628f76c6d3" Preferences = "21216c6a-2e73-6563-6e65-726566657250" RecursiveArrayTools = "731186ca-8d62-57ce-b412-fbd966d074cd" DiffEqBase = "2b5f629d-d688-5b77-993f-72d75c75574e" @@ -33,7 +32,7 @@ DiffEqBase = {path = "../DiffEqBase"} [compat] Pkg = "1" Test = "<0.0.1, 1" -FastBroadcast = "0.3" +FastBroadcast = "1.2" Random = "<0.0.1, 1" DiffEqDevTools = "2.44.4" MuladdMacro = "0.2" @@ -42,12 +41,11 @@ LinearAlgebra = "1.10" TruncatedStacktraces = "1.4" SciMLBase = "2.116" OrdinaryDiffEqCore = "3" -Static = "1.2" Aqua = "0.8.11" Preferences = "1.4" julia = "1.10" JET = "0.9, 0.11" -RecursiveArrayTools = "3.36" +RecursiveArrayTools = "3.51" AllocCheck = "0.2" DiffEqBase = "6.194" Reexport = "1.2" diff --git a/lib/OrdinaryDiffEqTsit5/src/OrdinaryDiffEqTsit5.jl b/lib/OrdinaryDiffEqTsit5/src/OrdinaryDiffEqTsit5.jl index 870ebf2dd0a..0e013dc8e44 100644 --- a/lib/OrdinaryDiffEqTsit5/src/OrdinaryDiffEqTsit5.jl +++ b/lib/OrdinaryDiffEqTsit5/src/OrdinaryDiffEqTsit5.jl @@ -11,7 +11,7 @@ import OrdinaryDiffEqCore: alg_order, alg_stability_size, explicit_rk_docstring, CompositeAlgorithm, _ode_addsteps!, copyat_or_push!, AutoAlgSwitch, get_fsalfirstlast, full_cache, DerivativeOrderNotPossibleError -import Static: False +using FastBroadcast: Serial import MuladdMacro: @muladd import FastBroadcast: @.. import RecursiveArrayTools: recursivefill!, recursive_unitless_bottom_eltype diff --git a/lib/OrdinaryDiffEqTsit5/src/algorithms.jl b/lib/OrdinaryDiffEqTsit5/src/algorithms.jl index 880ffd76114..80fe177eb7e 100644 --- a/lib/OrdinaryDiffEqTsit5/src/algorithms.jl +++ b/lib/OrdinaryDiffEqTsit5/src/algorithms.jl @@ -17,12 +17,12 @@ Base.@kwdef struct Tsit5{StageLimiter, StepLimiter, Thread} <: OrdinaryDiffEqAdaptiveAlgorithm stage_limiter!::StageLimiter = trivial_limiter! step_limiter!::StepLimiter = trivial_limiter! - thread::Thread = False() + thread::Thread = Serial() end @truncate_stacktrace Tsit5 3 # for backwards compatibility function Tsit5(stage_limiter!, step_limiter! = trivial_limiter!) - return Tsit5(stage_limiter!, step_limiter!, False()) + return Tsit5(stage_limiter!, step_limiter!, Serial()) end """ diff --git a/lib/OrdinaryDiffEqVerner/Project.toml b/lib/OrdinaryDiffEqVerner/Project.toml index 34a392ded2b..079d7182ad1 100644 --- a/lib/OrdinaryDiffEqVerner/Project.toml +++ b/lib/OrdinaryDiffEqVerner/Project.toml @@ -12,7 +12,6 @@ LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e" TruncatedStacktraces = "781d530d-4396-4725-bb49-402e4bee1e77" SciMLBase = "0bca4576-84f4-4d90-8ffe-ffa030f20462" OrdinaryDiffEqCore = "bbf590c4-e513-4bbe-9b18-05decba2e5d8" -Static = "aedffcd0-7271-4cad-89d0-dc628f76c6d3" Preferences = "21216c6a-2e73-6563-6e65-726566657250" RecursiveArrayTools = "731186ca-8d62-57ce-b412-fbd966d074cd" DiffEqBase = "2b5f629d-d688-5b77-993f-72d75c75574e" @@ -36,7 +35,7 @@ DiffEqBase = {path = "../DiffEqBase"} [compat] Pkg = "1" Test = "<0.0.1, 1" -FastBroadcast = "0.3" +FastBroadcast = "1.2" Random = "<0.0.1, 1" DiffEqDevTools = "2.44.4" OrdinaryDiffEqExplicitRK = "1.4" @@ -47,12 +46,11 @@ LinearAlgebra = "1.10" TruncatedStacktraces = "1.4" SciMLBase = "2.116" OrdinaryDiffEqCore = "3" -Static = "1.2" Aqua = "0.8.11" Preferences = "1.4" julia = "1.10" JET = "0.9, 0.11" -RecursiveArrayTools = "3.36" +RecursiveArrayTools = "3.51" ODEProblemLibrary = "1" AllocCheck = "0.2" DiffEqBase = "6.194" diff --git a/lib/OrdinaryDiffEqVerner/src/OrdinaryDiffEqVerner.jl b/lib/OrdinaryDiffEqVerner/src/OrdinaryDiffEqVerner.jl index a81443a58a6..e9b3a6cc8d1 100644 --- a/lib/OrdinaryDiffEqVerner/src/OrdinaryDiffEqVerner.jl +++ b/lib/OrdinaryDiffEqVerner/src/OrdinaryDiffEqVerner.jl @@ -16,7 +16,7 @@ import OrdinaryDiffEqCore: alg_order, calculate_residuals!, get_fsalfirstlast, copyat_or_push! using FastBroadcast, Polyester, MuladdMacro, RecursiveArrayTools using DiffEqBase: @def, @tight_loop_macros -using Static: False +using FastBroadcast: Serial using TruncatedStacktraces: @truncate_stacktrace using LinearAlgebra: norm import OrdinaryDiffEqCore diff --git a/lib/OrdinaryDiffEqVerner/src/algorithms.jl b/lib/OrdinaryDiffEqVerner/src/algorithms.jl index 5e44c7813fe..8a2c80537c1 100644 --- a/lib/OrdinaryDiffEqVerner/src/algorithms.jl +++ b/lib/OrdinaryDiffEqVerner/src/algorithms.jl @@ -19,7 +19,7 @@ Base.@kwdef struct Vern6{StageLimiter, StepLimiter, Thread, L} <: OrdinaryDiffEqAdaptiveAlgorithm stage_limiter!::StageLimiter = trivial_limiter! step_limiter!::StepLimiter = trivial_limiter! - thread::Thread = False() + thread::Thread = Serial() lazy::L = Val{true}() end @truncate_stacktrace Vern6 3 @@ -29,7 +29,7 @@ function Vern6(sl::SL, stl::STL, th::TH, lazy::Bool) where {SL, STL, TH} end # for backwards compatibility function Vern6(stage_limiter!, step_limiter! = trivial_limiter!; lazy = true) - return Vern6(stage_limiter!, step_limiter!, False(), lazy) + return Vern6(stage_limiter!, step_limiter!, Serial(), lazy) end @doc explicit_rk_docstring( @@ -53,7 +53,7 @@ Base.@kwdef struct Vern7{StageLimiter, StepLimiter, Thread, L} <: OrdinaryDiffEqAdaptiveAlgorithm stage_limiter!::StageLimiter = trivial_limiter! step_limiter!::StepLimiter = trivial_limiter! - thread::Thread = False() + thread::Thread = Serial() lazy::L = Val{true}() end @truncate_stacktrace Vern7 3 @@ -63,7 +63,7 @@ function Vern7(sl::SL, stl::STL, th::TH, lazy::Bool) where {SL, STL, TH} end # for backwards compatibility function Vern7(stage_limiter!, step_limiter! = trivial_limiter!; lazy = true) - return Vern7(stage_limiter!, step_limiter!, False(), lazy) + return Vern7(stage_limiter!, step_limiter!, Serial(), lazy) end @doc explicit_rk_docstring( @@ -87,7 +87,7 @@ Base.@kwdef struct Vern8{StageLimiter, StepLimiter, Thread, L} <: OrdinaryDiffEqAdaptiveAlgorithm stage_limiter!::StageLimiter = trivial_limiter! step_limiter!::StepLimiter = trivial_limiter! - thread::Thread = False() + thread::Thread = Serial() lazy::L = Val{true}() end @truncate_stacktrace Vern8 3 @@ -97,7 +97,7 @@ function Vern8(sl::SL, stl::STL, th::TH, lazy::Bool) where {SL, STL, TH} end # for backwards compatibility function Vern8(stage_limiter!, step_limiter! = trivial_limiter!; lazy = true) - return Vern8(stage_limiter!, step_limiter!, False(), lazy) + return Vern8(stage_limiter!, step_limiter!, Serial(), lazy) end @doc explicit_rk_docstring( @@ -120,7 +120,7 @@ Base.@kwdef struct Vern9{StageLimiter, StepLimiter, Thread, L} <: OrdinaryDiffEqAdaptiveAlgorithm stage_limiter!::StageLimiter = trivial_limiter! step_limiter!::StepLimiter = trivial_limiter! - thread::Thread = False() + thread::Thread = Serial() lazy::L = Val{true}() end @truncate_stacktrace Vern9 3 @@ -130,7 +130,7 @@ function Vern9(sl::SL, stl::STL, th::TH, lazy::Bool) where {SL, STL, TH} end # for backwards compatibility function Vern9(stage_limiter!, step_limiter! = trivial_limiter!; lazy = true) - return Vern9(stage_limiter!, step_limiter!, False(), lazy) + return Vern9(stage_limiter!, step_limiter!, Serial(), lazy) end """ @@ -192,7 +192,7 @@ Base.@kwdef struct RKV76IIa{StageLimiter, StepLimiter, Thread, L} <: OrdinaryDiffEqAdaptiveAlgorithm stage_limiter!::StageLimiter = trivial_limiter! step_limiter!::StepLimiter = trivial_limiter! - thread::Thread = False() + thread::Thread = Serial() lazy::L = Val{true}() end @truncate_stacktrace RKV76IIa 3 @@ -202,5 +202,5 @@ function RKV76IIa(sl::SL, stl::STL, th::TH, lazy::Bool) where {SL, STL, TH} end # for backwards compatibility function RKV76IIa(stage_limiter!, step_limiter! = trivial_limiter!; lazy = true) - return RKV76IIa(stage_limiter!, step_limiter!, False(), lazy) + return RKV76IIa(stage_limiter!, step_limiter!, Serial(), lazy) end diff --git a/test/ad/Project.toml b/test/ad/Project.toml index 202aaba0b62..89177166024 100644 --- a/test/ad/Project.toml +++ b/test/ad/Project.toml @@ -30,6 +30,6 @@ Mooncake = "0.4" OrdinaryDiffEq = "6" OrdinaryDiffEqCore = "3" OrdinaryDiffEqTsit5 = "1" -SciMLSensitivity = "7" +SciMLSensitivity = "7.100" StaticArrays = "1" Zygote = "0.6.61, 0.7" diff --git a/test/gpu/Project.toml b/test/gpu/Project.toml index aecabf6d1aa..2fcaf65734c 100644 --- a/test/gpu/Project.toml +++ b/test/gpu/Project.toml @@ -26,7 +26,7 @@ Adapt = "4" CUDA = "4, 5" ComponentArrays = "0.15" DiffEqBase = "6.182" -FastBroadcast = "0.3" +FastBroadcast = "1.2" FFTW = "1.8" FillArrays = "1" OrdinaryDiffEq = "6" @@ -34,6 +34,6 @@ OrdinaryDiffEqBDF = "1" OrdinaryDiffEqNonlinearSolve = "1" OrdinaryDiffEqRKIP = "1" OrdinaryDiffEqRosenbrock = "1" -RecursiveArrayTools = "3" +RecursiveArrayTools = "3.51" SciMLBase = "2.99" SciMLOperators = "1.3"