Author: Brian Kearns <[email protected]>
Branch:
Changeset: r67699:0fdb3c6fa80c
Date: 2013-10-29 13:22 -0400
http://bitbucket.org/pypy/pypy/changeset/0fdb3c6fa80c/
Log: fix spelling of cumulative attribute
diff --git a/pypy/module/micronumpy/interp_numarray.py
b/pypy/module/micronumpy/interp_numarray.py
--- a/pypy/module/micronumpy/interp_numarray.py
+++ b/pypy/module/micronumpy/interp_numarray.py
@@ -861,7 +861,7 @@
# ----------------------- reduce -------------------------------
def _reduce_ufunc_impl(ufunc_name, promote_to_largest=False,
- cumultative=False):
+ cumulative=False):
def impl(self, space, w_axis=None, w_dtype=None, w_out=None):
if space.is_none(w_out):
out = None
@@ -872,9 +872,9 @@
out = w_out
return getattr(interp_ufuncs.get(space), ufunc_name).reduce(
space, self, promote_to_largest, w_axis,
- False, out, w_dtype, cumultative=cumultative)
+ False, out, w_dtype, cumulative=cumulative)
return func_with_new_name(impl, "reduce_%s_impl_%d_%d" % (ufunc_name,
- promote_to_largest, cumultative))
+ promote_to_largest, cumulative))
descr_sum = _reduce_ufunc_impl("add")
descr_sum_promote = _reduce_ufunc_impl("add", True)
@@ -884,8 +884,8 @@
descr_all = _reduce_ufunc_impl('logical_and')
descr_any = _reduce_ufunc_impl('logical_or')
- descr_cumsum = _reduce_ufunc_impl('add', cumultative=True)
- descr_cumprod = _reduce_ufunc_impl('multiply', cumultative=True)
+ descr_cumsum = _reduce_ufunc_impl('add', cumulative=True)
+ descr_cumprod = _reduce_ufunc_impl('multiply', cumulative=True)
def _reduce_argmax_argmin_impl(op_name):
def impl(self, space, w_axis=None, w_out=None):
diff --git a/pypy/module/micronumpy/interp_ufuncs.py
b/pypy/module/micronumpy/interp_ufuncs.py
--- a/pypy/module/micronumpy/interp_ufuncs.py
+++ b/pypy/module/micronumpy/interp_ufuncs.py
@@ -87,7 +87,7 @@
out = w_out
return self.reduce(space, w_obj, False, #do not promote_to_largest
w_axis, True, #keepdims must be true
- out, w_dtype, cumultative=True)
+ out, w_dtype, cumulative=True)
@unwrap_spec(skipna=bool, keepdims=bool)
def descr_reduce(self, space, w_obj, w_axis=None, w_dtype=None,
@@ -159,7 +159,7 @@
w_dtype)
def reduce(self, space, w_obj, promote_to_largest, w_axis,
- keepdims=False, out=None, dtype=None, cumultative=False):
+ keepdims=False, out=None, dtype=None, cumulative=False):
if self.argcount != 2:
raise OperationError(space.w_ValueError, space.wrap("reduce only "
"supported for binary functions"))
@@ -193,7 +193,7 @@
"%s.reduce without identity", self.name)
if shapelen > 1 and axis < shapelen:
temp = None
- if cumultative:
+ if cumulative:
shape = obj_shape[:]
temp_shape = obj_shape[:axis] + obj_shape[axis + 1:]
if out:
@@ -227,15 +227,15 @@
else:
out = W_NDimArray.from_shape(space, shape, dtype,
w_instance=obj)
return loop.do_axis_reduce(shape, self.func, obj, dtype, axis, out,
- self.identity, cumultative, temp)
- if cumultative:
+ self.identity, cumulative, temp)
+ if cumulative:
if out:
if out.get_shape() != [obj.get_size()]:
raise OperationError(space.w_ValueError, space.wrap(
"out of incompatible size"))
else:
out = W_NDimArray.from_shape(space, [obj.get_size()], dtype,
w_instance=obj)
- loop.compute_reduce_cumultative(obj, out, dtype, self.func,
+ loop.compute_reduce_cumulative(obj, out, dtype, self.func,
self.identity)
return out
if out:
diff --git a/pypy/module/micronumpy/iter.py b/pypy/module/micronumpy/iter.py
--- a/pypy/module/micronumpy/iter.py
+++ b/pypy/module/micronumpy/iter.py
@@ -275,11 +275,11 @@
return self.indexes[d]
class AxisIterator(base.BaseArrayIterator):
- def __init__(self, array, shape, dim, cumultative):
+ def __init__(self, array, shape, dim, cumulative):
self.shape = shape
strides = array.get_strides()
backstrides = array.get_backstrides()
- if cumultative:
+ if cumulative:
self.strides = strides
self.backstrides = backstrides
elif len(shape) == len(strides):
diff --git a/pypy/module/micronumpy/loop.py b/pypy/module/micronumpy/loop.py
--- a/pypy/module/micronumpy/loop.py
+++ b/pypy/module/micronumpy/loop.py
@@ -159,7 +159,7 @@
greens = ['shapelen', 'func', 'dtype'],
reds = 'auto')
-def compute_reduce_cumultative(obj, out, calc_dtype, func, identity):
+def compute_reduce_cumulative(obj, out, calc_dtype, func, identity):
obj_iter = obj.create_iter()
out_iter = out.create_iter()
cur_value = identity.convert_to(calc_dtype)
@@ -218,10 +218,10 @@
'func', 'dtype'],
reds='auto')
-def do_axis_reduce(shape, func, arr, dtype, axis, out, identity, cumultative,
+def do_axis_reduce(shape, func, arr, dtype, axis, out, identity, cumulative,
temp):
- out_iter = out.create_axis_iter(arr.get_shape(), axis, cumultative)
- if cumultative:
+ out_iter = out.create_axis_iter(arr.get_shape(), axis, cumulative)
+ if cumulative:
temp_iter = temp.create_axis_iter(arr.get_shape(), axis, False)
else:
temp_iter = out_iter # hack
@@ -240,7 +240,7 @@
cur = temp_iter.getitem()
w_val = func(dtype, cur, w_val)
out_iter.setitem(w_val)
- if cumultative:
+ if cumulative:
temp_iter.setitem(w_val)
temp_iter.next()
arr_iter.next()
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
