fix: fix remake_buffer with dependent update, test with ForwardDiff

Author: AayushSabharwal

src/systems/parameter_buffer.jl

@@ -330,7 +330,6 @@ function SymbolicIndexingInterface.remake_buffer(sys, oldbuf::MTKParameters, val
     for (portion, old) in [(SciMLStructures.Tunable(), oldbuf.tunable)
                            (SciMLStructures.Discrete(), oldbuf.discrete)
                            (SciMLStructures.Constants(), oldbuf.constant)
-                           (DEPENDENT_PORTION, oldbuf.dependent)
                            (NONNUMERIC_PORTION, oldbuf.nonnumeric)]
         if isempty(old)
             push!(newbufs, old)
@@ -343,15 +342,19 @@ function SymbolicIndexingInterface.remake_buffer(sys, oldbuf::MTKParameters, val
         end
         push!(newbufs, Tuple(new))
     end
-    newbuf = MTKParameters(
-        newbufs..., oldbuf.dependent_update_iip, oldbuf.dependent_update_oop)
+    tmpbuf = MTKParameters(
+        newbufs[1], newbufs[2], newbufs[3], oldbuf.dependent, newbufs[4], nothing, nothing)
     for (p, val) in vals
         _set_parameter_unchecked!(
-            newbuf, val, parameter_index(sys, p); update_dependent = false)
+            tmpbuf, val, parameter_index(sys, p); update_dependent = false)
     end
-    if newbuf.dependent_update_iip !== nothing
-        newbuf.dependent_update_iip(ArrayPartition(newbuf.dependent), newbuf...)
+    if oldbuf.dependent_update_oop !== nothing
+        dependent = oldbuf.dependent_update_oop(tmpbuf...)
+    else
+        dependent = ()
     end
+    newbuf = MTKParameters(newbufs[1], newbufs[2], newbufs[3], dependent, newbufs[4],
+        oldbuf.dependent_update_iip, oldbuf.dependent_update_oop)
     return newbuf
 end
 

test/mtkparameters.jl

@@ -2,6 +2,7 @@ using ModelingToolkit
 using ModelingToolkit: t_nounits as t, D_nounits as D, MTKParameters
 using SymbolicIndexingInterface
 using SciMLStructures: SciMLStructures, canonicalize, Tunable, Discrete, Constants
+using ForwarDiff
 
 @parameters a b c d::Integer e[1:3] f[1:3, 1:3]::Int g::Vector{AbstractFloat} h::String
 @named sys = ODESystem(
@@ -90,3 +91,13 @@ end
 @test getp(sys, f)(newps) isa Matrix{UInt}
 # SII bug
 @test_broken getp(sys, g)(newps) isa Vector{Float32}
+
+ps = MTKParameters(sys, ivs)
+function loss(value, sys, ps)
+    @test value isa ForwardDiff.Dual
+    vals = merge(Dict(parameters(sys) .=> getp(sys, parameters(sys))(ps)), Dict(a => value))
+    ps = remake_buffer(sys, ps, vals)
+    getp(sys, a)(ps) + getp(sys, b)(ps)
+end
+
+@test ForwardDiff.derivative(x -> loss(x, sys, ps), 1.5) == 3.0