Skip to content

Commit e94763c

Browse files
ChrisRackauckasChrisRackauckas
authored
Merge pull request #4476 from ChrisRackauckas-Claude/bump-ordinarydiffeq-v7-ecosystem
Bump compat for OrdinaryDiffEq v7 / SciMLBase v3 ecosystem
2 parents 2054fc6 + 2b59e64 commit e94763c

5 files changed

Lines changed: 26 additions & 26 deletions

File tree

‎Project.toml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ CommonSolve = "0.2.4"
7373
ConstructionBase = "1"
7474
DataInterpolations = "7, 8"
7575
DataStructures = "0.18, 0.19"
76-
DelayDiffEq = "5.61"
76+
DelayDiffEq = "5.61, 6"
7777
DiffEqBase = "6.210.0, 7"
7878
DifferentiationInterface = "0.6.47, 0.7"
7979
DocStringExtensions = "0.8, 0.9"
@@ -93,12 +93,12 @@ Moshi = "0.3.6"
9393
NonlinearSolve = "4.3"
9494
OffsetArrays = "1"
9595
OrderedCollections = "1"
96-
OrdinaryDiffEq = "6.82.0"
97-
OrdinaryDiffEqBDF = "1"
96+
OrdinaryDiffEq = "6.82.0, 7"
97+
OrdinaryDiffEqBDF = "1, 2"
9898
OrdinaryDiffEqCore = "1.34.0, 2, 3, 4"
99-
OrdinaryDiffEqDefault = "1.2"
100-
OrdinaryDiffEqNonlinearSolve = "1.5.0"
101-
OrdinaryDiffEqRosenbrock = "1"
99+
OrdinaryDiffEqDefault = "1.2, 2"
100+
OrdinaryDiffEqNonlinearSolve = "1.5.0, 2"
101+
OrdinaryDiffEqRosenbrock = "1, 2"
102102
PreallocationTools = "0.4.27, 1"
103103
PrecompileTools = "1.2.1"
104104
REPL = "1"
@@ -114,7 +114,7 @@ SparseArrays = "1"
114114
StateSelection = "1.9.1"
115115
StaticArrays = "1.9.14"
116116
StochasticDelayDiffEq = "1.11"
117-
StochasticDiffEq = "6.82.0"
117+
StochasticDiffEq = "6.82.0, 7"
118118
SymbolicIndexingInterface = "0.3.39"
119119
SymbolicUtils = "4.13"
120120
Symbolics = "7"

‎docs/Project.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,13 @@ NonlinearSolve = "4"
5858
Optim = "1.9, 2"
5959
Optimization = "5"
6060
OptimizationOptimJL = "0.4"
61-
OrdinaryDiffEq = "6.31"
61+
OrdinaryDiffEq = "6.31, 7"
6262
Plots = "1.36"
6363
PreallocationTools = "0.4, 1"
6464
SciCompDSL = "1"
6565
SciMLStructures = "1.1"
6666
Setfield = "1"
67-
StochasticDiffEq = "6"
67+
StochasticDiffEq = "6, 7"
6868
SymbolicIndexingInterface = "0.3.1"
6969
SymbolicUtils = "4"
7070
Symbolics = "7"

‎lib/ModelingToolkitBase/Project.toml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ Compat = "3.42, 4"
105105
ConstructionBase = "1"
106106
DataInterpolations = "8.7"
107107
DataStructures = "0.18, 0.19"
108-
DelayDiffEq = "5.61"
108+
DelayDiffEq = "5.61, 6"
109109
DiffEqBase = "6.210.0, 7"
110110
DiffEqCallbacks = "2.16, 3, 4"
111111
DiffEqNoiseProcess = "5"
@@ -122,7 +122,7 @@ ForwardDiff = "0.10.3, 1"
122122
FunctionWrappers = "1.1"
123123
FunctionWrappersWrappers = "0.1, 1"
124124
Graphs = "1.5.2"
125-
ImplicitDiscreteSolve = "0.1.2, 1"
125+
ImplicitDiscreteSolve = "0.1.2, 1, 2"
126126
InfiniteOpt = "0.6"
127127
InteractiveUtils = "1"
128128
JuliaFormatter = "1.0.47, 2"
@@ -140,9 +140,9 @@ NaNMath = "0.3, 1"
140140
NonlinearSolve = "4.3"
141141
OffsetArrays = "1"
142142
OrderedCollections = "1"
143-
OrdinaryDiffEq = "6.82.0"
144-
OrdinaryDiffEqDefault = "1.2"
145-
OrdinaryDiffEqNonlinearSolve = "1.5.0"
143+
OrdinaryDiffEq = "6.82.0, 7"
144+
OrdinaryDiffEqDefault = "1.2, 2"
145+
OrdinaryDiffEqNonlinearSolve = "1.5.0, 2"
146146
PreallocationTools = "0.4.27, 1"
147147
PrecompileTools = "1.2.1"
148148
Pyomo = "0.1.0"
@@ -163,7 +163,7 @@ SparseArrays = "1"
163163
SpecialFunctions = "1, 2"
164164
StaticArrays = "1.9.14"
165165
StochasticDelayDiffEq = "1.11"
166-
StochasticDiffEq = "6.82.0"
166+
StochasticDiffEq = "6.82.0, 7"
167167
SymbolicIndexingInterface = "0.3.39"
168168
SymbolicUtils = "4.23.1"
169169
Symbolics = "7.18.1"

