Skip to content
This repository has been archived by the owner on Nov 17, 2023. It is now read-only.

[MXNET-1403] Disable numpy's writability of NDArray once it is zero-copied to MXNet #14948

Merged
merged 4 commits into from
May 20, 2019
Merged

[MXNET-1403] Disable numpy's writability of NDArray once it is zero-copied to MXNet #14948

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e742e63
Initial commit
junrushao May 14, 2019
e93291d
update
junrushao May 19, 2019
3de87db
Update test_ndarray.py
szha May 19, 2019
4587797
Retrigger
junrushao May 20, 2019
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
1 change: 1 addition & 0 deletions python/mxnet/ndarray/ndarray.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4261,6 +4261,7 @@ def _make_dl_managed_tensor(array):

if not ndarray.flags['C_CONTIGUOUS']:
raise ValueError("Only c-contiguous arrays are supported for zero-copy")
ndarray.flags['WRITEABLE'] = False
c_obj = _make_dl_managed_tensor(ndarray)
address = ctypes.addressof(c_obj)
address = ctypes.cast(address, ctypes.c_void_p)
Expand Down
6 changes: 4 additions & 2 deletions tests/python/unittest/test_ndarray.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1687,8 +1687,10 @@ def test_zero_from_numpy():
mx.test_utils.assert_almost_equal(np_array, mx_array.asnumpy())
np_array = arrays[0]
mx_array = mx.nd.from_numpy(np_array)
np_array[2, 1] = 0
mx.test_utils.assert_almost_equal(np_array, mx_array.asnumpy())
try:
np_array[2, 1] = 0
wkcn marked this conversation as resolved.
Show resolved Hide resolved
except ValueError:
pass
junrushao marked this conversation as resolved.
Show resolved Hide resolved
mx_array[2, 1] = 100
mx.test_utils.assert_almost_equal(np_array, mx_array.asnumpy())
np_array = np.array([[1, 2], [3, 4], [5, 6]]).transpose()
Expand Down