Merge pull request #433 from ChrisRackauckas-Claude/fix-deprecation-warnings

ChrisRackauckas · web-flow · commit cca22cc6c523 · 2026-02-09T12:24:09.000-01:00
Remove DiffEqBase dependency from subpackages, use SciMLBase directly
diff --git a/lib/BoundaryValueDiffEqAscher/Project.toml b/lib/BoundaryValueDiffEqAscher/Project.toml
@@ -8,7 +8,6 @@ ADTypes = "47edcb42-4c32-4615-8424-f2b9edc5f35b"
 AlmostBlockDiagonals = "a95523ee-d6da-40b5-98cc-27bc505739d5"
 BoundaryValueDiffEqCore = "56b672f2-a5fe-4263-ab2d-da677488eb3a"
 ConcreteStructs = "2569d6c7-a4a2-43d3-a901-331e8e4be471"
-DiffEqBase = "2b5f629d-d688-5b77-993f-72d75c75574e"
 DifferentiationInterface = "a0c0ee7d-e4b9-4e03-894e-1c5f64a51d63"
 FastClosures = "9aa1b823-49e4-5ca5-8b0f-3971ec8bab6a"
 ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210"
@@ -25,7 +24,6 @@ AlmostBlockDiagonals = "0.1.10"
 Aqua = "0.8"
 BoundaryValueDiffEqCore = "1"
 ConcreteStructs = "0.2.3"
-DiffEqBase = "6.183"
 DiffEqDevTools = "2.44"
 DifferentiationInterface = "0.6.42, 0.7"
 FastClosures = "0.3.2"
diff --git a/lib/BoundaryValueDiffEqAscher/src/BoundaryValueDiffEqAscher.jl b/lib/BoundaryValueDiffEqAscher/src/BoundaryValueDiffEqAscher.jl
@@ -14,7 +14,6 @@ using BoundaryValueDiffEqCore: AbstractBoundaryValueDiffEqAlgorithm,
     __internal_solve, __build_cost
 
 using ConcreteStructs: @concrete
-using DiffEqBase: DiffEqBase
 using DifferentiationInterface: DifferentiationInterface, Constant, prepare_jacobian
 using FastClosures: @closure
 using ForwardDiff: ForwardDiff, Dual
diff --git a/lib/BoundaryValueDiffEqFIRK/Project.toml b/lib/BoundaryValueDiffEqFIRK/Project.toml
@@ -8,7 +8,6 @@ ArrayInterface = "4fba245c-0d91-5ea0-9b3e-6abc04ee57a9"
 BandedMatrices = "aae01518-5342-5314-be14-df237901396f"
 BoundaryValueDiffEqCore = "56b672f2-a5fe-4263-ab2d-da677488eb3a"
 ConcreteStructs = "2569d6c7-a4a2-43d3-a901-331e8e4be471"
-DiffEqBase = "2b5f629d-d688-5b77-993f-72d75c75574e"
 DifferentiationInterface = "a0c0ee7d-e4b9-4e03-894e-1c5f64a51d63"
 FastAlmostBandedMatrices = "9d29842c-ecb8-4973-b1e9-a27b1157504e"
 FastClosures = "9aa1b823-49e4-5ca5-8b0f-3971ec8bab6a"
@@ -35,7 +34,6 @@ ArrayInterface = "7.18"
 BandedMatrices = "1.7.5"
 BoundaryValueDiffEqCore = "1"
 ConcreteStructs = "0.2.3"
-DiffEqBase = "6.183"
 DiffEqDevTools = "2.44"
 DifferentiationInterface = "0.6.42, 0.7"
 Enzyme = "0.13.33"
diff --git a/lib/BoundaryValueDiffEqFIRK/src/BoundaryValueDiffEqFIRK.jl b/lib/BoundaryValueDiffEqFIRK/src/BoundaryValueDiffEqFIRK.jl
@@ -28,7 +28,6 @@ using BoundaryValueDiffEqCore: AbstractBoundaryValueDiffEqAlgorithm,
     __tunable_part, __add_singular_term!
 
 using ConcreteStructs: @concrete
-using DiffEqBase: DiffEqBase
 using DifferentiationInterface: DifferentiationInterface, Constant
 using FastAlmostBandedMatrices: AlmostBandedMatrix, fillpart, exclusive_bandpart,
     finish_part_setindex!
