Changes to BLIS for testing MSRV, since openblas is currently MSRV 1.67 and incompatible with ndarray's MSRV of 1.64

Author: akern40

.github/workflows/ci.yaml

@@ -85,7 +85,7 @@ jobs:
       - uses: rui314/setup-mold@v1
       - uses: Swatinem/rust-cache@v2
       - name: Install openblas
-        run: sudo apt-get install libopenblas-dev gfortran
+        run: sudo apt-get install libopenblas-dev gfortran libblis-dev
       - run: ./scripts/all-tests.sh "$FEATURES" ${{ matrix.rust }}
 
   miri:

README.rst

@@ -156,6 +156,14 @@ there is no tight coupling to the ``blas-src`` version, so version selection is
 0.13        0.2.0        0.6.0
 =========== ============ ================ ==============
 
+------------
+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.
+
 Recent Changes
 --------------
 

crates/numeric-tests/Cargo.toml

@@ -18,12 +18,14 @@ approx = { workspace = true }
 rand = { workspace = true }
 rand_distr = { workspace = true }
 
-blas-src = { optional = true, version = "0.10", default-features = false, features = ["openblas"] }
+blas-src = { optional = true, version = "0.10", default-features = false, features = ["blis", "openblas"] }
 openblas-src = { optional = true, version = "0.10", default-features = false, features = ["cblas", "system"] }
+blis-src = { optional = true, version = "0.2.2", features = ["system"] }
 
 [dev-dependencies]
 num-traits = { workspace = true }
 num-complex = { workspace = true }
 
 [features]
-test_blas = ["ndarray/blas", "blas-src", "openblas-src"]
+test_openblas = ["ndarray/blas", "blas-src", "openblas-src"]
+test_blis = ["ndarray/blas", "blas-src", "blis-src"]

scripts/all-tests.sh

@@ -23,8 +23,16 @@ cargo test -v -p ndarray -p ndarray-rand --release --features "$FEATURES" $QC_FE
 # BLAS tests
 cargo test -p ndarray --lib -v --features blas
 cargo test -p blas-mock-tests -v
-cargo test -p blas-tests -v --features blas-tests/openblas-system
-cargo test -p numeric-tests -v --features numeric-tests/test_blas
+if [ "$CHANNEL" == "1.64.0" ]; then
+    cargo test -p blas-tests -v --features blas-tests/blis-system
+else
+    cargo test -p blas-tests -v --features blas-tests/openblas-system
+fi
+if [ "$CHANNEL" == "1.64.0" ]; then
+    cargo test -p numeric-tests -v --features numeric-tests/test_blis
+else
+    cargo test -p numeric-tests -v --features numeric-tests/test_blas
+fi
 
 # Examples
 cargo test --examples