Merge pull request #472 from ChrisRackauckas-Claude/scimlbase-v3-compat

ChrisRackauckas · web-flow · commit 04c666b4700e · 2026-04-23T01:22:12.000Z
Update for SciMLBase v3 compatibility
diff --git a/Project.toml b/Project.toml
@@ -60,7 +60,7 @@ Random = "1.10"
 ReTestItems = "1.29"
 RecursiveArrayTools = "3.31.2"
 Reexport = "1.2"
-SciMLBase = "2.152.1"
+SciMLBase = "2.152.1, 3"
 Sparspak = "0.3.11"
 StaticArrays = "1.9.8"
 Test = "1.10"
diff --git a/lib/BoundaryValueDiffEqAscher/Project.toml b/lib/BoundaryValueDiffEqAscher/Project.toml
@@ -36,7 +36,7 @@ Random = "1.10"
 ReTestItems = "1.23.1"
 RecursiveArrayTools = "3.27.0"
 Reexport = "1.2"
-SciMLBase = "2.152.1"
+SciMLBase = "2.152.1, 3"
 Setfield = "1.1.1"
 StaticArrays = "1.9.8"
 Test = "1.10"
diff --git a/lib/BoundaryValueDiffEqCore/Project.toml b/lib/BoundaryValueDiffEqCore/Project.toml
@@ -45,7 +45,7 @@ OptimizationBase = "5.1"
 PreallocationTools = "1.2"
 RecursiveArrayTools = "3.27.0"
 Reexport = "1.2"
-SciMLBase = "2.152.1"
+SciMLBase = "2.152.1, 3"
 SciMLLogging = "1.8.0"
 SciMLStructures = "1.7.0"
 Setfield = "1"
diff --git a/lib/BoundaryValueDiffEqCore/src/utils.jl b/lib/BoundaryValueDiffEqCore/src/utils.jl
@@ -196,7 +196,7 @@ function eval_bc_residual!(
         resid::AbstractArray{<:AbstractArray},
         ::StandardSecondOrderBVProblem, bc!::BC, sol, dsol, p, t
     ) where {BC}
-    M = length(sol[1])
+    M = length(sol.u[1])
     res_bc = vcat(resid[1], resid[2])
     bc!(res_bc, dsol, sol, p, t)
     copyto!(resid[1], res_bc[1:M])
@@ -472,8 +472,8 @@ end
 
 # Restructure Solution
 function __restructure_sol(sol::AbstractVectorOfArray, u_size)
-    (size(first(sol)) == u_size) && return sol
-    return VectorOfArray(map(Base.Fix2(reshape, u_size), sol))
+    (size(first(sol.u)) == u_size) && return sol
+    return VectorOfArray(map(Base.Fix2(reshape, u_size), sol.u))
 end
 function __restructure_sol(sol::AbstractArray{<:AbstractArray}, u_size)
     (size(first(sol)) == u_size) && return sol
