How about a simpler solution?

akern40 · Nov 29, 2024 · b96c541 · b96c541
1 parent 4086769
commit b96c541
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 9 deletions.
diff --git a/crates/numeric-tests/Cargo.toml b/crates/numeric-tests/Cargo.toml
@@ -20,12 +20,10 @@ rand_distr = { workspace = true }
 
 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_blis = ["ndarray/blas", "blas-src", "blis-src"]
diff --git a/crates/numeric-tests/src/lib.rs b/crates/numeric-tests/src/lib.rs
@@ -1,2 +1,2 @@
-#[cfg(any(feature = "test_blas", feature = "test_blis"))]
+#[cfg(feature = "test_blas")]
 extern crate blas_src;
diff --git a/scripts/all-tests.sh b/scripts/all-tests.sh
@@ -22,14 +22,10 @@ cargo test -v -p ndarray -p ndarray-rand --release --features "$FEATURES" $QC_FE
 cargo test -p ndarray --lib -v --features blas
 cargo test -p blas-mock-tests -v
 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
+    cargo +1.67.0 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
+    cargo +1.67.0 test -p numeric-tests -v --features numeric-tests/test_blas
 fi
 
 # Examples