Merge branch 'master' into yt/way-to-turnoff-blas

Author: kateinoigakukun

.github/workflows/gh-pages.yml

@@ -33,23 +33,21 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       # Generate cargo-doc
-      - uses: actions-rs/cargo@v1
-        with:
-          command: doc
-          args: --no-deps
+      - name: Generate documentation
+        run: cargo doc --no-deps
 
       - name: Setup Pages
-        uses: actions/configure-pages@v2
+        uses: actions/configure-pages@v5
 
       # Upload target/doc directory
       - name: Upload artifact
-        uses: actions/upload-pages-artifact@v1
+        uses: actions/upload-pages-artifact@v3
         with:
           path: 'target/doc'
 
       - name: Deploy to GitHub Pages
         id: deployment
-        uses: actions/deploy-pages@v1
+        uses: actions/deploy-pages@v4

.github/workflows/intel-mkl.yml

@@ -5,44 +5,16 @@ on:
     branches:
       - master
   pull_request: {}
+  workflow_dispatch:
 
 jobs:
-  windows:
-    runs-on: windows-2019
+  intel-mkl:
+    strategy:
+      fail-fast: false
+      matrix:
+        system: [ubuntu-22.04, windows-latest]
+    runs-on: ${{ matrix.system }}
     steps:
-      - uses: actions/checkout@v1
-      - uses: actions-rs/cargo@v1
-        with:
-          command: test
-          args: >
-            --manifest-path=ndarray-linalg/Cargo.toml
-            --no-default-features
-            --features=intel-mkl-static
-
-  linux:
-    runs-on: ubuntu-22.04
-    steps:
-      - uses: actions/checkout@v1
-      - uses: actions-rs/cargo@v1
-        name: cargo test
-        with:
-          command: test
-          args: >
-            --manifest-path=ndarray-linalg/Cargo.toml
-            --no-default-features
-            --features=intel-mkl-static
-
-  linux-container:
-    runs-on: ubuntu-22.04
-    container:
-      image: ghcr.io/rust-math/rust-mkl:1.63.0-2020.1
-    steps:
-      - uses: actions/checkout@v1
-      - uses: actions-rs/cargo@v1
-        name: cargo test
-        with:
-          command: test
-          args: >
-            --manifest-path=ndarray-linalg/Cargo.toml
-            --no-default-features
-            --features=intel-mkl-system
+      - uses: actions/checkout@v4
+      - name: cargo test
+        run: cargo test --manifest-path=ndarray-linalg/Cargo.toml --no-default-features --features=intel-mkl-static  --verbose

.github/workflows/netlib.yml

@@ -5,6 +5,7 @@ on:
     branches:
       - master
   pull_request: {}
+  workflow_dispatch:
 
 jobs:
   linux:
@@ -15,15 +16,10 @@ jobs:
           - static
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v4
       - name: apt install gfortran
         run: |
           sudo apt update
           sudo apt install -y gfortran
-      - uses: actions-rs/cargo@v1
-        with:
-          command: test
-          args: >
-            --manifest-path=ndarray-linalg/Cargo.toml
-            --no-default-features
-            --features=netlib-${{ matrix.feature }}
+      - name: cargo test
+        run: cargo test --manifest-path=ndarray-linalg/Cargo.toml --no-default-features --features=netlib-${{ matrix.feature }}

.github/workflows/openblas.yml

@@ -5,33 +5,27 @@ on:
     branches:
       - master
   pull_request: {}
+  workflow_dispatch:
 
 jobs:
   linux:
     runs-on: ubuntu-22.04
-    container:
-      image: rust
     strategy:
       fail-fast: false
       matrix:
         feature:
           - static
           - system
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v4
       - name: apt install gfortran
         run: |
-          apt update
-          apt install -y gfortran
+          sudo apt update
+          sudo apt install -y gfortran
       - name: Install OpenBLAS by apt
         run: |
-          apt update
-          apt install -y libopenblas-dev
+          sudo apt update
+          sudo apt install -y libopenblas-dev
         if: ${{ contains(matrix.feature, 'system') }}
-      - uses: actions-rs/cargo@v1
-        with:
-          command: test
-          args: >
-            --manifest-path=ndarray-linalg/Cargo.toml
-            --no-default-features
-            --features=openblas-${{ matrix.feature }}
+      - name: cargo test
+        run: cargo test --manifest-path=ndarray-linalg/Cargo.toml --no-default-features --features=openblas-${{ matrix.feature }} 

.github/workflows/rust.yml

@@ -5,52 +5,50 @@ on:
     branches:
       - master
   pull_request: {}
+  workflow_dispatch:
 
 jobs:
   check-format:
     runs-on: ubuntu-22.04
     steps:
-    - uses: actions/checkout@v1
-    - uses: actions-rs/cargo@v1
-      with:
-        command: fmt
-        args: -- --check
+    - uses: actions/checkout@v4
+    - name: fmt
+      run: cargo fmt -- --check
 
   check:
     runs-on: ubuntu-22.04
     steps:
-    - uses: actions/checkout@v1
-    - uses: actions-rs/cargo@v1
-      with:
-        command: check
-        args: --all-targets
+    - uses: actions/checkout@v4
+    - name: cargo check
+      run: cargo check --all-targets
 
   check-doc:
     runs-on: ubuntu-22.04
     steps:
