Skip to content

Commit 82938f0

Browse files
Merge pull request #481 from ChrisRackauckas-Claude/bump-ordinarydiffeq-v7-ecosystem
Bump compat for OrdinaryDiffEq v7 / SciMLBase v3 ecosystem
2 parents 83adc2f + 84d8b30 commit 82938f0

10 files changed

Lines changed: 23 additions & 23 deletions

File tree

Project.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,18 +42,18 @@ BoundaryValueDiffEqMIRK = "1"
4242
BoundaryValueDiffEqMIRKN = "1"
4343
BoundaryValueDiffEqShooting = "1"
4444
DiffEqBase = "6.183, 7"
45-
DiffEqDevTools = "2.48"
45+
DiffEqDevTools = "2.48, 3"
4646
FastClosures = "0.3.2"
4747
ForwardDiff = "0.10.38, 1"
4848
Hwloc = "3.3"
4949
InteractiveUtils = "<0.0.1, 1"
5050
LinearAlgebra = "1.10"
5151
LinearSolve = "3.12"
5252
NonlinearSolveBase = "2"
53-
NonlinearSolveFirstOrder = "1.3"
53+
NonlinearSolveFirstOrder = "1.3, 2"
5454
ODEInterface = "0.5"
55-
OrdinaryDiffEqLowOrderRK = "1.2"
56-
OrdinaryDiffEqTsit5 = "1.1"
55+
OrdinaryDiffEqLowOrderRK = "1.2, 2"
56+
OrdinaryDiffEqTsit5 = "1.1, 2"
5757
OptimizationBase = "5"
5858
Pkg = "1.10.0"
5959
Random = "1.10"

docs/Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ LineSearch = "0.1.4"
4646
LinearAlgebra = "1.10"
4747
LinearSolve = "2.36.2, 3"
4848
OptimizationIpopt = "0.2.0, 1.0"
49-
OrdinaryDiffEq = "6.90.1"
49+
OrdinaryDiffEq = "7"
5050
Plots = "1"
5151
SciMLBase = "2.60.0, 3.3"
5252
SimpleBoundaryValueDiffEq = "1.1.0"

lib/BoundaryValueDiffEqAscher/Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ AlmostBlockDiagonals = "0.1.10"
2424
Aqua = "0.8"
2525
BoundaryValueDiffEqCore = "2.0"
2626
ConcreteStructs = "0.2.3"
27-
DiffEqDevTools = "2.44"
27+
DiffEqDevTools = "2.44, 3"
2828
DifferentiationInterface = "0.7"
2929
FastClosures = "0.3.2"
3030
ForwardDiff = "0.10.38, 1"

