Merge pull request #2732 from oscardssmith/os/bump_DI

Os/bump di

Author: ChrisRackauckas

lib/OrdinaryDiffEqBDF/Project.toml

@@ -42,12 +42,12 @@ LinearAlgebra = "<0.0.1, 1"
 LinearSolve = "2.32, 3"
 MacroTools = "0.5.13"
 MuladdMacro = "0.2.4"
+NonlinearSolve = "4"
 ODEProblemLibrary = "0.1.8"
 OrdinaryDiffEqCore = "1.21"
 OrdinaryDiffEqDifferentiation = "1.5"
 OrdinaryDiffEqNonlinearSolve = "1.6"
 OrdinaryDiffEqSDIRK = "1.3"
-NonlinearSolve = "4"
 PrecompileTools = "1.2.1"
 Preferences = "1.4.3"
 Random = "<0.0.1, 1"

lib/OrdinaryDiffEqCore/src/misc_utils.jl

@@ -146,7 +146,7 @@ function _bool_to_ADType(::Val{false}, _, ::Val{FD}) where {FD}
     Base.depwarn(
         "Using a `Bool` for keyword argument `autodiff` is deprecated. Please use an `ADType` specifier.",
         :_bool_to_ADType)
-    return AutoFiniteDiff(; fdtype = Val{FD}())
+    return AutoFiniteDiff(; fdtype = Val{FD}(), dir=1)
 end
 
 # Functions to get ADType type from Bool or ADType object, or ADType type
