8000 MAINT: Simplify block implementation by j-towns · Pull Request #9667 · numpy/numpy · GitHub
[go: up one dir, main page]
Skip to content

MAINT: Simplify block implementation #9667

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 23 commits into from
Nov 12, 2017
Merged

MAINT: Simplify block implementation #9667

Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
a5c6f0d
Simplify block implementation
j-towns Sep 7, 2017
2dcc9aa
np.block style improvements
j-towns Sep 7, 2017
e787a9f
Reflect asanyarray behaviour in block
j-towns Sep 8, 2017
95adb77
Add empty list comment to block depth check
j-towns Sep 10, 2017
07a3f43
Use strict type checking (not isinstance)
j-towns Sep 11, 2017
19fc68c
Re-add tuple type-check comment
j-towns Sep 11, 2017
997ac2c
Re-add `atleast_nd` function.
j-towns Sep 11, 2017
7eb1044
Add detailed comment to _block_check_depths_match
j-towns Sep 18, 2017
ff7f726
Extend comments _block_check_depths_match
j-towns Sep 20, 2017
6ecd2b4
Try not recomputing list_ndim
j-towns Sep 23, 2017
1211b70
Slight simplification to logic
j-towns Sep 25, 2017
8000
ffa6cf6
Add two tests for different arr_ndims
j-towns Sep 25, 2017
3ed6936
Simplify further - matching docstring logic
j-towns Sep 25, 2017
5f9f1fa
Rename list_ndim to max_depth
j-towns Sep 25, 2017
8a83a5f
rm extra line from near top of shape_base
j-towns Sep 25, 2017
5a0557a
Pre-calculate max array ndim
j-towns Oct 12, 2017
c2b5be5
Further slight simplifications
j-towns Oct 12, 2017
bd6729d
Update block docstrings
j-towns Oct 12, 2017
ad278f3
Fix python 3.4 sequence error
j-towns Oct 12, 2017
2c1734b
Correct empty list ndim
j-towns Oct 26, 2017
eaddf39
Avoid using zip(*...) syntax
j-towns Nov 1, 2017
a5cbc93
Use builtin next method
j-towns Nov 1, 2017
a691f2d
Rm unnecessary enumerate
j-towns Nov 9, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Re-add atleast_nd function.
  • Loading branch information
@j-towns
j-towns committed Sep 18, 2017
commit 997ac2cfbe3edba968e1ee140763b53b88c3afca
9 changes: 7 additions & 2 deletions numpy/core/shape_base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -407,18 +407,23 @@ def format_index(index):


def _block(arrays, depth=0):
def atleast_nd(a, ndim):
# Ensures `a` has at least `ndim` dimensions by prepending
# ones to `a.shape` as necessary
return array(a, ndmin=ndim, copy=False, subok=True)

if type(arrays) is list:
if len(arrays) == 0:
raise ValueError('Lists cannot be empty')
arrs, list_ndims = zip(*(_block(arr, depth+1) for arr in arrays))
list_ndim = list_ndims[0]
arr_ndim = max(arr.ndim for arr in arrs)
ndim = max(list_ndim, arr_ndim)
arrs = [array(a, ndmin=ndim, copy=False, subok=True) for a in arrs]
arrs = [atleast_nd(a, ndim) for a in arrs]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It makes me a little uneasy that this happens inside the recursion - I think there aren't many tests for block with different dimensioned arrays.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've simplified the logic a little and added two tests for cases where arr_ndim > list_ndim and the inner arrays have different ndims.

return _nx.concatenate(arrs, axis=depth+ndim-list_ndim), list_ndim
else:
# We've 'bottomed out'
return array(arrays, ndmin=depth, copy=False, subok=True), depth
return atleast_nd(arrays, depth), depth


def block(arrays):
Expand Down
0