Skip to content
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.

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

Add support for sum and kronecker product of COO sparse matrices #45

Open
wants to merge 3 commits into
base: main
Choose a base branch
from

Conversation

albertomercurio
Copy link

Hello,

I added the support of the following operations:

  • A + B
  • kron(A, B)

where both A and B are SparseMatrixCOO

Copy link

codecov bot commented Jun 11, 2024

Codecov Report

Attention: Patch coverage is 97.56098% with 1 line in your changes missing coverage. Please review.

Project coverage is 86.41%. Comparing base (acbecad) to head (949de13).
Report is 2 commits behind head on main.

Current head 949de13 differs from pull request most recent head 7d346ca

Please upload reports for the commit 7d346ca to get more accurate results.

Files Patch % Lines
src/coo_linalg.jl 97.56% 1 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main      #45      +/-   ##
==========================================
+ Coverage   85.39%   86.41%   +1.02%     
==========================================
  Files           4        4              
  Lines         363      405      +42     
==========================================
+ Hits          310      350      +40     
- Misses         53       55       +2     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Copy link
Member

@tmigot tmigot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @albertomercurio for the PR! That's a great add.
I made some comments regarding the implementation.

@geoffroyleconte or @dpo would you have some time to check this PR too?

src/coo_linalg.jl Outdated Show resolved Hide resolved
src/coo_linalg.jl Outdated Show resolved Hide resolved
for j in eachindex(rowval_colvalA)
if rowval_colvalA[j] == rowval_colval[i]
nzval[i] += A.vals[j]
break
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If I am not wrong you assume here that each matrix has unique pair of (row, col) while I don't think it is necessary true.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But they should be unique, right? I mean, we should merge them in the moment of creating the sparse matrix, no?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Really sorry @albertomercurio , I completely lost track of this PR. There is a discussion on this https://github.com/orgs/JuliaSmoothOptimizers/discussions/51 , and the status is that QuadraticModels is not merging them by default.

rowval_colvalA = collect(zip(A.rows, A.cols))
rowval_colvalB = collect(zip(B.rows, B.cols))

rowval_colval = union(rowval_colvalA, rowval_colvalB)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think there should be a more efficient to do this. The union will iterate over both vectors, and to compute the sum you do it again. Would it be more efficient to do both at the same time?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

At the moment I don’t have anything in mind. Do you have an idea?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okay, let's create an issue on the package after this PR is merge to point out to this as a possible improvement.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How does SparseMatrixCSC do it?

for j in eachindex(rowval_colvalB)
if rowval_colvalB[j] == rowval_colval[i]
nzval[i] += B.vals[j]
break
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

see comment above

Bnnz = nnz(B)

if Annz == 0 || Bnnz == 0
return SparseMatrixCOO(Int[], Int[], T[], out_shape...)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be tested in the unit tests too

albertomercurio and others added 2 commits June 12, 2024 16:26
Co-authored-by: Tangi Migot <[email protected]>
Co-authored-by: Tangi Migot <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants