Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion ndarray-linalg/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ rand = "0.8.3"
thiserror = "1.0.24"

[dependencies.ndarray]
version = "0.15.2"
version = "0.16.1"
features = ["blas", "approx", "std"]
default-features = false

Expand Down
4 changes: 2 additions & 2 deletions ndarray-linalg/src/convert.rs
Original file line number Diff line number Diff line change
Expand Up @@ -97,14 +97,14 @@ where
{
// FIXME
// https://github.com/bluss/rust-ndarray/issues/325
let strides: Vec<isize> = a.strides().to_vec();
let strides: Vec<isize> = ArrayBase::strides(&a).to_vec();
let new = if a.is_standard_layout() {
ArrayBase::from_shape_vec(a.dim(), a.into_raw_vec()).unwrap()
} else {
ArrayBase::from_shape_vec(a.dim().f(), a.into_raw_vec()).unwrap()
};
assert_eq!(
new.strides(),
ArrayBase::strides(&new),
strides.as_slice(),
"Custom stride is not supported"
);
Expand Down
4 changes: 2 additions & 2 deletions ndarray-linalg/tests/det.rs
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ fn det_zero_nonsquare() {
assert!(a.sln_det_into().is_err());
};
}
for &shape in &[(1, 2).into_shape(), (1, 2).f()] {
for &shape in &[(1, 2).into_shape_with_order(), (1, 2).f()] {
det_zero_nonsquare!(f64, shape);
det_zero_nonsquare!(f32, shape);
det_zero_nonsquare!(c64, shape);
Expand Down Expand Up @@ -186,7 +186,7 @@ fn det_nonsquare() {
};
}
for &dims in &[(1, 0), (1, 2), (2, 1), (2, 3)] {
for &shape in &[dims.into_shape(), dims.f()] {
for &shape in &[dims.into_shape_with_order(), dims.f()] {
det_nonsquare!(f64, shape);
det_nonsquare!(f32, shape);
det_nonsquare!(c64, shape);
Expand Down
4 changes: 2 additions & 2 deletions ndarray-linalg/tests/deth.rs
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ fn deth_zero_nonsquare() {
assert!(a.sln_deth_into().is_err());
};
}
for &shape in &[(1, 2).into_shape(), (1, 2).f()] {
for &shape in &[(1, 2).into_shape_with_order(), (1, 2).f()] {
deth_zero_nonsquare!(f64, shape);
deth_zero_nonsquare!(f32, shape);
deth_zero_nonsquare!(c64, shape);
Expand Down Expand Up @@ -138,7 +138,7 @@ fn deth_nonsquare() {
};
}
for &dims in &[(1, 0), (1, 2), (2, 1), (2, 3)] {
for &shape in &[dims.into_shape(), dims.f()] {
for &shape in &[dims.into_shape_with_order(), dims.f()] {
deth_nonsquare!(f64, shape);
deth_nonsquare!(f32, shape);
deth_nonsquare!(c64, shape);
Expand Down
2 changes: 1 addition & 1 deletion ndarray-linalg/tests/inv.rs
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ fn inv_into_random_complex() {
#[should_panic]
fn inv_error() {
// do not have inverse
let a = Array::<f64, _>::zeros(9).into_shape((3, 3)).unwrap();
let a = Array::<f64, _>::zeros((3, 3));
let a_inv = a.inv().unwrap();
println!("{:?}", a_inv);
}
Expand Down