diff options
author | Matti Picus <matti.picus@gmail.com> | 2021-03-21 07:48:10 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-03-21 07:48:10 +0200 |
commit | 9e47444aa66ae055c3ef5a01d579d2eb52606f20 (patch) | |
tree | f96ff12e2a8072d3ea47624922914f44aa463f00 /numpy/lib/function_base.py | |
parent | 9629cd9221766b087478d3dceca8c260b76e82b7 (diff) | |
parent | 40b8ba3f43e28cb543bbb1d5aff095da264bafd8 (diff) | |
download | numpy-9e47444aa66ae055c3ef5a01d579d2eb52606f20.tar.gz |
Merge pull request #18642 from seberg/splitup-faster-argparsing-optimize-asarray
ENH: Use new argument parsing for array creation functions
Diffstat (limited to 'numpy/lib/function_base.py')
-rw-r--r-- | numpy/lib/function_base.py | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/numpy/lib/function_base.py b/numpy/lib/function_base.py index c6db42ce4..44eac31ef 100644 --- a/numpy/lib/function_base.py +++ b/numpy/lib/function_base.py @@ -593,7 +593,7 @@ def piecewise(x, condlist, funclist, *args, **kw): not isinstance(condlist[0], (list, ndarray)) and x.ndim != 0): condlist = [condlist] - condlist = array(condlist, dtype=bool) + condlist = asarray(condlist, dtype=bool) n = len(condlist) if n == n2 - 1: # compute the "otherwise" condition. @@ -2191,15 +2191,14 @@ class vectorize: ufunc, otypes = self._get_ufunc_and_otypes(func=func, args=args) # Convert args to object arrays first - inputs = [array(a, copy=False, subok=True, dtype=object) - for a in args] + inputs = [asanyarray(a, dtype=object) for a in args] outputs = ufunc(*inputs) if ufunc.nout == 1: - res = array(outputs, copy=False, subok=True, dtype=otypes[0]) + res = asanyarray(outputs, dtype=otypes[0]) else: - res = tuple([array(x, copy=False, subok=True, dtype=t) + res = tuple([asanyarray(x, dtype=t) for x, t in zip(outputs, otypes)]) return res |