Merge pull request #3673 from AayushSabharwal/as/fix-promotion

[backport-v9] fix: fix type promotion in `late_binding_update_u0_p` with non-dual types

Author: ChrisRackauckas

src/systems/nonlinear/initializesystem.jl

@@ -598,24 +598,42 @@ function SciMLBase.remake_initialization_data(
     return SciMLBase.remake_initialization_data(sys, odefn, newu0, t0, newp, newu0, newp)
 end
 
-function promote_u0_p(u0, p::MTKParameters, t0)
-    u0 = DiffEqBase.promote_u0(u0, p.tunable, t0)
-    u0 = DiffEqBase.promote_u0(u0, p.initials, t0)
+promote_type_with_nothing(::Type{T}, ::Nothing) where {T} = T
+promote_type_with_nothing(::Type{T}, ::SizedVector{0}) where {T} = T
+function promote_type_with_nothing(::Type{T}, ::AbstractArray{T2}) where {T, T2}
+    promote_type(T, T2)
+end
 
-    if !isempty(p.tunable)
-        tunables = DiffEqBase.promote_u0(p.tunable, u0, t0)
-        p = SciMLStructures.replace(SciMLStructures.Tunable(), p, tunables)
-    end
-    if !isempty(p.initials)
-        initials = DiffEqBase.promote_u0(p.initials, u0, t0)
-        p = SciMLStructures.replace(SciMLStructures.Initials(), p, initials)
+promote_with_nothing(::Type, ::Nothing) = nothing
+promote_with_nothing(::Type, x::SizedVector{0}) = x
+promote_with_nothing(::Type{T}, x::AbstractArray{T}) where {T} = x
+function promote_with_nothing(::Type{T}, x::AbstractArray{T2}) where {T, T2}
+    if ArrayInterface.ismutable(x)
+        y = similar(x, T)
+        copyto!(y, x)
+        return y
+    else
+        yT = similar_type(x, T)
+        return yT(x)
     end
-
-    return u0, p
+end
+function promote_with_nothing(::Type{T}, p::MTKParameters) where {T}
+    tunables = promote_with_nothing(T, p.tunable)
+    p = SciMLStructures.replace(SciMLStructures.Tunable(), p, tunables)
+    initials = promote_with_nothing(T, p.initials)
+    p = SciMLStructures.replace(SciMLStructures.Initials(), p, initials)
+    return p
 end
 
 function promote_u0_p(u0, p, t0)
-    return DiffEqBase.promote_u0(u0, p, t0), DiffEqBase.promote_u0(p, u0, t0)
+    T = Union{}
+    T = promote_type_with_nothing(T, u0)
+    T = promote_type_with_nothing(T, p.tunable)
+    T = promote_type_with_nothing(T, p.initials)
+
+    u0 = promote_with_nothing(T, u0)
+    p = promote_with_nothing(T, p)
+    return u0, p
 end
 
 function SciMLBase.late_binding_update_u0_p(

test/initial_values.jl

@@ -362,3 +362,13 @@ end
     @test state_values(initdata.initializeprob) isa SVector
     @test parameter_values(initdata.initializeprob) isa SVector
 end
+
+@testset "Type promotion of `p` works with non-dual types" begin
+    @variables x(t) y(t)
+    @mtkbuild sys = ODESystem([D(x) ~ x + y, x^3 + y^3 ~ 5], t; guesses = [y => 1.0])
+    prob = ODEProblem(sys, [x => 1.0], (0.0, 1.0))
+    prob2 = remake(prob; u0 = BigFloat.(prob.u0))
+    @test prob2.p.initials isa Vector{BigFloat}
+    sol = solve(prob2)
+    @test SciMLBase.successful_retcode(sol)
+end