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

Improve dot performance #389

Merged
merged 80 commits into from
Aug 9, 2020
Merged

Improve dot performance #389

Changes from 1 commit
Commits
Show all changes
80 commits
Select commit Hold shift + click to select a range
9ea4053
Update core.py
daletovar Apr 19, 2019
aa14159
Merge pull request #1 from daletovar/daletovar-patch-1
daletovar Apr 19, 2019
fa9ef22
Update test_coo.py
daletovar Apr 30, 2019
1683e00
Update core.py
daletovar Apr 30, 2019
c70d397
Update test_coo.py
daletovar Apr 30, 2019
de14873
Add JUnit directory to gitignore.
hameerabbasi Apr 30, 2019
fa80a62
Fix Flake8 issues.
hameerabbasi Apr 30, 2019
91e0367
Fix up tests and code.
hameerabbasi Apr 30, 2019
e980993
Add docs.
hameerabbasi Apr 30, 2019
c826e62
Resolved merge.
daletovar Aug 28, 2019
a1f948c
change gxcs with gcxs
daletovar Aug 28, 2019
81b1b03
Update __init__.py
daletovar Aug 31, 2019
cf085fb
add html_table
daletovar Aug 31, 2019
551629b
add _repr_html_
daletovar Aug 31, 2019
de82d5b
add self.nbytes property and self.format attribute
daletovar Aug 31, 2019
2a0fdba
fix empty indptr for 1d and add self.format
daletovar Aug 31, 2019
16c707e
add self.format
daletovar Aug 31, 2019
937e819
remove whitespace
daletovar Aug 31, 2019
80a958b
remove failed example
daletovar Aug 31, 2019
fedd68a
Update _utils.py
daletovar Sep 1, 2019
d7516d4
Update compressed.py
daletovar Sep 1, 2019
8827ac4
add format property
daletovar Sep 6, 2019
9a4fd74
add format property
daletovar Sep 6, 2019
667eb57
add format
daletovar Sep 6, 2019
53ccd0f
remove spurious properties, add docs
daletovar Sep 6, 2019
a41a054
Update sparse/_utils.py
daletovar Sep 6, 2019
0a441ee
update html table
daletovar Sep 6, 2019
9cfdb09
Update test_compressed.py
daletovar Sep 6, 2019
9f8ccf6
Merge branch 'master' into sparse_html
daletovar Sep 6, 2019
77eabe5
Update compressed.py
daletovar Sep 6, 2019
702ca45
formatting
daletovar Sep 6, 2019
3cdeabd
formatting
daletovar Sep 6, 2019
e7a5e1d
formatting
daletovar Sep 6, 2019
341ddba
Update test_compressed.py
daletovar Sep 6, 2019
3cff972
formatting
daletovar Sep 6, 2019
fb0757b
Update core.py
daletovar Sep 6, 2019
33df589
formatting
daletovar Sep 6, 2019
5f9d3ef
Merge branch 'master' of https://github.com/pydata/sparse
daletovar Sep 18, 2019
e00cccc
add common
daletovar Oct 8, 2019
4928ad5
Resolve merge conflict
daletovar Nov 13, 2019
3d347fa
clean up indexing, fix bug for multiple compressed axes
daletovar Nov 25, 2019
811fcee
update
daletovar Feb 16, 2020
132ca3c
Update core.py
daletovar Apr 19, 2019
77fae53
Update test_coo.py
daletovar Apr 30, 2019
9b1f720
Update core.py
daletovar Apr 30, 2019
9288e47
Update test_coo.py
daletovar Apr 30, 2019
bf38b4d
Fix Flake8 issues.
hameerabbasi Apr 30, 2019
0956a25
Fix up tests and code.
hameerabbasi Apr 30, 2019
ec0c272
change gxcs with gcxs
daletovar Aug 28, 2019
b212d96
add self.nbytes property and self.format attribute
daletovar Aug 31, 2019
b1959a1
add self.format
daletovar Aug 31, 2019
196d24f
add format property
daletovar Sep 6, 2019
8017082
add format property
daletovar Sep 6, 2019
3b8b20f
add format
daletovar Sep 6, 2019
b886680
formatting
daletovar Sep 6, 2019
8e46dc5
formatting
daletovar Sep 6, 2019
cae6710
Merge branch 'master' of https://github.com/daletovar/sparse
daletovar Jul 16, 2020
afdcb90
refactor dot code
daletovar Jul 30, 2020
6a56a17
add io for gcxs
daletovar Jul 30, 2020
c21fd07
add docs, dot, flatten
daletovar Jul 30, 2020
4b11dfa
add matmul
daletovar Jul 30, 2020
2809752
remove slow csr csc algorithm, formatting
daletovar Aug 3, 2020
a5f64b9
Delete umath.py
daletovar Aug 3, 2020
5021b84
fix formatting
daletovar Aug 3, 2020
3dbed96
Merge branch 'dot' of https://github.com/daletovar/sparse into dot
daletovar Aug 3, 2020
fc5ed60
add import
daletovar Aug 3, 2020
2dc550b
fix import
daletovar Aug 3, 2020
11c8b6f
add return for COO and add import
daletovar Aug 3, 2020
f4be9ae
fix dtypes, add import
daletovar Aug 3, 2020
a47abbe
fix test
daletovar Aug 3, 2020
abc32b3
fix out dtype
daletovar Aug 4, 2020
fbe404c
remove redundant code
daletovar Aug 5, 2020
5b4f08a
add keyerror
daletovar Aug 5, 2020
eb8c0e5
remove unused variable
daletovar Aug 5, 2020
ae63040
remove coverage for jitted funcs
daletovar Aug 5, 2020
0a741ff
do all sorting after computing dot
daletovar Aug 6, 2020
2d7b159
update tests, docstrings
daletovar Aug 6, 2020
1114383
remove python 2 compat check
daletovar Aug 6, 2020
2b7a8e4
add formatting
daletovar Aug 6, 2020
1296798
add back @ test
daletovar Aug 7, 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
8 changes: 0 additions & 8 deletions sparse/tests/test_dot.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,14 +197,6 @@ def test_dot(a_shape, b_shape, a_format, b_format, a_comp_axes, b_comp_axes):
assert_eq(sparse.dot(sa, b), sparse.dot(a, sb))
assert_eq(np.dot(a, b), sparse.dot(sa, sb))

if hasattr(operator, "matmul"):
# Basic equivalences
assert_eq(operator.matmul(a, b), operator.matmul(sa, sb))
# Test that SOO's and np.array's combine correctly
# Not possible due to https://github.com/numpy/numpy/issues/9028
# assert_eq(eval("a @ sb"), eval("sa @ b"))


Copy link
Collaborator

Choose a reason for hiding this comment

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

This should be added back, only the "if" was unnecessary.

@pytest.mark.parametrize(
"a_dense, b_dense, o_type",
[
Expand Down