Merge pull request #2630 from AayushSabharwal/as/fix-arrayparam-initialization

fix: fix intialization of array parameters with unknown size

Author: ChrisRackauckas

src/systems/parameter_buffer.jl

@@ -43,8 +43,7 @@ function MTKParameters(
     p = merge(defs, p)
     p = merge(Dict(unwrap(k) => v for (k, v) in p),
         Dict(default_toterm(unwrap(k)) => v for (k, v) in p))
-    p = Dict(k => fixpoint_sub(v, p)
-    for (k, v) in p if k in all_ps || default_toterm(k) in all_ps)
+    p = Dict(k => fixpoint_sub(v, p) for (k, v) in p)
     for (sym, _) in p
         if istree(sym) && operation(sym) === getindex &&
            first(arguments(sym)) in all_ps
@@ -89,14 +88,24 @@ function MTKParameters(
 
     for (sym, val) in p
         sym = unwrap(sym)
+        val = unwrap(val)
         ctype = concrete_symtype(sym)
-        val = symconvert(ctype, unwrap(fixpoint_sub(val, p)))
+        if symbolic_type(val) !== NotSymbolic()
+            continue
+        end
+        val = symconvert(ctype, val)
         done = set_value(sym, val)
         if !done && Symbolics.isarraysymbolic(sym)
-            done = all(set_value.(collect(sym), val))
-        end
-        if !done
-            error("Symbol $sym does not have an index")
+            if Symbolics.shape(sym) === Symbolics.Unknown()
+                for i in eachindex(val)
+                    set_value(sym[i], val[i])
+                end
+            else
+                if size(sym) != size(val)
+                    error("Got value of size $(size(val)) for parameter $sym of size $(size(sym))")
+                end
+                set_value.(collect(sym), val)
+            end
         end
     end
 
@@ -341,6 +350,7 @@ function SymbolicIndexingInterface.remake_buffer(sys, oldbuf::MTKParameters, val
     if newbuf.dependent_update_oop !== nothing
         @set! newbuf.dependent = newbuf.dependent_update_oop(newbuf...)
     end
+    return newbuf
 end
 
 _subarrays(v::AbstractVector) = isempty(v) ? () : (v,)

test/mtkparameters.jl

@@ -101,3 +101,14 @@ function loss(value, sys, ps)
 end
 
 @test ForwardDiff.derivative(x -> loss(x, sys, ps), 1.5) == 3.0
+
+# Issue#2615
+@parameters p::Vector{Float64}
+@variables X(t)
+eq = D(X) ~ p[1] - p[2] * X
+@mtkbuild osys = ODESystem([eq], t)
+
+u0 = [X => 1.0]
+ps = [p => [2.0, 0.1]]
+p = MTKParameters(osys, ps, u0)
+@test p.tunable[1] == [2.0, 0.1]

test/odesystem.jl

@@ -1024,7 +1024,7 @@ sol2 = @test_nowarn solve(prob2, Tsit5())
 @test sol1 ≈ sol2
 
 # Requires fix in symbolics for `linear_expansion(p * x, D(y))`
-@test_broken begin
+@test_skip begin
     @variables x(t)[1:3] y(t)
     @parameters p[1:3, 1:3]
     @test_nowarn @mtkbuild sys = ODESystem([D(x) ~ p * x, D(y) ~ x' * p * x], t)