@@ -586,7 +586,7 @@ Returns the length of the initial guess. If the initial guess is a function or n
 guess is supplied, it returns `-1`.
 """
 @inline __initial_guess_length(u₀::AbstractVector{<:AbstractArray}) = length(u₀)
-@inline __initial_guess_length(u₀::VectorOfArray) = length(u₀)
+@inline __initial_guess_length(u₀::VectorOfArray) = length(u₀.u)
 @inline __initial_guess_length(u₀::DiffEqArray) = length(u₀.t)
 @inline __initial_guess_length(u₀::SciMLBase.ODESolution) = length(u₀.t)
 @inline __initial_guess_length(u₀::F) where {F} = -1
diff --git a/lib/BoundaryValueDiffEqFIRK/Project.toml b/lib/BoundaryValueDiffEqFIRK/Project.toml
@@ -53,7 +53,7 @@ Random = "1.10"
 ReTestItems = "1.23.1"
 RecursiveArrayTools = "3.27.0"
 Reexport = "1.2"
-SciMLBase = "2.152.1"
+SciMLBase = "2.152.1, 3"
 SciMLStructures = "1.7.0"
 Setfield = "1.1.1"
 SparseArrays = "1.10"
diff --git a/lib/BoundaryValueDiffEqFIRK/src/adaptivity.jl b/lib/BoundaryValueDiffEqFIRK/src/adaptivity.jl
@@ -10,7 +10,7 @@ After we construct an interpolant, we use interp_eval to evaluate it.
     ) where {iip, T}
     j = interval(mesh, t)
     h = mesh_dt[j]
-    lf = (length(cache.y₀) - 1) / (length(cache.y) - 1) # Cache length factor. We use a h corresponding to cache.y. Note that this assumes equidistributed mesh
+    lf = (length(cache.y₀.u) - 1) / (length(cache.y) - 1) # Cache length factor. We use a h corresponding to cache.y. Note that this assumes equidistributed mesh
     if lf > 1
         h *= lf
     end
@@ -55,7 +55,7 @@ end
     ) where {iip, T}
     j = interval(mesh, t)
     h = mesh_dt[j]
-    lf = (length(cache.y₀) - 1) / (length(cache.y) - 1) # Cache length factor. We use a h corresponding to cache.y. Note that this assumes equidistributed mesh
+    lf = (length(cache.y₀.u) - 1) / (length(cache.y) - 1) # Cache length factor. We use a h corresponding to cache.y. Note that this assumes equidistributed mesh
     if lf > 1
         h *= lf
     end
@@ -103,7 +103,7 @@ end
 
     j = interval(mesh, t)
     h = mesh_dt[j]
-    lf = (length(cache.y₀) - 1) / (length(cache.y) - 1) # Cache length factor. We use a h corresponding to cache.y. Note that this assumes equidistributed mesh
+    lf = (length(cache.y₀.u) - 1) / (length(cache.y) - 1) # Cache length factor. We use a h corresponding to cache.y. Note that this assumes equidistributed mesh
     if lf > 1
         h *= lf
     end
@@ -150,7 +150,7 @@ end
 
     j = interval(mesh, t)
     h = mesh_dt[j]
-    lf = (length(cache.y₀) - 1) / (length(cache.y) - 1) # Cache length factor. We use a h corresponding to cache.y. Note that this assumes equidistributed mesh
+    lf = (length(cache.y₀.u) - 1) / (length(cache.y) - 1) # Cache length factor. We use a h corresponding to cache.y. Note that this assumes equidistributed mesh
     if lf > 1
         h *= lf
     end
diff --git a/lib/BoundaryValueDiffEqFIRK/src/firk.jl b/lib/BoundaryValueDiffEqFIRK/src/firk.jl
@@ -485,18 +485,18 @@ function SciMLBase.solve!(
     if tune_parameters && SciMLStructures.isscimlstructure(prob.p)
         tunable_part, repack, _ = SciMLStructures.canonicalize(SciMLStructures.Tunable(), prob.p)
         length_u = cache.M - length(tunable_part)
-        new_p = repack(first(cache.y₀)[(length_u + 1):end])
+        new_p = repack(cache.y₀.u[1][(length_u + 1):end])
         prob = remake(prob; p = new_p)
-        map(x -> resize!(x, length_u), cache.y₀)
+        foreach(x -> resize!(x, length_u), cache.y₀.u)
         resize!(cache.fᵢ₂_cache, length_u)
     elseif tune_parameters
         length_u = cache.M - length(prob.p)
-        prob = remake(prob; p = first(cache.y₀)[(length_u + 1):end])
-        map(x -> resize!(x, length_u), cache.y₀)
+        prob = remake(prob; p = cache.y₀.u[1][(length_u + 1):end])
+        foreach(x -> resize!(x, length_u), cache.y₀.u)
         resize!(cache.fᵢ₂_cache, length_u)
     end
 
-    u = shrink_y([reshape(y, length_u) for y in cache.y₀], length(cache.mesh), cache.stage)
+    u = shrink_y([reshape(y, length_u) for y in cache.y₀.u], length(cache.mesh), cache.stage)
 
     interpolation = __build_interpolation(cache, u)
 
@@ -530,14 +530,14 @@ function SciMLBase.solve!(
     if tune_parameters && SciMLStructures.isscimlstructure(prob.p)
         tunable_part, repack, _ = SciMLStructures.canonicalize(SciMLStructures.Tunable(), prob.p)
         length_u = cache.M - length(tunable_part)
-        new_p = repack(first(cache.y₀)[(length_u + 1):end])
+        new_p = repack(cache.y₀.u[1][(length_u + 1):end])
         prob = remake(prob; p = new_p)
-        map(x -> resize!(x, length_u), cache.y₀)
+        foreach(x -> resize!(x, length_u), cache.y₀.u)
         resize!(cache.fᵢ₂_cache, length_u)
     elseif tune_parameters
         length_u = cache.M - length(prob.p)
-        prob = remake(prob; p = first(cache.y₀)[(length_u + 1):end])
-        map(x -> resize!(x, length_u), cache.y₀)
+        prob = remake(prob; p = cache.y₀.u[1][(length_u + 1):end])
+        foreach(x -> resize!(x, length_u), cache.y₀.u)
         resize!(cache.fᵢ₂_cache, length_u)
     end
 
diff --git a/lib/BoundaryValueDiffEqFIRK/src/interpolation.jl b/lib/BoundaryValueDiffEqFIRK/src/interpolation.jl
@@ -98,7 +98,7 @@ end
 
     j = interval(mesh, t)
     h = mesh_dt[j]
-    lf = (length(cache.y₀) - 1) / (length(cache.y) - 1)
+    lf = (length(cache.y₀.u) - 1) / (length(cache.y) - 1)
     if lf > 1
         h *= lf
     end
@@ -145,7 +145,7 @@ end
 
     j = interval(mesh, t)
     h = mesh_dt[j]
-    lf = (length(cache.y₀) - 1) / (length(cache.y) - 1)
+    lf = (length(cache.y₀.u) - 1) / (length(cache.y) - 1)
     if lf > 1
         h *= lf
     end
@@ -239,7 +239,7 @@ end
     ) where {iip}
     j = interval(mesh, t)
     h = mesh_dt[j]
-    lf = (length(cache.y₀) - 1) / (length(cache.y) - 1)
+    lf = (length(cache.y₀.u) - 1) / (length(cache.y) - 1)
     if lf > 1
         h *= lf
     end
@@ -284,7 +284,7 @@ end
     ) where {iip}
     j = interval(mesh, t)
     h = mesh_dt[j]
-    lf = (length(cache.y₀) - 1) / (length(cache.y) - 1)
+    lf = (length(cache.y₀.u) - 1) / (length(cache.y) - 1)
     if lf > 1
         h *= lf
     end
diff --git a/lib/BoundaryValueDiffEqFIRK/test/expanded/ensemble_tests.jl b/lib/BoundaryValueDiffEqFIRK/test/expanded/ensemble_tests.jl
@@ -11,7 +11,7 @@
         residual[2] = u(1.0)[1]
     end
 
-    prob_func(prob, i, repeat) = remake(prob, p = [rand()])
+    prob_func(prob, ctx) = remake(prob, p = [rand()])
 
     u0 = [0.0, 1.0]
     tspan = (0, pi / 2)
diff --git a/lib/BoundaryValueDiffEqFIRK/test/nested/ensemble_tests.jl b/lib/BoundaryValueDiffEqFIRK/test/nested/ensemble_tests.jl
@@ -11,7 +11,7 @@
         residual[2] = u(1.0)[1]
     end
 
-    prob_func(prob, i, repeat) = remake(prob, p = [rand()])
+    prob_func(prob, ctx) = remake(prob, p = [rand()])
 
     u0 = [0.0, 1.0]
     tspan = (0, pi / 2)
diff --git a/lib/BoundaryValueDiffEqMIRK/Project.toml b/lib/BoundaryValueDiffEqMIRK/Project.toml
@@ -53,7 +53,7 @@ Random = "1.10"
 ReTestItems = "1.23.1"
 RecursiveArrayTools = "3.27.0"
 Reexport = "1.2"
-SciMLBase = "2.152.1"
+SciMLBase = "2.152.1, 3"
 SciMLStructures = "1.7.0"
 Setfield = "1.1.1"
 SparseArrays = "1.10"
diff --git a/lib/BoundaryValueDiffEqMIRK/src/adaptivity.jl b/lib/BoundaryValueDiffEqMIRK/src/adaptivity.jl
@@ -310,14 +310,14 @@ The input sol has length of `n + 1`. Divide the original mesh and u from origina
 """
 function halve_sol(sol::AbstractVectorOfArray{T}, mesh) where {T}
     new_sol = copy(sol)