‎lib/ModelingToolkitBase/test/sdesystem.jl‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -598,8 +598,8 @@ end
598598

599599
prob = SDEProblem(de, [u0map; parammap], (0.0, 1.0))
600600

601-
function prob_func(prob, i, repeat)
602-
remake(prob, seed = seeds[i])
601+
function prob_func(prob, ctx)
602+
remake(prob, seed = seeds[ctx.i])
603603
end
604604
numtraj = Int(1.0e3)
605605
seed = 100
@@ -608,7 +608,7 @@ end
608608

609609
ensemble_prob = EnsembleProblem(
610610
prob;
611-
output_func = (sol, i) -> (g(sol.u[end]), false),
611+
output_func = (sol, ctx) -> (g(sol.u[end]), false),
612612
prob_func = prob_func
613613
)
614614

@@ -624,7 +624,7 @@ end
624624

625625
ensemble_probmod = EnsembleProblem(
626626
probmod;
627-
output_func = (sol, i) -> (
627+
output_func = (sol, ctx) -> (
628628
g(sol[x][end]) *
629629
sol[demod.weight][end],
630630
false,

‎test/fmi/fmi.jl‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ end
171171
@test !MTK.isinput(adder.c) && !MTK.isoutput(adder.c)
172172

173173
sys, prob = build_simple_adder(adder)
174-
sol = solve(prob, Rodas5P(autodiff = false), abstol = 1.0e-8, reltol = 1.0e-8)
174+
sol = solve(prob, Rodas5P(autodiff = AutoFiniteDiff()), abstol = 1.0e-8, reltol = 1.0e-8)
175175
@test SciMLBase.successful_retcode(sol)
176176

177177
@test truesol(
@@ -196,7 +196,7 @@ end
196196
@test !MTK.isinput(adder.c) && !MTK.isoutput(adder.c)
197197

198198
sys, prob = build_simple_adder(adder)
199-
sol = solve(prob, Rodas5P(autodiff = false), abstol = 1.0e-8, reltol = 1.0e-8)
199+
sol = solve(prob, Rodas5P(autodiff = AutoFiniteDiff()), abstol = 1.0e-8, reltol = 1.0e-8)
200200
@test SciMLBase.successful_retcode(sol)
201201

202202
@test truesol(
@@ -233,7 +233,7 @@ end
233233
@test !MTK.isinput(sspace.x) && !MTK.isoutput(sspace.x)
234234

235235
sys, prob = build_sspace_model(sspace)
236-
sol = solve(prob, Rodas5P(autodiff = false); abstol = 1.0e-8, reltol = 1.0e-8)
236+
sol = solve(prob, Rodas5P(autodiff = AutoFiniteDiff()); abstol = 1.0e-8, reltol = 1.0e-8)
237237
@test SciMLBase.successful_retcode(sol)
238238

239239
@test truesol(
@@ -257,7 +257,7 @@ end
257257
@test !MTK.isinput(sspace.x) && !MTK.isoutput(sspace.x)
258258

259259
sys, prob = build_sspace_model(sspace)
260-
sol = solve(prob, Rodas5P(autodiff = false); abstol = 1.0e-8, reltol = 1.0e-8)
260+
sol = solve(prob, Rodas5P(autodiff = AutoFiniteDiff()); abstol = 1.0e-8, reltol = 1.0e-8)
261261
@test SciMLBase.successful_retcode(sol)
262262

263263
@test truesol(
@@ -295,7 +295,7 @@ end
295295
@named adder1 = MTK.FMIComponent(Val(2); fmu, type = :ME)
296296
@named adder2 = MTK.FMIComponent(Val(2); fmu, type = :ME)
297297
sys, prob = build_looped_adders(adder1, adder2)
298-
sol = solve(prob, Rodas5P(autodiff = false); reltol = 1.0e-8)
298+
sol = solve(prob, Rodas5P(autodiff = AutoFiniteDiff()); reltol = 1.0e-8)
299299
@test SciMLBase.successful_retcode(sol)
300300
@test truesol(
301301
sol.t;
@@ -353,7 +353,7 @@ end
353353
@named sspace1 = MTK.FMIComponent(Val(3); fmu, type = :ME)
354354
@named sspace2 = MTK.FMIComponent(Val(3); fmu, type = :ME)
355355
sys, prob = build_looped_sspace(sspace1, sspace2)
356-
sol = solve(prob, Rodas5P(autodiff = false); reltol = 1.0e-8)
356+
sol = solve(prob, Rodas5P(autodiff = AutoFiniteDiff()); reltol = 1.0e-8)
357357
@test SciMLBase.successful_retcode(sol)
358358
@test truesol(
359359
sol.t;
@@ -372,7 +372,7 @@ end
372372
Val(3); fmu, type = :CS, communication_step_size = 1.0e-5
373373
)
374374
sys, prob = build_looped_sspace(sspace1, sspace2)
375-
sol = solve(prob, Rodas5P(autodiff = false); reltol = 1.0e-8)
375+
sol = solve(prob, Rodas5P(autodiff = AutoFiniteDiff()); reltol = 1.0e-8)
376376
@test SciMLBase.successful_retcode(sol)
377377
@test truesol(
378378
sol.t;

0 commit comments

Comments
 (0)