Skip to content

Commit 6b58118

Browse files
Bump compat for OrdinaryDiffEq v7 / SciMLBase v3 ecosystem
Cascade major-version compat relaxations for the OrdinaryDiffEq v7 ecosystem release (SciML/OrdinaryDiffEq.jl#3562 + #3565): Project.toml / docs/Project.toml / test/extensions/Project.toml: - OrdinaryDiffEqBDF: "1" → "1, 2" - OrdinaryDiffEqCore: "3.22" → "3.22, 4" - OrdinaryDiffEqDefault: "1" → "1, 2" - OrdinaryDiffEqRosenbrock: "1" → "1, 2" - OrdinaryDiffEqSDIRK: "1" → "1, 2" (docs only) - OrdinaryDiffEqTsit5: "1" → "1, 2" - OrdinaryDiffEqVerner: "1" → "1, 2" - SciMLBase: "2.84" → "2.84, 3" - StochasticDiffEq: "6.101" → "6.101, 7" Source migrations for removed/changed APIs: - test/simulation_and_solving/hybrid_models.jl: remove `verbose = false` from `solve` calls (Bool no longer accepted; use ODEVerbosity in v7) - test/simulation_and_solving/simulate_SDEs.jl: iterate `cat_sol.u` / `hand_sol.u` instead of the EnsembleSolution directly (RAT v4: iterating EnsembleSolution now yields scalar elements, not trajectory solutions) Co-Authored-By: Chris Rackauckas <accounts@chrisrackauckas.com>
1 parent fa7119f commit 6b58118

5 files changed

Lines changed: 25 additions & 15 deletions

File tree

Project.toml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,14 +65,19 @@ MacroTools = "0.5.5"
6565
Makie = "0.22.1, 0.23, 0.24"
6666
ModelingToolkitBase = "1.17"
6767
NetworkLayout = "0.4.7"
68-
OrdinaryDiffEqCore = "3.22"
68+
OrdinaryDiffEqBDF = "1, 2"
69+
OrdinaryDiffEqCore = "3.22, 4"
70+
OrdinaryDiffEqDefault = "1, 2"
71+
OrdinaryDiffEqRosenbrock = "1, 2"
72+
OrdinaryDiffEqTsit5 = "1, 2"
73+
OrdinaryDiffEqVerner = "1, 2"
6974
Parameters = "0.12"
7075
Reexport = "1.0"
7176
RuntimeGeneratedFunctions = "0.5.12"
72-
SciMLBase = "2.84"
77+
SciMLBase = "2.84, 3"
7378
SciMLPublic = "1"
7479
Setfield = "1"
75-
StochasticDiffEq = "6.101"
80+
StochasticDiffEq = "6.101, 7"
7681
StructuralIdentifiability = "0.5.11"
7782
SymbolicIndexingInterface = "0.3"
7883
SymbolicUtils = "4.9.1"

docs/Project.toml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -82,24 +82,24 @@ OptimizationBase = "4, 5.0"
8282
OptimizationNLopt = "0.3"
8383
OptimizationOptimJL = "0.4"
8484
OptimizationOptimisers = "0.3"
85-
OrdinaryDiffEqBDF = "1"
86-
OrdinaryDiffEqDefault = "1"
87-
OrdinaryDiffEqRosenbrock = "1"
88-
OrdinaryDiffEqSDIRK = "1"
89-
OrdinaryDiffEqTsit5 = "1"
90-
OrdinaryDiffEqVerner = "1"
85+
OrdinaryDiffEqBDF = "1, 2"
86+
OrdinaryDiffEqDefault = "1, 2"
87+
OrdinaryDiffEqRosenbrock = "1, 2"
88+
OrdinaryDiffEqSDIRK = "1, 2"
89+
OrdinaryDiffEqTsit5 = "1, 2"
90+
OrdinaryDiffEqVerner = "1, 2"
9191
PEtab = "5"
9292
Plots = "1.40"
9393
QuasiMonteCarlo = "0.3"
9494
ReactionNetworkImporters = "1.1.0"
9595
SBMLImporter = "4.0.0"
96-
SciMLBase = "2.46"
96+
SciMLBase = "2.46, 3"
9797
SciMLSensitivity = "7.60"
9898
SpecialFunctions = "2.4"
9999
StaticArrays = "1.9"
100100
StatsPlots = "0.15.8"
101101
SteadyStateDiffEq = "2.2"
102-
StochasticDiffEq = "6.65"
102+
StochasticDiffEq = "6.65, 7"
103103
StructuralIdentifiability = "0.5.11"
104104
SymbolicIndexingInterface = "0.3"
105105
Symbolics = "7.13"

test/extensions/Project.toml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,8 @@ StableRNGs = "860ef19b-820b-49d6-a774-d7a799459cd3"
1717
SteadyStateDiffEq = "9672c7b4-1e72-59bd-8a11-6ac3964bc41f"
1818
StructuralIdentifiability = "220ca800-aa68-49bb-acd8-6037fa93a544"
1919
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
20+
21+
[compat]
22+
OrdinaryDiffEqDefault = "1, 2"
23+
OrdinaryDiffEqTsit5 = "1, 2"
24+
OrdinaryDiffEqVerner = "1, 2"

test/simulation_and_solving/hybrid_models.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ let
188188

189189
# Solves and checks values of solution (do this before integrator mutation test
190190
# since integrator mutation affects shared parameter state).
191-
sol = solve(prob, Tsit5(); maxiters = 10, verbose = false)
191+
sol = solve(prob, Tsit5(); maxiters = 10)
192192
@test sol[:X][1] == 1.0
193193
@test sol[:X2][1] == 0.0
194194
@test sol[:Y][1] == 0.0
@@ -215,7 +215,7 @@ let
215215
@test prob2.ps[:d] == 0.5 # not changed
216216

217217
# Test that we can solve the remade problem and verify solution values.
218-
sol2 = solve(prob2, Tsit5(); maxiters = 10, verbose = false)
218+
sol2 = solve(prob2, Tsit5(); maxiters = 10)
219219
@test sol2[:X][1] == 3.0
220220
@test sol2[:X2][1] == 2.0
221221
@test sol2[:Y][1] == 1.0

test/simulation_and_solving/simulate_SDEs.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -618,8 +618,8 @@ let
618618
cat_sol = solve(cat_ensemble, EM(); dt = 0.001, trajectories = N, saveat = 20.0)
619619
hand_sol = solve(hand_ensemble, EM(); dt = 0.001, trajectories = N, saveat = 20.0)
620620

621-
cat_endpoints = [sol[1, end] for sol in cat_sol]
622-
hand_endpoints = [sol[1, end] for sol in hand_sol]
621+
cat_endpoints = [sol[1, end] for sol in cat_sol.u]
622+
hand_endpoints = [sol[1, end] for sol in hand_sol.u]
623623

624624
cat_mean = mean(cat_endpoints)
625625
hand_mean = mean(hand_endpoints)

0 commit comments

Comments
 (0)