Skip to content

Commit

Permalink
How about a simpler solution?
Browse files Browse the repository at this point in the history
  • Loading branch information
akern40 committed Nov 29, 2024
1 parent 7ed6a13 commit aac2283
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 9 deletions.
2 changes: 0 additions & 2 deletions crates/numeric-tests/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
2 changes: 1 addition & 1 deletion crates/numeric-tests/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#[cfg(any(feature = "test_blas", feature = "test_blis"))]
#[cfg(feature = "test_blas")]
extern crate blas_src;
8 changes: 2 additions & 6 deletions scripts/all-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,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
Expand Down

0 comments on commit aac2283

Please sign in to comment.