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

Fix fuse with *args without input_num #2598

Merged
merged 4 commits into from
Apr 19, 2017
Merged

Fix fuse with *args without input_num #2598

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
11676b0
Fix fuse with *args without input_num
niboshi Apr 19, 2017
0f98390
Remove unused import
niboshi Apr 19, 2017
1205784
Fix kwargs syntax for Python 2.x
niboshi Apr 19, 2017
713bc3e
Put off kwargs following review
niboshi Apr 19, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 5 additions & 4 deletions cupy/core/fusion.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import inspect
import six
from six.moves import builtins
import string
Expand Down Expand Up @@ -489,8 +488,6 @@ def _get_fix_code(data_type, fixed_type, operation):


def _get_fusion(func, nin, reduce, post_map, identity, input_types, name=None):
if nin is None:
nin = len(inspect.getargspec(func).args)
in_vars = [_FusionVar(i, t) for i, t in enumerate(input_types)]
mem = _FusionMem(in_vars)
in_refs = [_FusionRef(_, mem) for _ in in_vars]
Expand Down Expand Up @@ -611,7 +608,11 @@ def is_cupy_data(a):
types = [_.dtype for _ in args]
key = tuple(types)
if key not in self._memo:
f = _get_fusion(self.func, self.input_num, self.reduce,
if self.input_num is not None:
nin = self.input_num
else:
nin = len(args)
f = _get_fusion(self.func, nin, self.reduce,
self.post_map, self.identity, types)
self._memo[key] = f
f = self._memo[key]
Expand Down
20 changes: 18 additions & 2 deletions tests/cupy_tests/core_tests/test_fusion.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -543,8 +543,16 @@ def random_real(self, lower=-1000, higher=1000):
return numpy.random.rand(10, 10) * (higher - lower) + lower

def check(self, func, n, gen, *args):
self._check(func, n, gen, *args, omit_nin=True)
self._check(func, n, gen, *args, omit_nin=False)

@cupy.fuse(input_num=n)
def _check(self, func, n, gen, *args, **kwargs):
Copy link
Member

Choose a reason for hiding this comment

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

How about this code?

def check(self, func, n, gen, *args):
    self._check(func, n, gen, args, True)

def _check(self, func, n, gen, args, omit_nin):
    nin = n if not omit_nin else None

omit_nin = kwargs.pop('omit_nin', False)
assert len(kwargs) == 0

nin = n if not omit_nin else None

@cupy.fuse(input_num=nin)
def f(*x):
return func(*x)

Expand All @@ -569,8 +577,16 @@ def f(*x):
numpy.testing.assert_array_almost_equal(n, fc.get())

def check_reduce(self, func, n, reduce_f, gen, *args):
self._check_reduce(func, n, reduce_f, gen, *args, omit_nin=True)
self._check_reduce(func, n, reduce_f, gen, *args, omit_nin=False)

def _check_reduce(self, func, n, reduce_f, gen, *args, **kwargs):
Copy link
Member

Choose a reason for hiding this comment

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

ditto

omit_nin = kwargs.pop('omit_nin', False)
assert len(kwargs) == 0

nin = n if not omit_nin else None

@cupy.fuse(input_num=n, reduce=reduce_f)
@cupy.fuse(input_num=nin, reduce=reduce_f)
def f(*x):
return func(*x)

Expand Down