diff --git a/Cargo.toml b/Cargo.toml index 1c16e5bf1..a648b09bc 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -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 diff --git a/scripts/all-tests.sh b/scripts/all-tests.sh index 345b1986d..0a1958835 100755 --- a/scripts/all-tests.sh +++ b/scripts/all-tests.sh @@ -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 @@ -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") diff --git a/scripts/cross-tests.sh b/scripts/cross-tests.sh index 7c4f13111..7473a72fa 100755 --- a/scripts/cross-tests.sh +++ b/scripts/cross-tests.sh @@ -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 diff --git a/xtest-numeric/Cargo.toml b/xtest-numeric/Cargo.toml index bdfe15044..8558d39ad 100644 --- a/xtest-numeric/Cargo.toml +++ b/xtest-numeric/Cargo.toml @@ -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