Skip to content

Commit aac2283

Browse files
committed
How about a simpler solution?
1 parent 7ed6a13 commit aac2283

File tree

3 files changed

+3
-9
lines changed

3 files changed

+3
-9
lines changed

crates/numeric-tests/Cargo.toml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,10 @@ rand_distr = { workspace = true }
2020

2121
blas-src = { optional = true, version = "0.10", default-features = false, features = ["blis", "openblas"] }
2222
openblas-src = { optional = true, version = "0.10", default-features = false, features = ["cblas", "system"] }
23-
blis-src = { optional = true, version = "0.2.2", features = ["system"] }
2423

2524
[dev-dependencies]
2625
num-traits = { workspace = true }
2726
num-complex = { workspace = true }
2827

2928
[features]
3029
test_blas = ["ndarray/blas", "blas-src", "openblas-src"]
31-
test_blis = ["ndarray/blas", "blas-src", "blis-src"]

crates/numeric-tests/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
#[cfg(any(feature = "test_blas", feature = "test_blis"))]
1+
#[cfg(feature = "test_blas")]
22
extern crate blas_src;

scripts/all-tests.sh

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,10 @@ cargo test -v -p ndarray -p ndarray-rand --release --features "$FEATURES" $QC_FE
2424
cargo test -p ndarray --lib -v --features blas
2525
cargo test -p blas-mock-tests -v
2626
if [ "$CHANNEL" = "1.64.0" ]; then
27-
cargo test -p blas-tests -v --features blas-tests/blis-system
28-
else
29-
cargo test -p blas-tests -v --features blas-tests/openblas-system
27+
cargo +1.67.0 test -p blas-tests -v --features blas-tests/openblas-system
3028
fi
3129
if [ "$CHANNEL" = "1.64.0" ]; then
32-
cargo test -p numeric-tests -v --features numeric-tests/test_blis
33-
else
34-
cargo test -p numeric-tests -v --features numeric-tests/test_blas
30+
cargo +1.67.0 test -p numeric-tests -v --features numeric-tests/test_blas
3531
fi
3632

3733
# Examples

0 commit comments

Comments
 (0)