Merge pull request #72 from huanglangwen/oop

fix error when x is a ndarray

Author: ChrisRackauckas

src/differentiation/compute_jacobian_ad.jl

@@ -88,7 +88,7 @@ function forwarddiff_color_jacobian(f,x::AbstractArray{<:Number},jac_cache::Forw
 
     vecx = vec(x)
 
-    J = jac_prototype isa Nothing ? (sparsity isa Nothing ? false .* dx .* x' : zeros(eltype(x),size(sparsity))) : zero(jac_prototype)
+    J = jac_prototype isa Nothing ? (sparsity isa Nothing ? false .* vec(dx) .* vecx' : zeros(eltype(x),size(sparsity))) : zero(jac_prototype)
     nrows,ncols = size(J)
 
     if !(sparsity isa Nothing)

test/test_ad.jl

@@ -208,4 +208,14 @@ Jsparse = sparse(J)
 colors = matrix_colors(J)
 forwarddiff_color_jacobian!(J, f, x, colorvec=colors)
 forwarddiff_color_jacobian!(Jsparse, f, x, colorvec=colors)
-@test J ≈ Jsparse
+@test J ≈ Jsparse
+
+# Non vector input
+x = rand(2,2)
+oopf(x) = x
+iipf(fx,x) = (fx.=x)
+J = forwarddiff_color_jacobian(oopf,x)
+@test J ≈ Matrix(I,4,4)
+J = zero(J)
+forwarddiff_color_jacobian!(J,iipf,x,dx=similar(x))
+@test J ≈ Matrix(I,4,4)