Pin openblas to >=0.10.11 in order to fix blas-compatible MSRV to 0.7…

…1.1 (#1465)
rust-ndarray · Dec 20, 2024 · d5f32ec · d5f32ec
1 parent 4e61c87
commit d5f32ec
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 8 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -12,6 +12,8 @@ env:
   HOST: x86_64-unknown-linux-gnu
   FEATURES: "test docs"
   RUSTFLAGS: "-D warnings"
+  MSRV: 1.64.0
+  BLAS_MSRV: 1.71.1
 
 jobs:
   clippy:
@@ -95,12 +97,14 @@ jobs:
       - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: 1.67.0  # BLAS MSRV
+          toolchain: 1.71.1  # BLAS MSRV
       - uses: rui314/setup-mold@v1
       - uses: Swatinem/rust-cache@v2
       - name: Install openblas
         run: sudo apt-get install libopenblas-dev gfortran
-      - run: ./scripts/blas-integ-tests.sh "$FEATURES" 1.67.0
+      - run: cargo tree -p blas-tests -i openblas-src -F blas-tests/openblas-system
+      - run: cargo tree -p blas-tests -i openblas-build -F blas-tests/openblas-system
+      - run: ./scripts/blas-integ-tests.sh $BLAS_MSRV
 
   miri:
     runs-on: ubuntu-latest

diff --git a/README.rst b/README.rst
@@ -161,8 +161,8 @@ BLAS on MSRV
 ------------
 
 Although ``ndarray`` currently maintains an MSRV of 1.64.0, this is separate from the MSRV (either stated or real) of the various BLAS providers.
-As of the time of writing, ``openblas`` currently supports MSRV of 1.67.0.
-So, while ``ndarray`` and ``openblas-src`` are compatible, they can only work together with toolchains 1.67.0 or above.
+As of the time of writing, ``openblas`` currently supports MSRV of 1.71.1.
+So, while ``ndarray`` and ``openblas-src`` are compatible, they can only work together with toolchains 1.71.1 or above.
 
 Recent Changes
 --------------

diff --git a/crates/blas-tests/Cargo.toml b/crates/blas-tests/Cargo.toml
@@ -15,7 +15,7 @@ ndarray = { workspace = true, features = ["approx", "blas"] }
 ndarray-gen = { workspace = true }
 
 blas-src = { version = "0.10", optional = true }
-openblas-src = { version = "0.10", optional = true }
+openblas-src = { version = ">=0.10.11", optional = true }
 netlib-src = { version = "0.8", optional = true }
 blis-src = { version = "0.2", features = ["system"], optional = true }
 

diff --git a/crates/numeric-tests/Cargo.toml b/crates/numeric-tests/Cargo.toml
@@ -19,7 +19,7 @@ rand = { workspace = true }
 rand_distr = { workspace = true }
 
 blas-src = { optional = true, version = "0.10", default-features = false, features = ["openblas"] }
-openblas-src = { optional = true, version = "0.10", default-features = false, features = ["cblas", "system"] }
+openblas-src = { optional = true, version = ">=0.10.11", default-features = false, features = ["cblas", "system"] }
 
 [dev-dependencies]
 num-traits = { workspace = true }

diff --git a/scripts/blas-integ-tests.sh b/scripts/blas-integ-tests.sh
@@ -3,8 +3,7 @@
 set -x
 set -e
 
-FEATURES=$1
-CHANNEL=$2
+CHANNEL=$1
 
 # BLAS tests
 cargo test -p blas-tests -v --features blas-tests/openblas-system