Skip to content

Fix MTK.build_function on "arrays of sparse matrices" and "arrays of arrays of sparse matrices" #423

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jun 3, 2020
Merged

Fix MTK.build_function on "arrays of sparse matrices" and "arrays of arrays of sparse matrices" #423

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
57ef119
Merge pull request #1 from SciML/master
wupeifan Apr 17, 2020
2e451ff
Merge pull request #2 from SciML/master
wupeifan Apr 23, 2020
a6529c9
Merge pull request #3 from SciML/master
wupeifan Jun 2, 2020
8284f97
Update build_function.jl
wupeifan Jun 2, 2020
1de7201
update related test
wupeifan Jun 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/build_function.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,10 +173,10 @@ function _build_function(target::JuliaTarget, rhss, args...;

if eltype(eltype(rhss)) <: AbstractArray # Array of arrays of arrays
ip_sys_exprs = reduce(vcat,[vec(reduce(vcat,[vec([:($X[$i][$j][$k] = $(conv(rhs))) for (k, rhs) ∈ enumerate(rhsel2)]) for (j, rhsel2) ∈ enumerate(rhsel)],init=Expr[])) for (i,rhsel) ∈ enumerate(_rhss)],init=Expr[])
elseif eltype(eltype(rhss)) <: SparseMatrixCSC # Array of arrays of arrays
ip_sys_exprs = reduce(vcat,[vec(reduce(vcat,[vec([:($X[$i][$j].nzval[$k] = $(conv(rhs))) for (k, rhs) ∈ enumerate(rhsel2)]) for (j, rhsel2) ∈ enumerate(rhsel)])) for (i,rhsel) ∈ enumerate(_rhss)])
elseif eltype(eltype(rhss)) <: SparseMatrixCSC # Array of arrays of sparse matrices
ip_sys_exprs = reduce(vcat,[vec(reduce(vcat,[vec([:($X[$i][$j].nzval[$k] = $(conv(rhs))) for (k, rhs) ∈ enumerate(rhsel2.nzval)]) for (j, rhsel2) ∈ enumerate(rhsel)])) for (i,rhsel) ∈ enumerate(_rhss)])
elseif eltype(rhss) <: SparseMatrixCSC # Array of sparse matrices
ip_sys_exprs = reduce(vcat,[vec([:($X[$i].nzval[$j] = $(conv(rhs))) for (j, rhs) ∈ enumerate(rhsel)]) for (i,rhsel) ∈ enumerate(_rhss)])
ip_sys_exprs = reduce(vcat,[vec([:($X[$i].nzval[$j] = $(conv(rhs))) for (j, rhs) ∈ enumerate(rhsel.nzval)]) for (i,rhsel) ∈ enumerate(_rhss)])
elseif eltype(rhss) <: AbstractArray # Array of arrays
ip_sys_exprs = reduce(vcat,[vec([:($X[$i][$j] = $(conv(rhs))) for (j, rhs) ∈ enumerate(rhsel)]) for (i,rhsel) ∈ enumerate(_rhss)], init = Expr[])
elseif rhss isa SparseMatrixCSC
Expand Down
4 changes: 2 additions & 2 deletions test/build_function_arrayofarray.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,8 +114,8 @@ julia_sparse_arraymat = h_sparse_arraymat_julia(input)
mtk_sparse_arraymat = h_sparse_arraymat_oop(input)
@test_broken julia_sparse_arraymat == mtk_sparse_arraymat
h_sparse_arraymat_julia!(out_1_arraymat, input)
@test_broken h_sparse_arraymat_ip!(out_2_arraymat, input)
@test_broken out_1_arraymat == out_2_arraymat
h_sparse_arraymat_ip!(out_2_arraymat, input)
@test out_1_arraymat == out_2_arraymat

# Array of 1D Vectors
h_sparse_arrayvec = sparse.([[a, 0, c], [0, 0, 0], [1, a, b]])
Expand Down