Author: Ronan Lamy <ronan.l...@gmail.com>
Branch: use_min_scalar
Changeset: r77790:f1baee239d59
Date: 2015-06-02 20:16 +0100
http://bitbucket.org/pypy/pypy/changeset/f1baee239d59/
Log: use_min_scalar can never be true for unary ufuncs
diff --git a/pypy/module/micronumpy/ufuncs.py b/pypy/module/micronumpy/ufuncs.py
--- a/pypy/module/micronumpy/ufuncs.py
+++ b/pypy/module/micronumpy/ufuncs.py
@@ -495,17 +495,12 @@
return dt_in, dt_out, self.func
def _calc_dtype(self, space, arg_dtype, out=None, casting='unsafe'):
- use_min_scalar = False
if arg_dtype.is_object():
return arg_dtype, arg_dtype
in_casting = safe_casting_mode(casting)
for dt_in, dt_out in self.dtypes:
- if use_min_scalar:
- if not can_cast_array(space, w_arg, dt_in, in_casting):
- continue
- else:
- if not can_cast_type(space, arg_dtype, dt_in, in_casting):
- continue
+ if not can_cast_type(space, arg_dtype, dt_in, in_casting):
+ continue
if out is not None:
res_dtype = out.get_dtype()
if not can_cast_type(space, dt_out, res_dtype, casting):
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
