Skip to content

Commit 413f1a0

Browse files
authored
Merge pull request #39 from morenol/lmm/update_ndarray
fix: Update ndarray version
2 parents 53351b2 + 505f495 commit 413f1a0

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ nalgebra-bindings = ["nalgebra"]
1919
datasets = []
2020

2121
[dependencies]
22-
ndarray = { version = "0.13", optional = true }
22+
ndarray = { version = "0.14", optional = true }
2323
nalgebra = { version = "0.23.0", optional = true }
2424
num-traits = "0.2.12"
2525
num = "0.3.0"

src/linalg/ndarray_bindings.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ use std::ops::Range;
4747
use std::ops::SubAssign;
4848

4949
use ndarray::ScalarOperand;
50-
use ndarray::{s, stack, Array, ArrayBase, Axis, Ix1, Ix2, OwnedRepr};
50+
use ndarray::{concatenate, s, Array, ArrayBase, Axis, Ix1, Ix2, OwnedRepr};
5151

5252
use crate::linalg::cholesky::CholeskyDecomposableMatrix;
5353
use crate::linalg::evd::EVDDecomposableMatrix;
@@ -246,11 +246,11 @@ impl<T: RealNumber + ScalarOperand + AddAssign + SubAssign + MulAssign + DivAssi
246246
}
247247

248248
fn h_stack(&self, other: &Self) -> Self {
249-
stack(Axis(1), &[self.view(), other.view()]).unwrap()
249+
concatenate(Axis(1), &[self.view(), other.view()]).unwrap()
250250
}
251251

252252
fn v_stack(&self, other: &Self) -> Self {
253-
stack(Axis(0), &[self.view(), other.view()]).unwrap()
253+
concatenate(Axis(0), &[self.view(), other.view()]).unwrap()
254254
}
255255

256256
fn matmul(&self, other: &Self) -> Self {

0 commit comments

Comments
 (0)