@@ -188,6 +188,9 @@ function _process_AD_choice(
         @warn "The `diff_type` keyword is deprecated. Please use an `ADType` specifier. For now defaulting to using `AutoFiniteDiff` with `fdtype=Val{$FD2}()`."
         return _bool_to_ADType(Val{false}(), Val{CS}(), Val{FD2}()), Val{CS}(), Val{FD2}()
     end
+    if ad_alg.dir isa Bool # default dir of true makes integration non-reversable
+        @reset ad_alg.dir = Int(ad_alg.dir)
+    end
     return ad_alg, Val{CS}(), ad_alg.fdtype
 end
 

lib/OrdinaryDiffEqDifferentiation/Project.toml

@@ -34,7 +34,7 @@ ConcreteStructs = "0.2.2"
 ConstructionBase = "1.5.8"
 DiffEqBase = "6"
 DiffEqDevTools = "2.44.4"
-DifferentiationInterface = "0.6.48"
+DifferentiationInterface = "0.6.48, 0.7"
 FastBroadcast = "0.3"
 FiniteDiff = "2"
 ForwardDiff = "0.10, 1"

lib/OrdinaryDiffEqDifferentiation/src/derivative_wrappers.jl

@@ -251,7 +251,6 @@ function build_jac_config(alg, f::F1, uf::F2, du1, uprev,
                 @. @view(jac_prototype[idxs]) = @view(f.mass_matrix[idxs])
             end
         end
-        uf = SciMLBase.@set uf.f = SciMLBase.unwrapped_f(uf.f)
 
         autodiff_alg = alg_autodiff(alg)
         dense = autodiff_alg isa AutoSparse ? ADTypes.dense_ad(autodiff_alg) : autodiff_alg
@@ -273,7 +272,7 @@ function build_jac_config(alg, f::F1, uf::F2, du1, uprev,
 
             jac_config = (jac_config_forward, jac_config_reverse)
         else
-            jac_config1 = DI.prepare_jacobian(uf, du1, alg_autodiff(alg), u)
+            jac_config1 = DI.prepare_jacobian(uf, du1, autodiff_alg, u)
             jac_config = (jac_config1, jac_config1)
         end
 
@@ -309,7 +308,7 @@ function resize_jac_config!(cache, integrator)
             ad_left = autodiff_alg
         end
 
-        cache.jac_config = ([DI.prepare!_jacobian(
+        SciMLBase.@reset cache.jac_config = ([DI.prepare!_jacobian(
                                    uf, cache.du1, config, ad, integrator.u)
                                for (ad, config) in zip(
             (ad_right, ad_left), cache.jac_config)]...,)
@@ -338,10 +337,6 @@ function resize_grad_config!(cache, integrator)
     cache.grad_config
 end
 
-
-
-
-
 function build_grad_config(alg, f::F1, tf::F2, du1, t) where {F1, F2}
     if !DiffEqBase.has_tgrad(f)
         ad = ADTypes.dense_ad(alg_autodiff(alg)) 
@@ -354,6 +349,9 @@ function build_grad_config(alg, f::F1, tf::F2, du1, t) where {F1, F2}
             grad_config_false = DI.prepare_derivative(tf, du1, dir_false, t)
 
             grad_config = (grad_config_true, grad_config_false)
+        elseif ad isa AutoForwardDiff
+            grad_config1 = DI.prepare_derivative(tf,du1,ad,convert(eltype(du1),t))
+            grad_config = (grad_config1, grad_config1)
         else
             grad_config1 = DI.prepare_derivative(tf,du1,ad,t)
             grad_config = (grad_config1, grad_config1)

lib/OrdinaryDiffEqRosenbrock/Project.toml

@@ -31,7 +31,7 @@ Static = "aedffcd0-7271-4cad-89d0-dc628f76c6d3"
 ADTypes = "1.11"
 DiffEqBase = "6.152.2"
 DiffEqDevTools = "2.44.4"
-DifferentiationInterface = "0.6.48"
+DifferentiationInterface = "0.6.48, 0.7"
 Enzyme = "0.13"
 FastBroadcast = "0.3.5"
 FiniteDiff = "2.24.0"

lib/OrdinaryDiffEqRosenbrock/test/dae_rosenbrock_ad_tests.jl

@@ -29,7 +29,7 @@ sol = @inferred solve(prob_mm_oop, Rodas5P(), reltol = 1e-8, abstol = 1e-8)
 
 # These tests flex differentiation of the solver and through the initialization
 # To only test the solver part and isolate potential issues, set the initialization to consistent
-@testset "Inplace: $(isinplace(_prob)), DAEProblem: $(_prob isa DAEProblem), BrownBasic: $(initalg isa BrownFullBasicInit), Autodiff: $autodiff" for _prob in [
+@testset "Inplace: $(isinplace(_prob)), BrownBasic: $(initalg isa BrownFullBasicInit), Autodiff: $autodiff" for _prob in [
         prob_mm, prob_mm_oop],
     initalg in [BrownFullBasicInit(), ShampineCollocationInit()], autodiff in [AutoForwardDiff(chunksize=3), AutoFiniteDiff()]
 

lib/OrdinaryDiffEqRosenbrock/test/ode_rosenbrock_tests.jl

@@ -898,7 +898,7 @@ end
         alg = @test_logs @inferred(T(; autodiff = ad))
         @test alg isa
               RosenbrockAlgorithm{0, <:AutoFiniteDiff{Val{:central}}, Val{:central}()}
-        @test OrdinaryDiffEqRosenbrock.OrdinaryDiffEqCore.alg_autodiff(alg) === ad
+        @test OrdinaryDiffEqRosenbrock.OrdinaryDiffEqCore.alg_autodiff(alg) isa AutoFiniteDiff{Val{:central}}
         @test OrdinaryDiffEqRosenbrock.OrdinaryDiffEqCore.get_chunksize(alg) === Val{0}()
 
         alg = @test_logs (:warn, r"The `diff_type` keyword is deprecated") match_mode=:any @inferred(T(;

test/interface/dae_initialize_integration.jl

@@ -35,7 +35,7 @@ p0 = [
     Dk => 1
 ]
 
-prob = ODEProblem(connected, u0, tspan, p0)
+prob = ODEProblem(connected, [u0; p0], tspan)
 sol = solve(prob, Rodas5(), initializealg = BrownFullBasicInit())
 @test prob.u0 == sol[1]
 sol = solve(prob, Rodas5(), initializealg = ShampineCollocationInit())