-    - uses: actions/checkout@v1
-    - uses: actions-rs/cargo@v1
-      with:
-        command: doc
-        args: --no-deps
+    - uses: actions/checkout@v4
+    - name: cargo doc
+      run: cargo doc --no-deps
 
   clippy:
     runs-on: ubuntu-22.04
     steps:
-    - uses: actions/checkout@v1
-    - uses: actions-rs/cargo@v1
-      with:
-        command: clippy
+    - uses: actions/checkout@v4
+    - name: cargo clippy
+      run: cargo clippy
 
   coverage:
     runs-on: ubuntu-22.04
     container:
-      image: ghcr.io/rust-math/rust-mkl:1.63.0-2020.1
+      image: xd009642/tarpaulin:develop-nightly
       options: --security-opt seccomp=unconfined
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
+      - uses: dtolnay/rust-toolchain@nightly
+      - name: Install Cross
+        uses: taiki-e/install-action@v2
+        with:
+          tool: cargo-tarpaulin
       - name: Generate code coverage
-        run: |
-          cargo tarpaulin --features=intel-mkl-system --out Xml
+        run: cargo +nightly tarpaulin --features=intel-mkl-static --out xml
       - name: Upload to codecov.io
-        uses: codecov/codecov-action@v1
+        uses: codecov/codecov-action@v5

ndarray-linalg/Cargo.toml

@@ -38,20 +38,20 @@ rand = "0.8.3"
 thiserror = "1.0.24"
 
 [dependencies.ndarray]
-version = "0.15.2"
+version = "0.16.0"
 features = ["approx", "std"]
 default-features = false
 
 [dependencies.lax]
-version = "0.16.0-rc.0"
+version = "0.16.0"
 path = "../lax"
 default-features = false
 
 [dev-dependencies]
 paste = "1.0.5"
-criterion = "0.3.4"
+criterion = "0.5.1"
 # Keep the same version as ndarray's dependency!
-approx = { version = "0.4.0", features = ["num-complex"] }
+approx = { version = "0.5", features = ["num-complex"] }
 rand_pcg = "0.3.1"
 
 [[bench]]

ndarray-linalg/src/convert.rs

@@ -12,23 +12,23 @@ where
     S: Data,
 {
     let n = a.len();
-    a.into_shape((n, 1)).unwrap()
+    a.into_shape_with_order((n, 1)).unwrap()
 }
 
 pub fn into_row<S>(a: ArrayBase<S, Ix1>) -> ArrayBase<S, Ix2>
 where
     S: Data,
 {
     let n = a.len();
-    a.into_shape((1, n)).unwrap()
+    a.into_shape_with_order((1, n)).unwrap()
 }
 
 pub fn flatten<S>(a: ArrayBase<S, Ix2>) -> ArrayBase<S, Ix1>
 where
     S: Data,
 {
     let n = a.len();
-    a.into_shape(n).unwrap()
+    a.into_shape_with_order(n).unwrap()
 }
 
 pub fn into_matrix<A, S>(l: MatrixLayout, a: Vec<A>) -> Result<ArrayBase<S, Ix2>>
@@ -99,9 +99,9 @@ where
     // https://github.com/bluss/rust-ndarray/issues/325
     let strides: Vec<isize> = a.strides().to_vec();
     let new = if a.is_standard_layout() {
-        ArrayBase::from_shape_vec(a.dim(), a.into_raw_vec()).unwrap()
+        ArrayBase::from_shape_vec(a.dim(), a.into_raw_vec_and_offset().0).unwrap()
     } else {
-        ArrayBase::from_shape_vec(a.dim().f(), a.into_raw_vec()).unwrap()
+        ArrayBase::from_shape_vec(a.dim().f(), a.into_raw_vec_and_offset().0).unwrap()
     };
     assert_eq!(
         new.strides(),

ndarray-linalg/tests/det.rs

@@ -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);
@@ -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);

ndarray-linalg/tests/deth.rs

@@ -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);
@@ -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);

ndarray-linalg/tests/inv.rs

@@ -106,7 +106,9 @@ 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(9)
+        .into_shape_with_order((3, 3))
+        .unwrap();
     let a_inv = a.inv().unwrap();
     println!("{:?}", a_inv);
 }

ndarray-linalg/tests/opnorm.rs

@@ -14,11 +14,13 @@ fn gen(i: usize, j: usize, rev: bool) -> Array2<f64> {
     let n = (i * j + 1) as f64;
     if rev {
         Array::range(1., n, 1.)
-            .into_shape((j, i))
+            .into_shape_with_order((j, i))
             .unwrap()
             .reversed_axes()
     } else {
-        Array::range(1., n, 1.).into_shape((i, j)).unwrap()
+        Array::range(1., n, 1.)
+            .into_shape_with_order((i, j))
+            .unwrap()
     }
 }
 

ndarray-linalg/tests/solve.rs

@@ -254,7 +254,7 @@ fn rcond_hilbert() {
     macro_rules! rcond_hilbert {
         ($elem:ty, $rows:expr, $atol:expr) => {
             let a = Array2::<$elem>::from_shape_fn(($rows, $rows), |(i, j)| {
-                1. / (i as $elem + j as $elem - 1.)
+                1. / (i as $elem + j as $elem + 1.)
             });
             assert_aclose!(a.rcond().unwrap(), 0., $atol);
             assert_aclose!(a.rcond_into().unwrap(), 0., $atol);