lib/BoundaryValueDiffEqCore/src/utils.jl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -149,8 +149,8 @@ end
149149
resid::Tuple, ::TwoPointBVProblem, (bca!, bcb!)::BC,
150150
sol::SciMLBase.ODESolution, p, t
151151
) where {BC}
152-
ua = first(sol)
153-
ub = last(sol)
152+
ua = sol.u[1]
153+
ub = sol.u[end]
154154
bca!(resid[1], ua, p)
155155
bcb!(resid[2], ub, p)
156156
return resid
@@ -659,7 +659,7 @@ function __build_solution(prob::AbstractBVProblem, odesol, nlsol::SciMLBase.Nonl
659659
end
660660
function __build_solution(prob::AbstractBVProblem, odesol, optsol::SciMLBase.OptimizationSolution)
661661
retcode = ifelse(SciMLBase.successful_retcode(optsol), odesol.retcode, optsol.retcode)
662-
return SciMLBase.solution_new_original_retcode(odesol, optsol, retcode, zeros(length(first(odesol)))) # Need a patch in SciMLBase
662+
return SciMLBase.solution_new_original_retcode(odesol, optsol, retcode, zeros(length(first(odesol.u)))) # Need a patch in SciMLBase
663663
end
664664

665665
# Fix3

lib/BoundaryValueDiffEqFIRK/Project.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ ArrayInterface = "7.18"
3434
BandedMatrices = "1.7.5"
3535
BoundaryValueDiffEqCore = "2.2"
3636
ConcreteStructs = "0.2.3"
37-
DiffEqDevTools = "2.44"
37+
DiffEqDevTools = "2.44, 3"
3838
DifferentiationInterface = "0.7"
3939
Enzyme = "0.13.33"
4040
FastAlmostBandedMatrices = "0.1.4"
@@ -44,8 +44,8 @@ Hwloc = "3"
4444
InteractiveUtils = "<0.0.1, 1"
4545
LinearAlgebra = "1.10"
4646
LinearSolve = "2.36.2, 3"
47-
Mooncake = "0.4.146"
48-
OrdinaryDiffEqRosenbrock = "1.15.1"
47+
Mooncake = "0.4.146, 0.5"
48+
OrdinaryDiffEqRosenbrock = "1.15.1, 2"
4949
PreallocationTools = "0.4, 1"
5050
PrecompileTools = "1.2"
5151
Preferences = "1.4"

lib/BoundaryValueDiffEqMIRK/Project.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ ArrayInterface = "7.18"
3333
BandedMatrices = "1.7.5"
3434
BoundaryValueDiffEqCore = "2.2"
3535
ConcreteStructs = "0.2.3"
36-
DiffEqDevTools = "2.44"
36+
DiffEqDevTools = "2.44, 3"
3737
DifferentiationInterface = "0.7"
3838
Enzyme = "0.13.33"
3939
FastAlmostBandedMatrices = "0.1.4"
@@ -43,9 +43,9 @@ Hwloc = "3"
4343
InteractiveUtils = "<0.0.1, 1"
4444
LinearAlgebra = "1.10"
4545
LinearSolve = "2.36.2, 3"
46-
Mooncake = "0.4"
46+
Mooncake = "0.4, 0.5"
4747
OptimizationIpopt = "1"
48-
OrdinaryDiffEqRosenbrock = "1"
48+
OrdinaryDiffEqRosenbrock = "1, 2"
4949
PreallocationTools = "0.4, 1"
5050
PrecompileTools = "1.2"
5151
Preferences = "1.4"

lib/BoundaryValueDiffEqMIRKN/Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ ArrayInterface = "7.18"
3333
BandedMatrices = "1.7.5"
3434
BoundaryValueDiffEqCore = "2.0"
3535
ConcreteStructs = "0.2.3"
36-
DiffEqDevTools = "2.44"
36+
DiffEqDevTools = "2.44, 3"
3737
DifferentiationInterface = "0.7"
3838
FastAlmostBandedMatrices = "0.1.4"
3939
FastClosures = "0.3.2"

lib/BoundaryValueDiffEqShooting/Project.toml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,17 +32,17 @@ ArrayInterface = "7.18"
3232
BandedMatrices = "1.11.0"
3333
BoundaryValueDiffEqCore = "2.0"
3434
ConcreteStructs = "0.2.3"
35-
DiffEqDevTools = "2.44"
35+
DiffEqDevTools = "2.44, 3"
3636
DifferentiationInterface = "0.7"
3737
FastClosures = "0.3.2"
3838
ForwardDiff = "0.10.38, 1"
3939
Hwloc = "3"
4040
InteractiveUtils = "<0.0.1, 1"
4141
LinearAlgebra = "1.10"
42-
OrdinaryDiffEqLowOrderRK = "1"
43-
OrdinaryDiffEqRosenbrock = "1"
44-
OrdinaryDiffEqTsit5 = "1"
45-
OrdinaryDiffEqVerner = "1"
42+
OrdinaryDiffEqLowOrderRK = "1, 2"
43+
OrdinaryDiffEqRosenbrock = "1, 2"
44+
OrdinaryDiffEqTsit5 = "1, 2"
45+
OrdinaryDiffEqVerner = "1, 2"
4646
PrecompileTools = "1.2"
4747
Preferences = "1.5"
4848
Pkg = "1.10.0"

lib/BoundaryValueDiffEqShooting/src/multiple_shooting.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ function SciMLBase.__solve(
4343
M = length(bcresid_prototype)
4444
end
4545

46-
internal_ode_kwargs = (; verbose, kwargs..., odesolve_kwargs..., save_end = true)
46+
internal_ode_kwargs = (; kwargs..., odesolve_kwargs..., save_end = true)
4747

4848
solve_internal_odes! = @closure (
4949
resid_nodes,

lib/BoundaryValueDiffEqShooting/src/single_shooting.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ function SciMLBase.__solve(
3030
resid_prototype = __vec(bcresid_prototype)
3131

3232
# Construct the residual function
33-
actual_ode_kwargs = (; kwargs..., verbose, odesolve_kwargs...)
33+
actual_ode_kwargs = (; kwargs..., odesolve_kwargs...)
3434
# For TwoPointBVPs we don't need to save every step
3535
if prob.problem_type isa TwoPointBVProblem
3636
ode_kwargs = (; save_everystep = false, actual_ode_kwargs...)

0 commit comments

Comments
 (0)