diff --git a/lib/BoundaryValueDiffEqFIRK/src/firk.jl b/lib/BoundaryValueDiffEqFIRK/src/firk.jl
@@ -487,7 +487,7 @@ function SciMLBase.solve!(
 
     interpolation = __build_interpolation(cache, u)
 
-    odesol = DiffEqBase.build_solution(
+    odesol = SciMLBase.build_solution(
         prob, cache.alg, cache.mesh, u; interp = interpolation, retcode = info
     )
     return __build_solution(prob, odesol, sol_nlprob)
@@ -532,7 +532,7 @@ function SciMLBase.solve!(
 
     interpolation = __build_interpolation(cache, u.u)
 
-    odesol = DiffEqBase.build_solution(
+    odesol = SciMLBase.build_solution(
         prob, cache.alg, cache.mesh, u.u; interp = interpolation, retcode = info
     )
     return __build_solution(prob, odesol, sol_nlprob)
diff --git a/lib/BoundaryValueDiffEqFIRK/src/interpolation.jl b/lib/BoundaryValueDiffEqFIRK/src/interpolation.jl
@@ -5,7 +5,7 @@ struct FIRKExpandInterpolation{T1, T2} <: AbstractDiffEqInterpolation
     cache
 end
 
-function DiffEqBase.interp_summary(interp::FIRKExpandInterpolation)
+function SciMLBase.interp_summary(interp::FIRKExpandInterpolation)
     return "FIRK Order $(interp.cache.order) Interpolation"
 end
 
@@ -26,7 +26,7 @@ struct FIRKNestedInterpolation{T1, T2} <: AbstractDiffEqInterpolation
     cache
 end
 
-function DiffEqBase.interp_summary(interp::FIRKNestedInterpolation)
+function SciMLBase.interp_summary(interp::FIRKNestedInterpolation)
     return "FIRK Order $(interp.cache.order) Interpolation"
 end
 
diff --git a/lib/BoundaryValueDiffEqMIRK/Project.toml b/lib/BoundaryValueDiffEqMIRK/Project.toml
@@ -8,7 +8,6 @@ ArrayInterface = "4fba245c-0d91-5ea0-9b3e-6abc04ee57a9"
 BandedMatrices = "aae01518-5342-5314-be14-df237901396f"
 BoundaryValueDiffEqCore = "56b672f2-a5fe-4263-ab2d-da677488eb3a"
 ConcreteStructs = "2569d6c7-a4a2-43d3-a901-331e8e4be471"
-DiffEqBase = "2b5f629d-d688-5b77-993f-72d75c75574e"
 DifferentiationInterface = "a0c0ee7d-e4b9-4e03-894e-1c5f64a51d63"
 FastAlmostBandedMatrices = "9d29842c-ecb8-4973-b1e9-a27b1157504e"
 FastClosures = "9aa1b823-49e4-5ca5-8b0f-3971ec8bab6a"
@@ -34,7 +33,6 @@ ArrayInterface = "7.18"
 BandedMatrices = "1.7.5"
 BoundaryValueDiffEqCore = "1"
 ConcreteStructs = "0.2.3"
-DiffEqBase = "6.183"
 DiffEqDevTools = "2.44"
 DifferentiationInterface = "0.6.42, 0.7"
 Enzyme = "0.13.33"
diff --git a/lib/BoundaryValueDiffEqMIRK/src/BoundaryValueDiffEqMIRK.jl b/lib/BoundaryValueDiffEqMIRK/src/BoundaryValueDiffEqMIRK.jl
@@ -27,7 +27,6 @@ using BoundaryValueDiffEqCore: AbstractBoundaryValueDiffEqAlgorithm,
     __default_sparsity_detector, __build_cost, __add_singular_term!
 
 using ConcreteStructs: @concrete
-using DiffEqBase: DiffEqBase
 using DifferentiationInterface: DifferentiationInterface, Constant, prepare_jacobian
 using FastAlmostBandedMatrices: AlmostBandedMatrix, fillpart, exclusive_bandpart,
     finish_part_setindex!
diff --git a/lib/BoundaryValueDiffEqMIRK/src/interpolation.jl b/lib/BoundaryValueDiffEqMIRK/src/interpolation.jl
@@ -5,7 +5,7 @@
     cache
 end
 
-function DiffEqBase.interp_summary(interp::MIRKInterpolation)
+function SciMLBase.interp_summary(interp::MIRKInterpolation)
     return "MIRK Order $(interp.cache.order) Interpolation"
 end
 
diff --git a/lib/BoundaryValueDiffEqMIRK/src/mirk.jl b/lib/BoundaryValueDiffEqMIRK/src/mirk.jl
@@ -293,7 +293,7 @@ function SciMLBase.solve!(
 
     interpolation = __build_interpolation(cache, u.u)
 
-    odesol = DiffEqBase.build_solution(
+    odesol = SciMLBase.build_solution(
         prob, cache.alg, cache.mesh, u.u; interp = interpolation, retcode = info
     )
     return __build_solution(prob, odesol, sol_nlprob)
diff --git a/lib/BoundaryValueDiffEqMIRKN/Project.toml b/lib/BoundaryValueDiffEqMIRKN/Project.toml
@@ -9,7 +9,6 @@ ArrayInterface = "4fba245c-0d91-5ea0-9b3e-6abc04ee57a9"
 BandedMatrices = "aae01518-5342-5314-be14-df237901396f"
 BoundaryValueDiffEqCore = "56b672f2-a5fe-4263-ab2d-da677488eb3a"
 ConcreteStructs = "2569d6c7-a4a2-43d3-a901-331e8e4be471"
-DiffEqBase = "2b5f629d-d688-5b77-993f-72d75c75574e"
 DifferentiationInterface = "a0c0ee7d-e4b9-4e03-894e-1c5f64a51d63"
 FastAlmostBandedMatrices = "9d29842c-ecb8-4973-b1e9-a27b1157504e"
 FastClosures = "9aa1b823-49e4-5ca5-8b0f-3971ec8bab6a"
@@ -34,7 +33,6 @@ ArrayInterface = "7.18"
 BandedMatrices = "1.7.5"
 BoundaryValueDiffEqCore = "1"
 ConcreteStructs = "0.2.3"
-DiffEqBase = "6.183"
 DiffEqDevTools = "2.44"
 DifferentiationInterface = "0.6.42, 0.7"
 FastAlmostBandedMatrices = "0.1.4"
diff --git a/lib/BoundaryValueDiffEqMIRKN/src/BoundaryValueDiffEqMIRKN.jl b/lib/BoundaryValueDiffEqMIRKN/src/BoundaryValueDiffEqMIRKN.jl
@@ -23,7 +23,6 @@ using BoundaryValueDiffEqCore: AbstractBoundaryValueDiffEqAlgorithm,
     __concrete_kwargs, __internal_solve
 
 using ConcreteStructs: @concrete
-using DiffEqBase: DiffEqBase
 using DifferentiationInterface: DifferentiationInterface, Constant, prepare_jacobian
 using FastAlmostBandedMatrices: AlmostBandedMatrix, fillpart, exclusive_bandpart,
     finish_part_setindex!
diff --git a/lib/BoundaryValueDiffEqShooting/Project.toml b/lib/BoundaryValueDiffEqShooting/Project.toml
@@ -8,7 +8,6 @@ ArrayInterface = "4fba245c-0d91-5ea0-9b3e-6abc04ee57a9"
 BandedMatrices = "aae01518-5342-5314-be14-df237901396f"
 BoundaryValueDiffEqCore = "56b672f2-a5fe-4263-ab2d-da677488eb3a"
 ConcreteStructs = "2569d6c7-a4a2-43d3-a901-331e8e4be471"
-DiffEqBase = "2b5f629d-d688-5b77-993f-72d75c75574e"
 DifferentiationInterface = "a0c0ee7d-e4b9-4e03-894e-1c5f64a51d63"
 FastClosures = "9aa1b823-49e4-5ca5-8b0f-3971ec8bab6a"
 ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210"
@@ -33,7 +32,6 @@ ArrayInterface = "7.18"
 BandedMatrices = "1.11.0"
 BoundaryValueDiffEqCore = "1"
 ConcreteStructs = "0.2.3"
-DiffEqBase = "6.183"
 DiffEqDevTools = "2.44"
 DifferentiationInterface = "0.6.42, 0.7"
 FastClosures = "0.3.2"
diff --git a/lib/BoundaryValueDiffEqShooting/src/BoundaryValueDiffEqShooting.jl b/lib/BoundaryValueDiffEqShooting/src/BoundaryValueDiffEqShooting.jl
@@ -22,7 +22,6 @@ using BoundaryValueDiffEqCore: AbstractBoundaryValueDiffEqAlgorithm, BVPJacobian
     __internal_solve
 
 using ConcreteStructs: @concrete
-using DiffEqBase: DiffEqBase, solve
 using DifferentiationInterface: DifferentiationInterface, Constant, prepare_jacobian,
     overloaded_input_type
 using FastClosures: @closure
@@ -31,7 +30,7 @@ using LinearAlgebra
 using Reexport: @reexport
 using RecursiveArrayTools: ArrayPartition, DiffEqArray, VectorOfArray
 using SciMLBase: SciMLBase, AbstractDiffEqInterpolation, StandardBVProblem, __solve,
-    _unwrap_val
+    _unwrap_val, solve
 using Setfield: @set!, @set
 using SparseArrays: sparse
 using OrdinaryDiffEqTsit5: Tsit5
diff --git a/test/wrappers/odeinterface_tests.jl b/test/wrappers/odeinterface_tests.jl
@@ -29,20 +29,20 @@ export ex7_f!, ex7_2pbc1!, ex7_2pbc2!, u0, p, tspan
 
 end
 
-@testitem "BVPM2" setup = [ODEInterfaceWrapperTestSetup] begin
+@testitem "BVPM2" setup = [ODEInterfaceWrapperTestSetup] skip = true begin
     using ODEInterface, RecursiveArrayTools, LinearAlgebra
 
     tpprob = TwoPointBVProblem(
         ex7_f!, (ex7_2pbc1!, ex7_2pbc2!), u0, tspan,
         p; bcresid_prototype = (zeros(1), zeros(1))
     )
 
-    #sol_bvpm2 = solve(tpprob, BVPM2(); dt = π / 20)
-    #@test SciMLBase.successful_retcode(sol_bvpm2)
-    #resid_f = (Array{Float64, 1}(undef, 1), Array{Float64, 1}(undef, 1))
-    #ex7_2pbc1!(resid_f[1], sol_bvpm2(tspan[1]), nothing)
-    #ex7_2pbc2!(resid_f[2], sol_bvpm2(tspan[2]), nothing)
-    #@test norm(resid_f, Inf) < 1e-6
+    sol_bvpm2 = solve(tpprob, BVPM2(); dt = π / 20)
+    @test SciMLBase.successful_retcode(sol_bvpm2)
+    resid_f = (Array{Float64, 1}(undef, 1), Array{Float64, 1}(undef, 1))
+    ex7_2pbc1!(resid_f[1], sol_bvpm2(tspan[1]), nothing)
+    ex7_2pbc2!(resid_f[2], sol_bvpm2(tspan[2]), nothing)
+    @test norm(resid_f, Inf) < 1.0e-6
 end
 
 # Just test that it runs. BVPSOL only works with linearly separable BCs.

Original file line number	Diff line number	Diff line change
`@@ -487,7 +487,7 @@ function SciMLBase.solve!(`
`487`	`487`
`488`	`488`	`interpolation = __build_interpolation(cache, u)`
`489`	`489`
`490`		`- odesol = DiffEqBase.build_solution(`
	`490`	`+ odesol = SciMLBase.build_solution(`
`491`	`491`	`prob, cache.alg, cache.mesh, u; interp = interpolation, retcode = info`
`492`	`492`	`)`
`493`	`493`	`return __build_solution(prob, odesol, sol_nlprob)`
`@@ -532,7 +532,7 @@ function SciMLBase.solve!(`
`532`	`532`
`533`	`533`	`interpolation = __build_interpolation(cache, u.u)`
`534`	`534`
`535`		`- odesol = DiffEqBase.build_solution(`
	`535`	`+ odesol = SciMLBase.build_solution(`
`536`	`536`	`prob, cache.alg, cache.mesh, u.u; interp = interpolation, retcode = info`
`537`	`537`	`)`
`538`	`538`	`return __build_solution(prob, odesol, sol_nlprob)`
Original file line number	Diff line number	Diff line change
`@@ -293,7 +293,7 @@ function SciMLBase.solve!(`
`293`	`293`
`294`	`294`	`interpolation = __build_interpolation(cache, u.u)`
`295`	`295`
`296`		`- odesol = DiffEqBase.build_solution(`
	`296`	`+ odesol = SciMLBase.build_solution(`
`297`	`297`	`prob, cache.alg, cache.mesh, u.u; interp = interpolation, retcode = info`
`298`	`298`	`)`
`299`	`299`	`return __build_solution(prob, odesol, sol_nlprob)`