Commit 831dda2

committed

Improve stride copying in generalize a bit

While still not perfect - that should be solved in upstream ndarray, the new version is an improvement since it checks the compatibility before attempting to construct the array. `.into_raw_vec()` is very hard to use correctly (this is inherent, it's an access to the raw memory model), so the new version will actually fail to convert in some cases that were passing as silent errors before (related to internally sliced arrays, rather uncommon).

1 parent a561e5a commit 831dda2Copy full SHA for 831dda2

File tree

1 file changed

+11

-12

lines changed

ndarray-linalg/src
- convert.rs

1 file changed

+11

-12

lines changed

`‎ndarray-linalg/src/convert.rs‎`

Lines changed: 11 additions & 12 deletions

Original file line number	Diff line number	Diff line change
`@@ -102,18 +102,17 @@ where`
`102`	`102`	`{`
`103`	`103`	`// FIXME`
`104`	`104`	`// https://github.com/bluss/rust-ndarray/issues/325`
`105`		`- let strides: Vec<isize> = a.strides().to_vec();`
`106`		`- let new = if a.is_standard_layout() {`
`107`		`- ArrayBase::from_shape_vec(a.dim(), a.into_raw_vec()).unwrap()`
`108`		`- } else {`
`109`		`- ArrayBase::from_shape_vec(a.dim().f(), a.into_raw_vec()).unwrap()`
`110`		`- };`
`111`		`- assert_eq!(`
`112`		`- new.strides(),`
`113`		`- strides.as_slice(),`
`114`		`- "Custom stride is not supported"`
`115`		`- );`
`116`		`- new`
	`105`	`+ //`
	`106`	`+ // copy strides`
	`107`	`+ let mut strides = D::zeros(a.ndim());`
	`108`	`+ for (index, &s) in a.strides().iter().enumerate() {`
	`109`	`+ strides[index] = s as usize;`
	`110`	`+ }`
	`111`	`+ let a_dim = a.raw_dim();`
	`112`	`+ let a_len = a.len();`
	`113`	`+ let data = a.into_raw_vec();`
	`114`	`+ assert_eq!(a_len, data.len(), "generalize: non-contig arrays are not supported");`
	`115`	`+ ArrayBase::from_shape_vec(a_dim.strides(strides), data).unwrap()`
`117`	`116`	`}`
`118`	`117`
`119`	`118`	`/// Fills in the remainder of a Hermitian matrix that's represented by only one`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 831dda2

File tree

1 file changed

1 file changed

`‎ndarray-linalg/src/convert.rs‎`

0 commit comments