Skip to content

Add @ operator (simplify) #16

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 26 commits into from
May 9, 2017
Merged

Add @ operator (simplify) #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
924118c
Add @ operator
May 2, 2017
3a7b720
test for __rmatmul__
May 2, 2017
4e3e343
Better implementation of __rmatmul__ and test that exercises the actu…
May 2, 2017
45770f6
Not final (probably), but implement both directions of COO @ list
May 2, 2017
9656393
Tweak to pass Travis CI (flake8 is really picky)
May 2, 2017
d385699
Improve logic for coercion to (dense) array
May 3, 2017
b0ee83e
Remove handline of lists etc.
May 3, 2017
b5326ac
Remove handling of lists etc.
May 3, 2017
3091941
Remove handling of lists etc.
May 3, 2017
8882fce
Cleanup on review comments for PR#16
May 4, 2017
3626878
Merge branch 'master' into master
May 9, 2017
ad05515
Add @ operator
May 2, 2017
6c34521
test for __rmatmul__
May 2, 2017
ab01138
Better implementation of __rmatmul__ and test that exercises the actu…
May 2, 2017
8a6bd65
Cleanup tests of coersion failure
May 9, 2017
e548cbe
Cleanup tests of coersion failure
May 9, 2017
328f879
test for __rmatmul__
May 2, 2017
5338719
Cleanup errors in rebase/merge
May 9, 2017
1fe22b0
# This is a combination of 3 commits.
May 2, 2017
c121dab
Resolve merge on rebase
May 9, 2017
58da53e
Resolve merge on rebase
May 9, 2017
89c0f49
Resolve merge on rebase
May 9, 2017
702f273
Resolve merge on rebase
May 9, 2017
7cfc5b1
# This is a combination of 3 commits.
May 9, 2017
eb059cc
Resolve merge on rebase
May 9, 2017
10da2d3
Merge branch 'master' of github.com:ContinuumIO/sparse
May 9, 2017
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
19 changes: 19 additions & 0 deletions sparse/core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -375,6 +375,21 @@ def T(self):
def dot(self, other):
return dot(self, other)

def __matmul__(self, other):
try:
return dot(self, other)
except NotImplementedError:
return NotImplemented

def __rmatmul__(self, other):
try:
return dot(other, self)
except NotImplementedError:
return NotImplemented

def __numpy_ufunc__(self, ufunc, method, i, inputs, **kwargs):
return NotImplemented

def linear_loc(self, signed=False):
""" Index location of every piece of data in a flattened array

Expand Down Expand Up @@ -802,6 +817,10 @@ def tensordot(a, b, axes=2):


def dot(a, b):
if not hasattr(a, 'ndim') or not hasattr(b, 'ndim'):
raise NotImplementedError(
"Cannot perform dot product on types %s, %s" %
(type(a), type(b)))
return tensordot(a, b, axes=((a.ndim - 1,), (b.ndim - 2,)))


Expand Down
28 changes: 28 additions & 0 deletions sparse/tests/test_core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,7 @@ def test_tensordot(a_shape, b_shape, axes):


def test_dot():
import operator
a = random_x((3, 4, 5))
b = random_x((5, 6))

Expand All @@ -136,6 +137,33 @@ def test_dot():
assert_eq(a.dot(b), sa.dot(sb))
assert_eq(np.dot(a, b), sparse.dot(sa, sb))

if hasattr(operator, 'matmul'):
# Basic equivalences
assert_eq(eval("a @ b"), eval("sa @ sb"))
assert_eq(eval("sa @ sb"), sparse.dot(sa, sb))

# Test that SOO's and np.array's combine correctly
assert_eq(eval("a @ sb"), eval("sa @ b"))
Copy link
Contributor

Choose a reason for hiding this comment

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

I think we could also check np.dot(sa, sb). If the classes are set up correctly, this should know how to delegate to sparse.dot (though I think it requires __numpy_ufunc__)

Copy link
Author

Choose a reason for hiding this comment

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

This gets a failure that doesn't seem straightforward to fix. But moreover, I wouldn't really expect it to work as a user.

sparse/core.py:448: in __mul__
    return self.elemwise_binary(operator.mul, other)
_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _

self = <COO: shape=(3, 4, 5), dtype=float64, nnz=6>
func = <built-in function mul>
other = <COO: shape=(5, 6), dtype=float64, nnz=4>, args = (), kwargs = {}

    def elemwise_binary(self, func, other, *args, **kwargs):
        assert isinstance(other, COO)
        if kwargs.pop('check', True) and func(0, 0, *args, **kwargs) != 0:
            raise ValueError("Performing this operation would produce "
                    "a dense result: %s" % str(func))
        if self.shape != other.shape:
>           raise NotImplementedError("Broadcasting is not supported")
E           NotImplementedError: Broadcasting is not supported

sparse/core.py:478: NotImplementedError

Copy link
Contributor

Choose a reason for hiding this comment

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

Weird.. that error comes from the fact that np.dot(sa, sb) ends up calling sa.__mul__(sb), which... I have no idea why it would do that.



@pytest.mark.xfail
def test_dot_nocoercion():
a = random_x((3, 4, 5))
b = random_x((5, 6))

la = a.tolist()
lb = b.tolist()
la, lb # silencing flake8

sa = COO.from_numpy(a)
sb = COO.from_numpy(b)
sa, sb # silencing flake8

if hasattr(operator, 'matmul'):
# Operations with naive collection (list)
assert_eq(eval("la @ b"), eval("la @ sb"))
assert_eq(eval("a @ lb"), eval("sa @ lb"))


@pytest.mark.parametrize('func', [np.expm1, np.log1p, np.sin, np.tan,
np.sinh, np.tanh, np.floor, np.ceil,
Expand Down