hiro/ray
1
0
Fork 0
mirror of https://github.com/vale981/ray synced 2025-03-06 10:31:39 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix FutureWarning: Using a non-tuple sequence for multidimensional indexing is deprecated; use arr[tuple(seq)] instead of arr[seq]. In the future this will be interpreted as an array index, arr[np.array(seq)], which will result either in an error or a different result. (#6568)

Browse source
This commit is contained in:
mehrdadn 2019-12-22 13:02:34 -08:00 • committed by Robert Nishihara
parent 7bbfa85c66
commit 50fb26de68
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
python/ray/experimental/array/distributed/core.py
View file

@ -63,8 +63,8 @@ class DistArray(object):
for index in np.ndindex(*self.num_blocks):
lower = DistArray.compute_block_lower(index, self.shape)
upper = DistArray.compute_block_upper(index, self.shape)
result[[slice(l, u) for (l, u) in zip(lower, upper)]] = ray.get(
self.objectids[index])
value = ray.get(self.objectids[index])
result[tuple(slice(l, u) for (l, u) in zip(lower, upper))] = value
return result
def __getitem__(self, sliced):
@ -86,8 +86,8 @@ def numpy_to_dist(a):
for index in np.ndindex(*result.num_blocks):
lower = DistArray.compute_block_lower(index, a.shape)
upper = DistArray.compute_block_upper(index, a.shape)
result.objectids[index] = ray.put(
a[[slice(l, u) for (l, u) in zip(lower, upper)]])
idx = tuple(slice(l, u) for (l, u) in zip(lower, upper))
result.objectids[index] = ray.put(a[idx])
return result

3
python/ray/experimental/array/remote/core.py
View file

@ -47,7 +47,8 @@ def hstack(*xs):
# TODO(rkn): Be consistent about using "index" versus "indices".
@ray.remote
def subarray(a, lower_indices, upper_indices):
return a[[slice(l, u) for (l, u) in zip(lower_indices, upper_indices)]]
idx = tuple(slice(l, u) for (l, u) in zip(lower_indices, upper_indices))
return a[idx]
@ray.remote