Author: mattip
Branch: numpypy-axisops
Changeset: r51067:5e2f7e1b6648
Date: 2012-01-06 13:22 +0200
http://bitbucket.org/pypy/pypy/changeset/5e2f7e1b6648/
Log: cleanup
diff --git a/pypy/module/micronumpy/interp_iter.py
b/pypy/module/micronumpy/interp_iter.py
--- a/pypy/module/micronumpy/interp_iter.py
+++ b/pypy/module/micronumpy/interp_iter.py
@@ -124,7 +124,7 @@
self.offset = arr_start
self.dim = dim
self.dim_order = []
- if self.dim >=0:
+ if self.dim >= 0:
self.dim_order.append(self.dim)
for i in range(self.shapelen - 1, -1, -1):
if i == self.dim:
@@ -132,7 +132,7 @@
self.dim_order.append(i)
self.strides = strides
self.backstrides = backstrides
-
+
def done(self):
return self._done
@@ -175,6 +175,7 @@
self.indices = [0] * (len(arr.shape) - 1)
self.done = False
self.offset = arr.start
+
def next(self):
for i in range(len(self.arr.shape) - 2, -1, -1):
if self.indices[i] < self.arr.shape[i] - 1:
@@ -186,4 +187,3 @@
self.offset -= self.arr.backstrides[i]
else:
self.done = True
-
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
@@ -567,7 +567,7 @@
def descr_mean(self, space, w_dim=None):
if space.is_w(w_dim, space.w_None):
w_dim = space.wrap(-1)
- return space.div(self.descr_sum_promote(space, w_dim),
+ return space.div(self.descr_sum_promote(space, w_dim),
space.wrap(self.size))
def descr_nonzero(self, space):
@@ -750,7 +750,7 @@
class Reduce(VirtualArray):
def __init__(self, binfunc, name, dim, res_dtype, values, identity=None):
- shape = values.shape[0:dim] + values.shape[dim+1:len(values.shape)]
+ shape = values.shape[0:dim] + values.shape[dim + 1:len(values.shape)]
VirtualArray.__init__(self, name, shape, res_dtype)
self.values = values
self.size = 1
@@ -789,12 +789,12 @@
self.values = self.values.get_concrete()
shapelen = len(result.shape)
objlen = len(self.values.shape)
- sig = self.find_sig(res_shape=result.shape,arr=self.values)
+ sig = self.find_sig(res_shape=result.shape, arr=self.values)
ri = ArrayIterator(result.size)
frame = sig.create_frame(self.values, dim=self.dim)
value = self.get_identity(sig, frame, shapelen)
while not frame.done():
- #XXX add jit_merge_point ?
+ #XXX add jit_merge_point
if frame.iterators[0].axis_done:
value = self.get_identity(sig, frame, shapelen)
ri = ri.next(shapelen)
@@ -942,7 +942,7 @@
view.to_str(space, comma, builder, indent=indent + ' ',
use_ellipsis=use_ellipsis)
if i < self.shape[0] - 1:
- builder.append(ccomma +'\n' + indent + '...' + ncomma)
+ builder.append(ccomma + '\n' + indent + '...' + ncomma)
i = self.shape[0] - 3
else:
i += 1
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
@@ -135,7 +135,7 @@
sig = find_sig(ReduceSignature(self.func, self.name, dtype,
ScalarSignature(dtype),
obj.create_sig(obj.shape)), obj)
- frame = sig.create_frame(obj,dim=-1)
+ frame = sig.create_frame(obj, dim=-1)
if self.identity is None:
value = sig.eval(frame, obj).convert_to(dtype)
frame.next(shapelen)
@@ -408,7 +408,8 @@
identity = extra_kwargs.get("identity")
if identity is not None:
- identity =
interp_dtype.get_dtype_cache(space).w_longdtype.box(identity)
+ identity = \
+ interp_dtype.get_dtype_cache(space).w_longdtype.box(identity)
extra_kwargs["identity"] = identity
func = ufunc_dtype_caller(space, ufunc_name, op_name, argcount,
diff --git a/pypy/module/micronumpy/signature.py
b/pypy/module/micronumpy/signature.py
--- a/pypy/module/micronumpy/signature.py
+++ b/pypy/module/micronumpy/signature.py
@@ -320,8 +320,9 @@
class ReduceSignature(Call2):
def _create_iter(self, iterlist, arraylist, arr, res_shape, chunklist,
dim):
- if dim<0:
- self.right._create_iter(iterlist, arraylist, arr, res_shape,
chunklist, dim)
+ if dim < 0:
+ self.right._create_iter(iterlist, arraylist, arr, res_shape,
+ chunklist, dim)
else:
from pypy.module.micronumpy.interp_numarray import ConcreteArray
concr = arr.get_concrete()
@@ -330,7 +331,7 @@
if self.iter_no >= len(iterlist):
_iter = axis_iter_from_arr(concr, dim)
from interp_iter import AxisIterator
- assert isinstance(_iter, AxisIterator)
+ assert isinstance(_iter, AxisIterator)
iterlist.append(_iter)
if self.array_no >= len(arraylist):
arraylist.append(storage)
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
