Skip to content

Commit

Permalink
MAINT: rename broadcast_collect paramnames to use snake_case
Browse files Browse the repository at this point in the history
  • Loading branch information
llllllllll committed Nov 20, 2015
1 parent 34131bc commit adcfccf
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 12 deletions.
7 changes: 5 additions & 2 deletions blaze/compute/dask.py
Expand Up @@ -39,8 +39,11 @@ def compute_broadcast(expr, *data, **kwargs):
*concat((dat, tuple(range(ndim(dat))[::-1])) for dat in data))

def optimize_array(expr, *data):
return broadcast_collect(expr, Broadcastable=Broadcastable,
WantToBroadcast=Broadcastable)
return broadcast_collect(
expr,
broadcastable=Broadcastable,
want_to_broadcast=Broadcastable,
)

for i in range(5):
compute_up.register(Broadcast, *([(Array, Number)] * i))(compute_broadcast)
Expand Down
10 changes: 6 additions & 4 deletions blaze/compute/numexpr.py
Expand Up @@ -59,13 +59,15 @@ def print_numexpr(leaves, expr):
return '%s%s' % (expr.symbol, parenthesize(child))
if isinstance(expr, isnan):
child = print_numexpr(leaves, expr._child)
return '%s != %s' % (parenthsize(child), parenthesize(child))
return '%s != %s' % (parenthesize(child), parenthesize(child))

This comment has been minimized.

Copy link
@cpcloud

cpcloud Nov 20, 2015

nice catch

raise NotImplementedError("Operation %s not supported by numexpr" %
type(expr).__name__)


Broadcastable = WantToBroadcast = BinOp, UnaryOp

broadcast_numexpr_collect = curry(broadcast_collect,
Broadcastable=Broadcastable,
WantToBroadcast=WantToBroadcast)
broadcast_numexpr_collect = curry(
broadcast_collect,
broadcastable=Broadcastable,
want_to_broadcast=WantToBroadcast
)
7 changes: 5 additions & 2 deletions blaze/compute/pytables.py
Expand Up @@ -157,8 +157,11 @@ def compute_up(expr, x, **kwargs):

@dispatch(Expr, tb.Table)
def optimize(expr, seq):
return broadcast_numexpr_collect(expr, Broadcastable=Broadcastable,
WantToBroadcast=WantToBroadcast)
return broadcast_numexpr_collect(
expr,
broadcastable=Broadcastable,
want_to_broadcast=WantToBroadcast,
)


@dispatch(nelements, tb.Table)
Expand Down
14 changes: 10 additions & 4 deletions blaze/expr/tests/test_broadcast.py
Expand Up @@ -59,8 +59,11 @@ def test_optimize_broadcast():
expr = (t.distinct().x + 1).distinct()

expected = broadcast(t.distinct().x + 1, [t.distinct()]).distinct()
result = broadcast_collect(expr, Broadcastable=(Field, Arithmetic),
WantToBroadcast=(Field, Arithmetic))
result = broadcast_collect(
expr,
broadcastable=(Field, Arithmetic),
want_to_broadcast=(Field, Arithmetic),
)

assert result.isidentical(expected)

Expand All @@ -76,8 +79,11 @@ def test_leaves_of_type():
def test_broadcast_collect_doesnt_collect_scalars():
expr = xx + yy * a

assert broadcast_collect(expr, Broadcastable=Arithmetic,
WantToBroadcast=Arithmetic).isidentical(expr)
assert broadcast_collect(
expr,
broadcastable=Arithmetic,
want_to_broadcast=Arithmetic,
).isidentical(expr)


def test_table_broadcast():
Expand Down

0 comments on commit adcfccf

Please sign in to comment.