Skip to content

Commit d2716cf

Browse files
committed
Upgrade deps
1 parent 3e13736 commit d2716cf

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

ndarray-linalg/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ rand = "0.8.3"
3737
thiserror = "1.0.24"
3838

3939
[dependencies.ndarray]
40-
version = "0.15.2"
40+
version = "0.16.0"
4141
features = ["blas", "approx", "std"]
4242
default-features = false
4343

@@ -48,9 +48,9 @@ default-features = false
4848

4949
[dev-dependencies]
5050
paste = "1.0.5"
51-
criterion = "0.3.4"
51+
criterion = "0.5.1"
5252
# Keep the same version as ndarray's dependency!
53-
approx = { version = "0.4.0", features = ["num-complex"] }
53+
approx = { version = "0.5", features = ["num-complex"] }
5454
rand_pcg = "0.3.1"
5555

5656
[[bench]]

ndarray-linalg/src/convert.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,23 +12,23 @@ where
1212
S: Data,
1313
{
1414
let n = a.len();
15-
a.into_shape((n, 1)).unwrap()
15+
a.into_shape_with_order((n, 1)).unwrap()
1616
}
1717

1818
pub fn into_row<S>(a: ArrayBase<S, Ix1>) -> ArrayBase<S, Ix2>
1919
where
2020
S: Data,
2121
{
2222
let n = a.len();
23-
a.into_shape((1, n)).unwrap()
23+
a.into_shape_with_order((1, n)).unwrap()
2424
}
2525

2626
pub fn flatten<S>(a: ArrayBase<S, Ix2>) -> ArrayBase<S, Ix1>
2727
where
2828
S: Data,
2929
{
3030
let n = a.len();
31-
a.into_shape(n).unwrap()
31+
a.into_shape_with_order(n).unwrap()
3232
}
3333

3434
pub fn into_matrix<A, S>(l: MatrixLayout, a: Vec<A>) -> Result<ArrayBase<S, Ix2>>
@@ -99,9 +99,9 @@ where
9999
// https://github.com/bluss/rust-ndarray/issues/325
100100
let strides: Vec<isize> = a.strides().to_vec();
101101
let new = if a.is_standard_layout() {
102-
ArrayBase::from_shape_vec(a.dim(), a.into_raw_vec()).unwrap()
102+
ArrayBase::from_shape_vec(a.dim(), a.into_raw_vec_and_offset().0).unwrap()
103103
} else {
104-
ArrayBase::from_shape_vec(a.dim().f(), a.into_raw_vec()).unwrap()
104+
ArrayBase::from_shape_vec(a.dim().f(), a.into_raw_vec_and_offset().0).unwrap()
105105
};
106106
assert_eq!(
107107
new.strides(),

0 commit comments

Comments
 (0)