Merge pull request #91 from huanglangwen/oop4sp

fix oop jacobian for SparseMatrixCSC

Author: ChrisRackauckas

src/differentiation/compute_jacobian_ad.jl

@@ -108,11 +108,15 @@ function forwarddiff_color_jacobian(f,x::AbstractArray{<:Number},jac_cache::Forw
                 pick_inds = [i for i in 1:length(rows_index) if colorvec[cols_index[i]] == color_i]
                 rows_index_c = rows_index[pick_inds]
                 cols_index_c = cols_index[pick_inds]
-                len_rows = length(pick_inds)
-                unused_rows = setdiff(1:nrows,rows_index_c)
-                perm_rows = sortperm(vcat(rows_index_c,unused_rows))
-                cols_index_c = vcat(cols_index_c,zeros(Int,nrows-len_rows))[perm_rows]
-                Ji = [j==cols_index_c[i] ? dx[i] : false for i in 1:nrows, j in 1:ncols]
+                if J isa SparseMatrixCSC
+                    Ji = sparse(rows_index_c, cols_index_c, dx[rows_index_c],nrows,ncols)
+                else
+                    len_rows = length(pick_inds)
+                    unused_rows = setdiff(1:nrows,rows_index_c)
+                    perm_rows = sortperm(vcat(rows_index_c,unused_rows))
+                    cols_index_c = vcat(cols_index_c,zeros(Int,nrows-len_rows))[perm_rows]
+                    Ji = [j==cols_index_c[i] ? dx[i] : false for i in 1:nrows, j in 1:ncols]
+                end
                 J = J + Ji
                 color_i += 1
                 (color_i > maxcolor) && return J

test/test_ad.jl

@@ -106,6 +106,7 @@ forwarddiff_color_jacobian!(_J1, f, x, colorvec = repeat(1:3,10))
 fcalls = 0
 _J1 = forwarddiff_color_jacobian(oopf, x, colorvec = repeat(1:3,10), sparsity = _J, jac_prototype = _J)
 @test _J1 ≈ J
+@test typeof(_J1) == typeof(_J)
 @test fcalls == 1
 
 @info "third passed"
@@ -146,6 +147,7 @@ _nsqJ = forwarddiff_color_jacobian(nsqf, x, colorvec = repeat(1:3,10), sparsity
 @test _nsqJ ≈ nsqJ
 _nsqJ = forwarddiff_color_jacobian(nsqf, x, jac_prototype = SMatrix{15,30}(nsqJ))
 @test _nsqJ ≈ nsqJ
+@test typeof(_nsqJ) == typeof(SMatrix{15,30}(nsqJ))
 _nsqJ = forwarddiff_color_jacobian(staticnsqf, SVector{30}(x), jac_prototype = SMatrix{15,30}(nsqJ))
 @test _nsqJ ≈ nsqJ
 _nsqJ = forwarddiff_color_jacobian(staticnsqf, SVector{30}(x), jac_prototype = SMatrix{15,30}(nsqJ), colorvec = repeat(1:3,10), sparsity = spnsqJ)