From 06af362c1bc779672f11b9aeeaa511ab047655bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABtan=20Cassiers?= Date: Tue, 6 Apr 2021 16:09:38 +0200 Subject: [PATCH] Support ndarray 0.15 Adding `std` feature is required since ndarray 0.15 made `impl std::error::Error for ShapeError` require std. Bump MSRV to 1.49 in linux-container CI to match the one of ndarray (1.43 was giving errors in ndarray). --- .github/workflows/intel-mkl.yml | 2 +- ndarray-linalg/Cargo.toml | 4 ++-- ndarray-linalg/src/cholesky.rs | 4 ++-- ndarray-linalg/src/solve.rs | 2 +- ndarray-linalg/src/solveh.rs | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/intel-mkl.yml b/.github/workflows/intel-mkl.yml index e7e06f2f..fec201c1 100644 --- a/.github/workflows/intel-mkl.yml +++ b/.github/workflows/intel-mkl.yml @@ -34,7 +34,7 @@ jobs: linux-container: runs-on: ubuntu-18.04 - container: rustmath/mkl-rust:1.43.0 + container: rustmath/mkl-rust:1.49.0 steps: - uses: actions/checkout@v1 - uses: actions-rs/cargo@v1 diff --git a/ndarray-linalg/Cargo.toml b/ndarray-linalg/Cargo.toml index 559cec06..a0823da1 100644 --- a/ndarray-linalg/Cargo.toml +++ b/ndarray-linalg/Cargo.toml @@ -36,8 +36,8 @@ rand = "0.7.3" thiserror = "1.0.20" [dependencies.ndarray] -version = "0.14" -features = ["blas", "approx"] +version = ">=0.14,<0.16" +features = ["blas", "approx", "std"] default-features = false [dependencies.lax] diff --git a/ndarray-linalg/src/cholesky.rs b/ndarray-linalg/src/cholesky.rs index 8ce0da84..58cc5cee 100644 --- a/ndarray-linalg/src/cholesky.rs +++ b/ndarray-linalg/src/cholesky.rs @@ -26,7 +26,7 @@ //! //! // Obtain `L` //! let lower = a.cholesky(UPLO::Lower).unwrap(); -//! assert!(lower.all_close(&array![ +//! assert!(lower.abs_diff_eq(&array![ //! [ 2., 0., 0.], //! [ 6., 1., 0.], //! [-8., 5., 3.] @@ -39,7 +39,7 @@ //! // Solve `A * x = b` //! let b = array![4., 13., -11.]; //! let x = a.solvec(&b).unwrap(); -//! assert!(x.all_close(&array![-2., 1., 0.], 1e-9)); +//! assert!(x.abs_diff_eq(&array![-2., 1., 0.], 1e-9)); //! # } //! ``` diff --git a/ndarray-linalg/src/solve.rs b/ndarray-linalg/src/solve.rs index dc71bf66..7e695a8c 100644 --- a/ndarray-linalg/src/solve.rs +++ b/ndarray-linalg/src/solve.rs @@ -16,7 +16,7 @@ //! let a: Array2 = array![[3., 2., -1.], [2., -2., 4.], [-2., 1., -2.]]; //! let b: Array1 = array![1., -2., 0.]; //! let x = a.solve_into(b).unwrap(); -//! assert!(x.all_close(&array![1., -2., -2.], 1e-9)); +//! assert!(x.abs_diff_eq(&array![1., -2., -2.], 1e-9)); //! //! # } //! ``` diff --git a/ndarray-linalg/src/solveh.rs b/ndarray-linalg/src/solveh.rs index fcfc6933..26329509 100644 --- a/ndarray-linalg/src/solveh.rs +++ b/ndarray-linalg/src/solveh.rs @@ -23,7 +23,7 @@ //! ]; //! let b: Array1 = array![11., -12., 1.]; //! let x = a.solveh_into(b).unwrap(); -//! assert!(x.all_close(&array![1., 3., -2.], 1e-9)); +//! assert!(x.abs_diff_eq(&array![1., 3., -2.], 1e-9)); //! //! # } //! ```