Skip to content

Replace DataStructures.jl with BinaryHeaps.jl to cut invalidations #3407

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ChrisRackauckas-Claude wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Replace DataStructures.jl with BinaryHeaps.jl to cut invalidations #3407

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ ADTypes = "47edcb42-4c32-4615-8424-f2b9edc5f35b"
Adapt = "79e6a3ab-5dfb-504d-930d-738a2a938a0e"
ArrayInterface = "4fba245c-0d91-5ea0-9b3e-6abc04ee57a9"
CommonSolve = "38540f10-b2f7-11e9-35d8-d573e4eb0ff2"
DataStructures = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8"
DiffEqBase = "2b5f629d-d688-5b77-993f-72d75c75574e"
DocStringExtensions = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae"
EnumX = "4e289a0a-7415-4d19-859d-a7e5c4648b56"
Expand Down Expand Up @@ -112,7 +111,6 @@ ADTypes = "1.16"
Adapt = "4.3"
ArrayInterface = "7.19"
CommonSolve = "0.2.4"
DataStructures = "0.18.22, 0.19"
DiffEqBase = "6.209"
DiffEqDevTools = "2.44.4"
DocStringExtensions = "0.9.5"
Expand Down
4 changes: 2 additions & 2 deletions lib/DelayDiffEq/Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ version = "5.73.0"

[deps]
ArrayInterface = "4fba245c-0d91-5ea0-9b3e-6abc04ee57a9"
DataStructures = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8"
BinaryHeaps = "b2a6c25c-c996-4615-94ab-6e519ffb8690"
DiffEqBase = "2b5f629d-d688-5b77-993f-72d75c75574e"
FastBroadcast = "7034ab61-46d4-4ed7-9d0f-46aef9175898"
ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210"
Expand Down Expand Up @@ -60,7 +60,7 @@ ADTypes = "1.16"
Aqua = "0.8.11"
ArrayInterface = "7"
DDEProblemLibrary = "0.1"
DataStructures = "0.18, 0.19"
BinaryHeaps = "1"
DiffEqBase = "6.209"
DiffEqCallbacks = "4"
DiffEqDevTools = "2.44.4"
Expand Down
2 changes: 1 addition & 1 deletion lib/DelayDiffEq/src/DelayDiffEq.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import OrdinaryDiffEqCore, OrdinaryDiffEqNonlinearSolve, OrdinaryDiffEqDifferent
import OrdinaryDiffEqDefault: OrdinaryDiffEqDefault
import OrdinaryDiffEqFunctionMap: OrdinaryDiffEqFunctionMap

using DataStructures: BinaryMinHeap
using BinaryHeaps: BinaryMinHeap
using LinearAlgebra: opnorm, I
using Logging: @logmsg
using RecursiveArrayTools: copyat_or_push!, recursivecopy, recursivecopy!,
Expand Down
4 changes: 2 additions & 2 deletions lib/OrdinaryDiffEqCore/Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
TruncatedStacktraces = "781d530d-4396-4725-bb49-402e4bee1e77"
SciMLBase = "0bca4576-84f4-4d90-8ffe-ffa030f20462"
FastClosures = "9aa1b823-49e4-5ca5-8b0f-3971ec8bab6a"
DataStructures = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8"
BinaryHeaps = "b2a6c25c-c996-4615-94ab-6e519ffb8690"
Static = "aedffcd0-7271-4cad-89d0-dc628f76c6d3"
DocStringExtensions = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae"
ArrayInterface = "4fba245c-0d91-5ea0-9b3e-6abc04ee57a9"
Expand Down Expand Up @@ -73,7 +73,7 @@ TruncatedStacktraces = "1.4"
SciMLBase = "2.146"
SciMLLogging = "1.7.1"
FastClosures = "0.3"
DataStructures = "0.19"
BinaryHeaps = "1"
SparseArrays = "1"
Static = "1.2"
Aqua = "0.8.11"
Expand Down
3 changes: 1 addition & 2 deletions lib/OrdinaryDiffEqCore/src/OrdinaryDiffEqCore.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,7 @@ import Random
import RecursiveArrayTools: chain, recursivecopy!, recursivecopy, recursive_bottom_eltype, recursive_unitless_bottom_eltype, recursive_unitless_eltype, copyat_or_push!, DiffEqArray, recursivefill!

import RecursiveArrayTools
using DataStructures: BinaryHeap, FasterForward
import DataStructures
using BinaryHeaps: BinaryHeap, FasterForward
using ArrayInterface: ArrayInterface, issingular

import TruncatedStacktraces: @truncate_stacktrace, VERBOSE_MSG
Expand Down
6 changes: 3 additions & 3 deletions lib/OrdinaryDiffEqCore/src/solve.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -926,7 +926,7 @@ end

# time stops
@inline function initialize_tstops(::Type{T}, tstops, d_discontinuities, tspan) where {T}
tstops_internal = BinaryHeap{T}(DataStructures.FasterForward())
tstops_internal = BinaryHeap{T}(FasterForward())

t0, tf = tspan
tdir = sign(tf - t0)
Expand Down Expand Up @@ -978,7 +978,7 @@ end

# saving time points
function initialize_saveat(::Type{T}, saveat, tspan) where {T}
saveat_internal = BinaryHeap{T}(DataStructures.FasterForward())
saveat_internal = BinaryHeap{T}(FasterForward())

t0, tf = tspan
tdir = sign(tf - t0)
Expand Down Expand Up @@ -1023,7 +1023,7 @@ end

# discontinuities
function initialize_d_discontinuities(::Type{T}, d_discontinuities, tspan) where {T}
d_discontinuities_internal = BinaryHeap{T}(DataStructures.FasterForward())
d_discontinuities_internal = BinaryHeap{T}(FasterForward())
sizehint!(d_discontinuities_internal, length(d_discontinuities))

t0, tf = tspan
Expand Down
2 changes: 0 additions & 2 deletions lib/StochasticDiffEqCore/Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ version = "1.1.0"
ADTypes = "47edcb42-4c32-4615-8424-f2b9edc5f35b"
Adapt = "79e6a3ab-5dfb-504d-930d-738a2a938a0e"
ArrayInterface = "4fba245c-0d91-5ea0-9b3e-6abc04ee57a9"
DataStructures = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8"
DiffEqBase = "2b5f629d-d688-5b77-993f-72d75c75574e"
DiffEqNoiseProcess = "77a26b50-5914-5dd7-bc55-306e6241c503"
FastPower = "a4df4552-cc26-4903-aec0-212e50a0e84b"
Expand Down Expand Up @@ -41,7 +40,6 @@ DiffEqBase = {path = "../DiffEqBase"}
ADTypes = "1"
Adapt = "3, 4"
ArrayInterface = "6, 7"
DataStructures = "0.18, 0.19"
DiffEqBase = "6.187"
DiffEqNoiseProcess = "5.13"
FastPower = "1"
Expand Down
2 changes: 1 addition & 1 deletion lib/StochasticDiffEqCore/src/StochasticDiffEqCore.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ import OrdinaryDiffEqCore: handle_callbacks!, handle_tstop!,
initialize_callbacks!,
current_extrapolant, current_extrapolant!

using RecursiveArrayTools, DataStructures
using RecursiveArrayTools
using DiffEqNoiseProcess, Random, ArrayInterface
using SimpleNonlinearSolve, ForwardDiff, StaticArrays, MuladdMacro, FiniteDiff, Base.Threads
using Adapt
Expand Down
Loading