Added sparse*diagonal, diagonal*sparse methods and tests. Fixes #14416. #14461
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| @inbounds for k=1:length(nzval) | ||
| Ynzval[k] = X[rowval[k],rowval[k]] * nzval[k] | ||
| end | ||
| SparseMatrixCSC(A.m, A.n, A.colptr, A.rowval, Ynzval) |
There was a problem hiding this comment.
copy the colptr and rowval otherwise these alias
kshyatt
force-pushed
the
ksh/sparsediag
branch
from
0212afc to
fa7dfaf
Compare
| rowval = A.rowval | ||
| nzval = A.nzval | ||
| @inbounds for col = 1:A.n, k=A.colptr[col]:(A.colptr[col+1]-1) | ||
| Ynzval[k] += X[col, col] * nzval[k] |
There was a problem hiding this comment.
This shouldn't need to be += since colptr is nondecreasing. Also would be better to use Array rather than zeros to initialize the nonzeros since you can make sparse matrices with element types that don't have zero defined.
kshyatt
force-pushed
the
ksh/sparsediag
branch
from
fa7dfaf to
f34a8b8
Compare
| rowval = A.rowval | ||
| nzval = A.nzval | ||
| @inbounds for k=1:length(nzval) | ||
| Ynzval[k] = X.diag[rowval[k]] * nzval[k] |
There was a problem hiding this comment.
the .diag field access may be worth hoisting
|
@kshyatt Thanks for providing these. I think it would make sense to define them as methods for |
|
@andreasnoack that seems much better, actually, because we will minimize code duplication. Will update. |
kshyatt
force-pushed
the
ksh/sparsediag
branch
from
f34a8b8 to
6b607e0
Compare
|
Good to go? |
tkelman
added a commit
that referenced
this pull request
Dec 23, 2015
Added sparse*diagonal, diagonal*sparse methods and tests. Fixes #14416.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.