diff options
author | Matti Picus <matti.picus@gmail.com> | 2020-07-25 20:46:12 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-07-25 20:46:12 +0300 |
commit | f457a1a9e9b5e5fff92dd5735052e7654b167de7 (patch) | |
tree | 680670808d8cffd8c7d86e84739204eeadc6e8d6 /numpy/lib/index_tricks.py | |
parent | 6c8be6a7bdfc1a262199658ed4d17d7f3c39711a (diff) | |
parent | fe708577504f590d1c51f8505296686ea0106efa (diff) | |
download | numpy-f457a1a9e9b5e5fff92dd5735052e7654b167de7.tar.gz |
Merge pull request #16815 from cjblocker/mgrid-float
BUG: fix mgrid output for lower precision float inputs
Diffstat (limited to 'numpy/lib/index_tricks.py')
-rw-r--r-- | numpy/lib/index_tricks.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/numpy/lib/index_tricks.py b/numpy/lib/index_tricks.py index cba713ede..2833e1072 100644 --- a/numpy/lib/index_tricks.py +++ b/numpy/lib/index_tricks.py @@ -154,15 +154,15 @@ class nd_grid: start = 0 if step is None: step = 1 - if isinstance(step, complex): + if isinstance(step, (_nx.complexfloating, complex)): size.append(int(abs(step))) typ = float else: size.append( int(math.ceil((key[k].stop - start)/(step*1.0)))) - if (isinstance(step, float) or - isinstance(start, float) or - isinstance(key[k].stop, float)): + if (isinstance(step, (_nx.floating, float)) or + isinstance(start, (_nx.floating, float)) or + isinstance(key[k].stop, (_nx.floating, float))): typ = float if self.sparse: nn = [_nx.arange(_x, dtype=_t) @@ -176,7 +176,7 @@ class nd_grid: start = 0 if step is None: step = 1 - if isinstance(step, complex): + if isinstance(step, (_nx.complexfloating, complex)): step = int(abs(step)) if step != 1: step = (key[k].stop - start)/float(step-1) @@ -194,7 +194,7 @@ class nd_grid: start = key.start if start is None: start = 0 - if isinstance(step, complex): + if isinstance(step, (_nx.complexfloating, complex)): step = abs(step) length = int(step) if step != 1: @@ -344,7 +344,7 @@ class AxisConcatenator: start = 0 if step is None: step = 1 - if isinstance(step, complex): + if isinstance(step, (_nx.complexfloating, complex)): size = int(abs(step)) newobj = linspace(start, stop, num=size) else: |