Skip to content

Commit d5f32ec

Browse files
authored
Pin openblas to >=0.10.11 in order to fix blas-compatible MSRV to 0.71.1 (#1465)
1 parent 4e61c87 commit d5f32ec

File tree

5 files changed

+11
-8
lines changed

5 files changed

+11
-8
lines changed

.github/workflows/ci.yaml

+6-2
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ env:
1212
HOST: x86_64-unknown-linux-gnu
1313
FEATURES: "test docs"
1414
RUSTFLAGS: "-D warnings"
15+
MSRV: 1.64.0
16+
BLAS_MSRV: 1.71.1
1517

1618
jobs:
1719
clippy:
@@ -95,12 +97,14 @@ jobs:
9597
- uses: actions/checkout@v4
9698
- uses: dtolnay/rust-toolchain@master
9799
with:
98-
toolchain: 1.67.0 # BLAS MSRV
100+
toolchain: 1.71.1 # BLAS MSRV
99101
- uses: rui314/setup-mold@v1
100102
- uses: Swatinem/rust-cache@v2
101103
- name: Install openblas
102104
run: sudo apt-get install libopenblas-dev gfortran
103-
- run: ./scripts/blas-integ-tests.sh "$FEATURES" 1.67.0
105+
- run: cargo tree -p blas-tests -i openblas-src -F blas-tests/openblas-system
106+
- run: cargo tree -p blas-tests -i openblas-build -F blas-tests/openblas-system
107+
- run: ./scripts/blas-integ-tests.sh $BLAS_MSRV
104108

105109
miri:
106110
runs-on: ubuntu-latest

README.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -161,8 +161,8 @@ BLAS on MSRV
161161
------------
162162

163163
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.
164-
As of the time of writing, ``openblas`` currently supports MSRV of 1.67.0.
165-
So, while ``ndarray`` and ``openblas-src`` are compatible, they can only work together with toolchains 1.67.0 or above.
164+
As of the time of writing, ``openblas`` currently supports MSRV of 1.71.1.
165+
So, while ``ndarray`` and ``openblas-src`` are compatible, they can only work together with toolchains 1.71.1 or above.
166166

167167
Recent Changes
168168
--------------

crates/blas-tests/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ ndarray = { workspace = true, features = ["approx", "blas"] }
1515
ndarray-gen = { workspace = true }
1616

1717
blas-src = { version = "0.10", optional = true }
18-
openblas-src = { version = "0.10", optional = true }
18+
openblas-src = { version = ">=0.10.11", optional = true }
1919
netlib-src = { version = "0.8", optional = true }
2020
blis-src = { version = "0.2", features = ["system"], optional = true }
2121

crates/numeric-tests/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ rand = { workspace = true }
1919
rand_distr = { workspace = true }
2020

2121
blas-src = { optional = true, version = "0.10", default-features = false, features = ["openblas"] }
22-
openblas-src = { optional = true, version = "0.10", default-features = false, features = ["cblas", "system"] }
22+
openblas-src = { optional = true, version = ">=0.10.11", default-features = false, features = ["cblas", "system"] }
2323

2424
[dev-dependencies]
2525
num-traits = { workspace = true }

scripts/blas-integ-tests.sh

+1-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
set -x
44
set -e
55

6-
FEATURES=$1
7-
CHANNEL=$2
6+
CHANNEL=$1
87

98
# BLAS tests
109
cargo test -p blas-tests -v --features blas-tests/openblas-system

0 commit comments

Comments
 (0)