Merge pull request #492 from SciML/patch

Jacobians safe for LabelledArrays

Author: ChrisRackauckas

Project.toml

@@ -1,7 +1,7 @@
 name = "ModelingToolkit"
 uuid = "961ee093-0014-501f-94e3-6117800e7a78"
 authors = ["Chris Rackauckas <accounts@chrisrackauckas.com>"]
-version = "3.12.0"
+version = "3.12.1"
 
 [deps]
 ArrayInterface = "4fba245c-0d91-5ea0-9b3e-6abc04ee57a9"

src/build_function.jl

@@ -336,10 +336,14 @@ function _build_function(target::JuliaTarget, rhss, args...;
 	arr_sys_expr = (typeof(rhss) <: Vector || typeof(rhss) <: Matrix) && !(eltype(rhss) <: AbstractArray) ? quote
 		if typeof($(fargs.args[1])) <: Union{ModelingToolkit.StaticArrays.SArray,ModelingToolkit.LabelledArrays.SLArray}
 			$xname = ModelingToolkit.StaticArrays.@SArray $arr_sys_expr
-			convert(typeof($(fargs.args[1])),$xname)
+			if $(typeof(rhss) <: Vector) # Only try converting if it should match `u`
+				convert(typeof($(fargs.args[1])),$xname)
+			else
+				$xname
+			end
 		else
 			$xname = $arr_sys_expr
-			if !(typeof($(fargs.args[1])) <: Array)
+			if !(typeof($(fargs.args[1])) <: Array) && $(typeof(rhss) <: Vector)
 				convert(typeof($(fargs.args[1])),$xname)
 			else
 				$xname

test/labelledarrays.jl

@@ -13,14 +13,20 @@ eqs = [D(x) ~ σ*(y-x),
        D(z) ~ x*y - β*z]
 
 de = ODESystem(eqs)
-f = ODEFunction(de, [x,y,z], [σ,ρ,β])
+ff = ODEFunction(de, [x,y,z], [σ,ρ,β], jac=true)
 
 a = @SVector [1.0,2.0,3.0]
 b = SLVector(x=1.0,y=2.0,z=3.0)
 c = [1.0,2.0,3.0]
 p = SLVector(σ=10.0,ρ=26.0,β=8/3)
-@test f(a,p,0.0) isa SVector
-@test typeof(f(b,p,0.0)) <: SLArray
-@test f(c,p,0.0) isa Vector
-@test f(a,p,0.0) == f(b,p,0.0)
-@test f(a,p,0.0) == f(c,p,0.0)
+@test ff(a,p,0.0) isa SVector
+@test typeof(ff(b,p,0.0)) <: SLArray
+@test ff(c,p,0.0) isa Vector
+@test ff(a,p,0.0) == ff(b,p,0.0)
+@test ff(a,p,0.0) == ff(c,p,0.0)
+
+@test ff.jac(a,p,0.0) isa SMatrix
+@test typeof(ff.jac(b,p,0.0)) <: SMatrix
+@test ff.jac(c,p,0.0) isa Matrix
+@test ff.jac(a,p,0.0) == ff.jac(b,p,0.0)
+@test ff.jac(a,p,0.0) == ff.jac(c,p,0.0)