Merge branch 'master' into travis-up

Author: matbesancon

Project.toml

@@ -1,7 +1,7 @@
 name = "SparseDiffTools"
 uuid = "47a9eef4-7e08-11e9-0b38-333d64bd3804"
 authors = ["Pankaj Mishra <[email protected]>", "Chris Rackauckas <[email protected]>"]
-version = "0.10.1"
+version = "0.10.2"
 
 [deps]
 Adapt = "79e6a3ab-5dfb-504d-930d-738a2a938a0e"

src/differentiation/compute_jacobian_ad.jl

@@ -120,7 +120,8 @@ function forwarddiff_color_jacobian(f,x::AbstractArray{<:Number},jac_cache::Forw
             for j in 1:chunksize
                 col_index = (i-1)*chunksize + j
                 (col_index > ncols) && return J
-                J = J + mapreduce(i -> i==col_index ? partials.(vec(fx), j) : zeros(nrows), hcat, 1:ncols)
+                Ji = mapreduce(i -> i==col_index ? partials.(vec(fx), j) : zeros(nrows), hcat, 1:ncols)
+                J = J + (size(Ji)!=size(J) ? reshape(Ji,size(J)) : Ji) #branch when size(dx) == (1,) => size(Ji) == (1,) while size(J) == (1,1)
             end
         end
     end

test/test_ad.jl

@@ -218,4 +218,10 @@ 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)
+@test J ≈ Matrix(I,4,4)
+
+#1x1 SVector test
+x = SVector{1}([1.])
+f(x) = x
+J = forwarddiff_color_jacobian(f,x)
+@test J ≈ SMatrix{1,1}([1.])