Commita9a9bf8

authored

Merge pull request#28600 from karl3wm/writeable-from-dlpack

BUG: Set writeable flag for writeable dlpacks.

2 parents2e3cf31 +155f32b commita9a9bf8Copy full SHA for a9a9bf8

File tree

+17

-7

lines changed

+17

-7

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1663,8 +1663,8 @@`
`1663`	`1663`	`from_dlpack(x, /, *, device=None, copy=None)`
`1664`	`1664`
`1665`	`1665`	Create a NumPy array from an object implementing the ``__dlpack__``
`1666`		`- protocol. Generally, the returned NumPy array is aread-onlyview`
`1667`		`-of the inputobject. See [1]_ and [2]_ for more details.`
	`1666`	`+ protocol. Generally, the returned NumPy array is a view of the input`
	`1667`	`+ object. See [1]_ and [2]_ for more details.`
`1668`	`1668`
`1669`	`1669`	`Parameters`
`1670`	`1670`	`----------`

Lines changed: 4 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -601,7 +601,7 @@ from_dlpack(PyObject *NPY_UNUSED(self),`
`601`	`601`	`returnNULL;`
`602`	`602`	`}`
`603`	`603`	`dl_tensor=managed->dl_tensor;`
`604`		`-readonly=0;`
	`604`	`+readonly=1;`
`605`	`605`	`}`
`606`	`606`
`607`	`607`	`constintndim=dl_tensor.ndim;`
`@@ -702,14 +702,13 @@ from_dlpack(PyObject *NPY_UNUSED(self),`
`702`	`702`	`}`
`703`	`703`
`704`	`704`	`PyObject*ret=PyArray_NewFromDescr(&PyArray_Type,descr,ndim,shape,`
`705`		`-dl_tensor.strides!=NULL ?strides :NULL,data,0,NULL);`
	`705`	`+dl_tensor.strides!=NULL ?strides :NULL,data,readonly ?0 :`
	`706`	`+NPY_ARRAY_WRITEABLE,NULL);`
	`707`	`+`
`706`	`708`	`if (ret==NULL) {`
`707`	`709`	`Py_DECREF(capsule);`
`708`	`710`	`returnNULL;`
`709`	`711`	`}`
`710`		`-if (readonly) {`
`711`		`-PyArray_CLEARFLAGS((PyArrayObject*)ret,NPY_ARRAY_WRITEABLE);`
`712`		`- }`
`713`	`712`
`714`	`713`	`PyObject*new_capsule;`
`715`	`714`	`if (versioned) {`

Lines changed: 11 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -144,6 +144,17 @@ def test_readonly(self):`
`144`	`144`	`y=np.from_dlpack(x)`
`145`	`145`	`assertnoty.flags.writeable`
`146`	`146`
	`147`	`+deftest_writeable(self):`
	`148`	`+x_new,x_old=new_and_old_dlpack()`
	`149`	`+`
	`150`	`+# new dlpacks respect writeability`
	`151`	`+y=np.from_dlpack(x_new)`
	`152`	`+asserty.flags.writeable`
	`153`	`+`
	`154`	`+# old dlpacks are not writeable for backwards compatibility`
	`155`	`+y=np.from_dlpack(x_old)`
	`156`	`+assertnoty.flags.writeable`
	`157`	`+`
`147`	`158`	`deftest_ndim0(self):`
`148`	`159`	`x=np.array(1.0)`
`149`	`160`	`y=np.from_dlpack(x)`

Comments

(0)