szha closed pull request #10022: Fix ndarray assignment issue with basic
indexing
URL: https://github.com/apache/incubator-mxnet/pull/10022
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/python/mxnet/ndarray/ndarray.py b/python/mxnet/ndarray/ndarray.py
index 5ac279635a1..536784586e3 100644
--- a/python/mxnet/ndarray/ndarray.py
+++ b/python/mxnet/ndarray/ndarray.py
@@ -695,6 +695,8 @@ def _set_nd_basic_indexing(self, key, value):
# may need to broadcast first
if isinstance(value, NDArray):
if value.handle is not self.handle:
+ if value.shape != shape:
+ value = value.broadcast_to(shape)
value.copyto(self)
elif isinstance(value, numeric_types):
_internal._full(shape=shape, ctx=self.context,
diff --git a/tests/python/unittest/test_ndarray.py
b/tests/python/unittest/test_ndarray.py
index 0daf74a8879..9bf563a14cb 100644
--- a/tests/python/unittest/test_ndarray.py
+++ b/tests/python/unittest/test_ndarray.py
@@ -992,6 +992,8 @@ def test_setitem(np_array, index, is_scalar):
def assert_same(np_array, np_index, mx_array, mx_index, mx_value,
np_value=None):
if np_value is not None:
np_array[np_index] = np_value
+ elif isinstance(mx_value, mx.nd.NDArray):
+ np_array[np_index] = mx_value.asnumpy()
else:
np_array[np_index] = mx_value
mx_array[mx_index] = mx_value
@@ -1024,6 +1026,9 @@ def assert_same(np_array, np_index, mx_array, mx_index,
mx_value, np_value=None)
# test value is an numeric_type
assert_same(np_array, np_index, mx_array, index,
np.random.randint(low=-10000, high=0))
if len(indexed_array_shape) > 1:
+ # test NDArray with broadcast
+ assert_same(np_array, np_index, mx_array, index,
+ mx.nd.random.uniform(low=-10000, high=0,
shape=(indexed_array_shape[-1],)))
# test numpy array with broadcast
assert_same(np_array, np_index, mx_array, index,
np.random.randint(low=-10000, high=0,
size=(indexed_array_shape[-1],)))
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
