Moves openblas to 0.10.11 for MSRV 1.71.1

rust-ndarray · Dec 20, 2024 · db95d14 · db95d14
1 parent 3a86331
commit db95d14
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -13,7 +13,7 @@ env:
   FEATURES: "test docs"
   RUSTFLAGS: "-D warnings"
   MSRV: 1.64.0
-  BLAS_MSRV: 1.76.0
+  BLAS_MSRV: 1.71.1
 
 jobs:
   clippy:
@@ -97,14 +97,14 @@ jobs:
       - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: 1.76.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: 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 1.76.0
+      - run: ./scripts/blas-integ-tests.sh $BLAS_MSRV
 
   miri:
     runs-on: ubuntu-latest

diff --git a/crates/blas-tests/Cargo.toml b/crates/blas-tests/Cargo.toml
@@ -15,10 +15,9 @@ ndarray = { workspace = true, features = ["approx", "blas"] }
 ndarray-gen = { workspace = true }
 
 blas-src = { version = "0.10", optional = true }
-openblas-src = { version = "=0.10.9", 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 }
-openblas-build = "=0.10.9"
 
 [dev-dependencies]
 defmac = "0.2"

diff --git a/crates/numeric-tests/Cargo.toml b/crates/numeric-tests/Cargo.toml
@@ -19,8 +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.9", default-features = false, features = ["cblas", "system"] }
-openblas-build = "=0.10.9"
+openblas-src = { optional = true, version = ">=0.10.11", default-features = false, features = ["cblas", "system"] }
 
 [dev-dependencies]
 num-traits = { workspace = true }