Skip to content

Commit

Permalink
fix(ci): Integrate numeric tests into workspace to avoid confusing cr…
Browse files Browse the repository at this point in the history
…oss.
  • Loading branch information
adamreichold committed May 24, 2023
1 parent 63fd38c commit 587b653
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 14 deletions.
7 changes: 5 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -75,10 +75,13 @@ matrixmultiply-threading = ["matrixmultiply/threading"]

[profile.bench]
debug = true
[profile.dev.package.numeric-tests]
opt-level = 2
[profile.test.package.numeric-tests]
opt-level = 2

[workspace]
members = ["ndarray-rand", "xtest-serialization", "xtest-blas"]
exclude = ["xtest-numeric"]
members = ["ndarray-rand", "xtest-serialization", "xtest-blas", "xtest-numeric"]

[package.metadata.release]
no-dev-version = true
Expand Down
8 changes: 2 additions & 6 deletions scripts/all-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,6 @@ if [ "$CHANNEL" == "1.51.0" ]; then
cargo update --package once_cell --precise 1.14.0
cargo update --package openblas-src --precise 0.10.5
cargo update --package openblas-build --precise 0.10.5

cargo update --manifest-path=xtest-numeric/Cargo.toml --package thiserror --precise 1.0.39
cargo update --manifest-path=xtest-numeric/Cargo.toml --package openblas-src --precise 0.10.5
cargo update --manifest-path=xtest-numeric/Cargo.toml --package openblas-build --precise 0.10.5
fi

cargo build --verbose --no-default-features
Expand All @@ -31,6 +27,6 @@ cargo test --manifest-path=ndarray-rand/Cargo.toml --features quickcheck --verbo
cargo test --manifest-path=xtest-serialization/Cargo.toml --verbose
cargo test --manifest-path=xtest-blas/Cargo.toml --verbose --features openblas-system
cargo test --examples
CARGO_TARGET_DIR=target/ cargo test --manifest-path=xtest-numeric/Cargo.toml --verbose
CARGO_TARGET_DIR=target/ cargo test --manifest-path=xtest-numeric/Cargo.toml --verbose --features test_blas
cargo test --manifest-path=xtest-numeric/Cargo.toml --verbose
cargo test --manifest-path=xtest-numeric/Cargo.toml --verbose --features test_blas
([ "$CHANNEL" != "nightly" ] || cargo bench --no-run --verbose --features "$FEATURES")
2 changes: 1 addition & 1 deletion scripts/cross-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ cross build -v --features="$FEATURES" --target=$TARGET
cross test -v --no-fail-fast --features="$FEATURES" --target=$TARGET
cross test -v --no-fail-fast --target=$TARGET --manifest-path=ndarray-rand/Cargo.toml --features quickcheck
cross test -v --no-fail-fast --target=$TARGET --manifest-path=xtest-serialization/Cargo.toml --verbose
CARGO_TARGET_DIR=target/ cross test -v --no-fail-fast --target=$TARGET --manifest-path=xtest-numeric/Cargo.toml
cross test -v --no-fail-fast --target=$TARGET --manifest-path=xtest-numeric/Cargo.toml
5 changes: 0 additions & 5 deletions xtest-numeric/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,3 @@ test = false

[features]
test_blas = ["ndarray/blas", "blas-src", "openblas-src"]

[profile.dev]
opt-level = 2
[profile.test]
opt-level = 2

0 comments on commit 587b653

Please sign in to comment.