Skip to content

Fix empty slice regression #459

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
kwmsmith merged 3 commits into from
Jun 24, 2014
Merged

Fix empty slice regression #459

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c4a28a6
Fix failing empty array tests.
bgrant Jun 24, 2014
9d7e937
Test some of the attributes of the empty slice.
bgrant Jun 24, 2014
72bb494
Check attributes on empty 2d slice.
bgrant Jun 24, 2014
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
3 changes: 2 additions & 1 deletion distarray/dist/distarray.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,12 +179,13 @@ def get_slice(arr, index, ddpr, comm):
return_type, index = sanitize_indices(index, ndim=self.ndim,
shape=self.shape)
return_proxy = (return_type == 'view')
targets = self.distribution.owning_targets(index)
targets = self.distribution.owning_targets(index) or [0]

args = [self.key, index]
if self.distribution.has_precise_index:
if return_proxy: # returning a new DistArray view
new_distribution = self.distribution.slice(index)
targets = new_distribution.targets
ddpr = new_distribution.get_dim_data_per_rank()
args.extend([ddpr, new_distribution.comm])
local_fn = get_slice
Expand Down
2 changes: 1 addition & 1 deletion distarray/dist/maps.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -666,7 +666,7 @@ def has_precise_index(self):

def slice(self, index_tuple):
"""Make a new Distribution from a slice."""
new_targets = self.owning_targets(index_tuple)
new_targets = self.owning_targets(index_tuple) or [0]
global_dim_data = []
# iterate over the dimensions
for map_, idx in zip(self.maps, index_tuple):
Expand Down
14 changes: 10 additions & 4 deletions distarray/dist/tests/test_distarray.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,19 +178,25 @@ def test_incomplete_index_block_dist_2d(self):
arr = self.context.fromarray(expected)
assert_array_equal(arr[1].toarray(), expected[1])

@unittest.expectedFailure
def test_empty_slice_1d(self):
shape = (10,)
expected = numpy.random.randint(10, size=shape)
arr = self.context.fromarray(expected)
assert_array_equal(arr[100:].toarray(), expected[100:])
out = arr[100:]
self.assertEqual(out.shape, (0,))
self.assertEqual(out.grid_shape, (1,))
self.assertEqual(len(out.targets), 1)
assert_array_equal(out.toarray(), expected[100:])

@unittest.expectedFailure
def test_empty_slice_2d(self):
shape = (10, 20)
expected = numpy.random.randint(10, size=shape)
arr = self.context.fromarray(expected)
assert_array_equal(arr[100:, 100:].toarray(), expected[100:, 100:])
out = arr[100:, 100:]
self.assertEqual(out.shape, (0, 0))
self.assertEqual(out.grid_shape, (1, 1))
self.assertEqual(len(out.targets), 1)
assert_array_equal(out.toarray(), expected[100:, 100:])

def test_trailing_ellipsis(self):
shape = (2, 3, 7, 6)
Expand Down