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.

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

Jump to bottom

[Lang] Experimental sparse matrix support on CPUs #2792

Merged
merged 77 commits into from
Aug 28, 2021
Merged

[Lang] Experimental sparse matrix support on CPUs #2792

merged 77 commits into from
Aug 28, 2021

Conversation

FantasyVR
Copy link
Collaborator

@FantasyVR FantasyVR commented Aug 24, 2021 •
edited
Loading

Related pr = #2657
Related issue = #2906

  • Support sparse matrix builder and sparse matrix class
  • Support some basic sparse matrix operations.

yuanming-hu and others added 30 commits August 10, 2021 17:01
@yuanming-hu
add eigen
f4d15f9
@yuanming-hu
sparse matrix class
05cde50
@yuanming-hu
InternalFuncStmt with arguments
a70566e
@yuanming-hu
FrontendInternalFuncStmt
9cc04d9
@yuanming-hu
insert_triple test
2c13631
@yuanming-hu
pass arguments
cf722e5
@yuanming-hu
internal func call with multiple arguments
8d2eedf
@yuanming-hu
frontend
45db6f4
@yuanming-hu
backend
8b91c29
@yuanming-hu
sparse_matrix.cpp
5aa0fbd
@yuanming-hu
bug fix
0bbd154
@yuanming-hu
build and print
a0abc24
@yuanming-hu
syntax sugar
10dd0d3
@yuanming-hu
enhance
c0802bd
@yuanming-hu
linear solve
5a1eea7
@yuanming-hu
remove eigen for submodule
462fac4
@taichi-gardener
Auto Format
d1cfe8b
@yuanming-hu
merge with master
6f699ad
@yuanming-hu
fix
2e7ce7b
@yuanming-hu
fixes
9c4d605
@Leonz5288 @FantasyVR
[ci] Reduce the number of python wheels built nightly (taichi-dev#2726)
c18c2b5 
* [ci] Reduce the number of python wheels built nightly
@FantasyVR
Create Sparse Matrix Builder
7d19225
@FantasyVR
SparseMatrix from SparseMatrix builder
bb3ae5a
@FantasyVR
Typo fix
3921cd9
@FantasyVR
build sparse matrix with -=
56c529b
@FantasyVR
move matrix from builder class to sparse matrix class
ddf0198
@FantasyVR
Basic operations for Sparse Matrix
a131c03
@FantasyVR
Bug fix
54e62ef
@FantasyVR
enhance
c8350f1
@FantasyVR
add sparse matrix test script
040b8dc
yuanming-hu
yuanming-hu reviewed Aug 26, 2021
View reviewed changes
Copy link
Member

@yuanming-hu yuanming-hu left a comment

Choose a reason for hiding this comment

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

Thanks! This is getting closer and closer to merging!

python/taichi/lang/sparse_matrix.py Outdated Show resolved Hide resolved
python/taichi/lang/sparse_matrix.py Outdated Show resolved Hide resolved
python/taichi/lang/sparse_matrix.py Outdated Show resolved Hide resolved
tests/python/test_sparse_matrix.py Outdated Show resolved Hide resolved
tests/python/test_sparse_matrix.py Outdated Show resolved Hide resolved
tests/python/test_sparse_matrix.py Outdated Show resolved Hide resolved
taichi/python/export_lang.cpp Outdated Show resolved Hide resolved
taichi/program/sparse_matrix.cpp Outdated Show resolved Hide resolved
taichi/program/sparse_matrix.cpp Outdated Show resolved Hide resolved
taichi/program/sparse_matrix.h Outdated Show resolved Hide resolved
FantasyVR and others added 3 commits August 26, 2021 22:25
@FantasyVR @yuanming-hu
Improve
5a0b9b9 
Co-authored-by: Yuanming Hu <yuanming-hu@users.noreply.github.com>
@FantasyVR
Enhance
18cb8fb
@FantasyVR
Test Improve
13c2d7f
@FantasyVR
Copy link
Collaborator Author

/format

squarefk
squarefk reviewed Aug 27, 2021
View reviewed changes
cmake/TaichiCore.cmake Outdated Show resolved Hide resolved
misc/sparse_matrix.py Outdated Show resolved Hide resolved
python/taichi/lang/kernel_impl.py Outdated Show resolved Hide resolved
taichi/python/export_lang.cpp Outdated Show resolved Hide resolved
taichi/python/export_lang.cpp Show resolved Hide resolved
taichi/ir/frontend_ir.h Outdated Show resolved Hide resolved
python/taichi/lang/sparse_matrix.py Outdated Show resolved Hide resolved
python/taichi/lang/sparse_matrix.py Outdated Show resolved Hide resolved
yuanming-hu
yuanming-hu reviewed Aug 28, 2021
View reviewed changes
Copy link
Member

@yuanming-hu yuanming-hu left a comment

Choose a reason for hiding this comment

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

My final pass with a few nits. This PR LGTM after these issues are fixed.

misc/sparse_matrix.py Outdated Show resolved Hide resolved
misc/sparse_matrix.py Outdated Show resolved Hide resolved
misc/sparse_matrix.py Outdated Show resolved Hide resolved
misc/sparse_matrix.py Outdated Show resolved Hide resolved
misc/sparse_matrix.py Outdated Show resolved Hide resolved
taichi/program/sparse_matrix.cpp Outdated Show resolved Hide resolved
taichi/program/sparse_matrix.h Outdated Show resolved Hide resolved
taichi/python/export_lang.cpp Outdated Show resolved Hide resolved
taichi/python/export_lang.cpp Outdated Show resolved Hide resolved
taichi/program/sparse_matrix.cpp Outdated Show resolved Hide resolved
FantasyVR and others added 2 commits August 28, 2021 12:18
@FantasyVR @yuanming-hu
Improve format and grammar
5031d8f 
Co-authored-by: Yuanming Hu <yuanming-hu@users.noreply.github.com>
@FantasyVR
Improve code format
454cea2
@FantasyVR
Copy link
Collaborator Author

/format

yuanming-hu
yuanming-hu approved these changes Aug 28, 2021
View reviewed changes
Copy link
Member

@yuanming-hu yuanming-hu left a comment

Choose a reason for hiding this comment

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

LGTM now! Thank you so much for the hard work.

@yuanming-hu
Copy link
Member

I'm merging this as admin since the CI fails only because of one flaky test case on OS X. Maybe @ljcc0930 can help disable that?

@yuanming-hu yuanming-hu changed the title [Lang] Support sparse matrix [Lang] Experimental sparse matrix support on CPUs Aug 28, 2021
@yuanming-hu yuanming-hu merged commit fa45dbb into taichi-dev:master Aug 28, 2021
@FantasyVR
Copy link
Collaborator Author

LGTM now! Thank you so much for the hard work.

Sorry for cost you guys so much time to review. I learned a lot this time. Thank you very much.

@yuanming-hu
Copy link
Member

LGTM now! Thank you so much for the hard work.

Sorry for cost you guys so much time to review. I learned a lot this time. Thank you very much.

No worries. It's always challenging to merge your first essential PR at Taichi :-) People's code quality usually dramatically improves during this event. It's always nice to follow conventions and pay attention to details.

@FantasyVR FantasyVR mentioned this pull request Aug 31, 2021
Merged
@Leonz5288 Leonz5288 mentioned this pull request Sep 2, 2021
Merged
@Hanke98 Hanke98 mentioned this pull request Oct 2, 2021
Merged
@k-ye k-ye mentioned this pull request Dec 13, 2021
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@k-ye k-ye k-ye left review comments

@squarefk squarefk squarefk left review comments

@yuanming-hu yuanming-hu yuanming-hu approved these changes

@ltt1598 ltt1598 Awaiting requested review from ltt1598

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@FantasyVR @k-ye @yuanming-hu @squarefk @taichi-gardener @Leonz5288