-    n = length(sol) - 1
+    n = length(sol.u) - 1
     resize!(new_sol, 2 * n + 1)
-    new_sol[2n + 1] = sol[n + 1]
+    new_sol.u[2n + 1] = sol.u[n + 1]
     for i in (2n - 1):-2:1
-        new_sol[i] = new_sol[(i + 1) ÷ 2]
+        new_sol.u[i] = new_sol.u[(i + 1) ÷ 2]
     end
     @simd for i in (2n):-2:2
-        new_sol[i] = (new_sol[i + 1] + new_sol[i - 1]) ./ T(2)
+        new_sol.u[i] = (new_sol.u[i + 1] + new_sol.u[i - 1]) ./ T(2)
     end
     new_mesh = deepcopy(mesh)
     resize!(new_mesh, 2 * n + 1)
diff --git a/lib/BoundaryValueDiffEqMIRK/src/mirk.jl b/lib/BoundaryValueDiffEqMIRK/src/mirk.jl
@@ -286,14 +286,14 @@ function SciMLBase.solve!(
     if tune_parameters && SciMLStructures.isscimlstructure(prob.p)
         tunable_part, repack, _ = SciMLStructures.canonicalize(SciMLStructures.Tunable(), prob.p)
         length_u = cache.M - length(tunable_part)
-        new_p = repack(first(cache.y₀)[(length_u + 1):end])
+        new_p = repack(cache.y₀.u[1][(length_u + 1):end])
         prob = remake(prob; p = new_p)
-        map(x -> resize!(x, length_u), cache.y₀)
+        foreach(x -> resize!(x, length_u), cache.y₀.u)
         resize!(cache.fᵢ₂_cache, length_u)
     elseif tune_parameters
         length_u = cache.M - length(prob.p)
-        prob = remake(prob; p = first(cache.y₀)[(length_u + 1):end])
-        map(x -> resize!(x, length_u), cache.y₀)
+        prob = remake(prob; p = cache.y₀.u[1][(length_u + 1):end])
+        foreach(x -> resize!(x, length_u), cache.y₀.u)
         resize!(cache.fᵢ₂_cache, length_u)
     end
 
diff --git a/lib/BoundaryValueDiffEqMIRK/test/ensemble_tests.jl b/lib/BoundaryValueDiffEqMIRK/test/ensemble_tests.jl
@@ -12,7 +12,7 @@
         residual[2] = u(1.0)[1]
     end
 
-    prob_func(prob, i, repeat) = remake(prob, p = [rand()])
+    prob_func(prob, ctx) = remake(prob, p = [rand()])
 
     u0 = [0.0, 1.0]
     tspan = (0, pi / 2)
diff --git a/lib/BoundaryValueDiffEqMIRKN/Project.toml b/lib/BoundaryValueDiffEqMIRKN/Project.toml
@@ -48,7 +48,7 @@ Random = "1.10"
 ReTestItems = "1.23.1"
 RecursiveArrayTools = "3.27.0"
 Reexport = "1.2"
-SciMLBase = "2.152.1"
+SciMLBase = "2.152.1, 3"
 Setfield = "1.1.1"
 SparseArrays = "1.10"
 StaticArrays = "1.9.8"
diff --git a/lib/BoundaryValueDiffEqShooting/Project.toml b/lib/BoundaryValueDiffEqShooting/Project.toml
@@ -51,7 +51,7 @@ Random = "1.10"
 ReTestItems = "1.23.1"
 RecursiveArrayTools = "3.27.0"
 Reexport = "1.2"
-SciMLBase = "2.152.1"
+SciMLBase = "2.152.1, 3"
 Setfield = "1.1.1"
 SparseArrays = "1.10"
 StaticArrays = "1.9.8"
diff --git a/test/misc/default_solvers.jl b/test/misc/default_solvers.jl
@@ -8,8 +8,8 @@
     end
 
     function bc!(resid, sol, p, t)
-        resid[1] = sol[1][1]
-        resid[2] = sol[end][1] - 1
+        resid[1] = sol.u[1][1]
+        resid[2] = sol.u[end][1] - 1
     end
 
     tspan = (0.0, 100.0)
