From d507f7e81bab94dc5e4a55702753e34b654e8a6d Mon Sep 17 00:00:00 2001 From: Vinzent Steinberg Date: Fri, 28 Jul 2023 20:37:42 +0200 Subject: [PATCH 1/4] Upgrade criterion --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 6c7ce73f66..539b153cc2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -76,7 +76,7 @@ rand_pcg = { path = "rand_pcg", version = "=0.9.0-alpha.1" } # Only to test serde1 bincode = "1.2.1" rayon = "1.5.3" -criterion = { version = "0.4" } +criterion = "0.5" [[bench]] name = "uniform" From 6f917e1f164a7e87e384931bf11969b07337dbdb Mon Sep 17 00:00:00 2001 From: Vinzent Steinberg Date: Fri, 26 Apr 2024 14:20:51 +0200 Subject: [PATCH 2/4] Move rand benches to their own crate --- .github/workflows/test.yml | 2 +- Cargo.toml | 22 +------------ rand_benches/Cargo.toml | 32 +++++++++++++++++++ .../benches}/distributions.rs | 0 .../benches}/generators.rs | 0 {benches => rand_benches/benches}/misc.rs | 0 {benches => rand_benches/benches}/seq.rs | 0 .../benches}/seq_choose.rs | 0 {benches => rand_benches/benches}/shuffle.rs | 0 {benches => rand_benches/benches}/uniform.rs | 0 .../benches}/uniform_float.rs | 0 {benches => rand_benches/benches}/weighted.rs | 0 rand_benches/src/main.rs | 3 ++ 13 files changed, 37 insertions(+), 22 deletions(-) create mode 100644 rand_benches/Cargo.toml rename {benches => rand_benches/benches}/distributions.rs (100%) rename {benches => rand_benches/benches}/generators.rs (100%) rename {benches => rand_benches/benches}/misc.rs (100%) rename {benches => rand_benches/benches}/seq.rs (100%) rename {benches => rand_benches/benches}/seq_choose.rs (100%) rename {benches => rand_benches/benches}/shuffle.rs (100%) rename {benches => rand_benches/benches}/uniform.rs (100%) rename {benches => rand_benches/benches}/uniform_float.rs (100%) rename {benches => rand_benches/benches}/weighted.rs (100%) create mode 100644 rand_benches/src/main.rs diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index a1c5b39b61..f37ba69687 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -79,7 +79,7 @@ jobs: run: | cargo test --target ${{ matrix.target }} --features=nightly cargo test --target ${{ matrix.target }} --all-features - cargo test --target ${{ matrix.target }} --benches --features=small_rng,nightly + cargo test --target ${{ matrix.target }} --manifest-path rand_benches/Cargo.toml --benches --features=small_rng,nightly cargo test --target ${{ matrix.target }} --manifest-path rand_distr/Cargo.toml --benches cargo test --target ${{ matrix.target }} --lib --tests --no-default-features - name: Test rand diff --git a/Cargo.toml b/Cargo.toml index 539b153cc2..b983a1222d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -58,6 +58,7 @@ unbiased = [] [workspace] members = [ + "rand_benches", "rand_core", "rand_distr", "rand_chacha", @@ -76,24 +77,3 @@ rand_pcg = { path = "rand_pcg", version = "=0.9.0-alpha.1" } # Only to test serde1 bincode = "1.2.1" rayon = "1.5.3" -criterion = "0.5" - -[[bench]] -name = "uniform" -path = "benches/uniform.rs" -harness = false - -[[bench]] -name = "seq_choose" -path = "benches/seq_choose.rs" -harness = false - -[[bench]] -name = "shuffle" -path = "benches/shuffle.rs" -harness = false - -[[bench]] -name = "uniform_float" -path = "benches/uniform_float.rs" -harness = false diff --git a/rand_benches/Cargo.toml b/rand_benches/Cargo.toml new file mode 100644 index 0000000000..7c7448612e --- /dev/null +++ b/rand_benches/Cargo.toml @@ -0,0 +1,32 @@ +[package] +name = "rand_benches" +version = "0.1.0" +edition = "2021" + +[dependencies] + +[dev-dependencies] +rand = { path = "..", features = ["small_rng", "nightly"] } +rand_pcg = { path = "../rand_pcg" } +rand_chacha = { path = "../rand_chacha" } +criterion = "0.5" + +[[bench]] +name = "uniform" +path = "benches/uniform.rs" +harness = false + +[[bench]] +name = "seq_choose" +path = "benches/seq_choose.rs" +harness = false + +[[bench]] +name = "shuffle" +path = "benches/shuffle.rs" +harness = false + +[[bench]] +name = "uniform_float" +path = "benches/uniform_float.rs" +harness = false diff --git a/benches/distributions.rs b/rand_benches/benches/distributions.rs similarity index 100% rename from benches/distributions.rs rename to rand_benches/benches/distributions.rs diff --git a/benches/generators.rs b/rand_benches/benches/generators.rs similarity index 100% rename from benches/generators.rs rename to rand_benches/benches/generators.rs diff --git a/benches/misc.rs b/rand_benches/benches/misc.rs similarity index 100% rename from benches/misc.rs rename to rand_benches/benches/misc.rs diff --git a/benches/seq.rs b/rand_benches/benches/seq.rs similarity index 100% rename from benches/seq.rs rename to rand_benches/benches/seq.rs diff --git a/benches/seq_choose.rs b/rand_benches/benches/seq_choose.rs similarity index 100% rename from benches/seq_choose.rs rename to rand_benches/benches/seq_choose.rs diff --git a/benches/shuffle.rs b/rand_benches/benches/shuffle.rs similarity index 100% rename from benches/shuffle.rs rename to rand_benches/benches/shuffle.rs diff --git a/benches/uniform.rs b/rand_benches/benches/uniform.rs similarity index 100% rename from benches/uniform.rs rename to rand_benches/benches/uniform.rs diff --git a/benches/uniform_float.rs b/rand_benches/benches/uniform_float.rs similarity index 100% rename from benches/uniform_float.rs rename to rand_benches/benches/uniform_float.rs diff --git a/benches/weighted.rs b/rand_benches/benches/weighted.rs similarity index 100% rename from benches/weighted.rs rename to rand_benches/benches/weighted.rs diff --git a/rand_benches/src/main.rs b/rand_benches/src/main.rs new file mode 100644 index 0000000000..cf98dd1b9f --- /dev/null +++ b/rand_benches/src/main.rs @@ -0,0 +1,3 @@ +fn main() { + println!("Please use `cargo bench` to run the benchmarks instead."); +} From 9855f379306def0198cb1020dede60afb47322c2 Mon Sep 17 00:00:00 2001 From: Vinzent Steinberg Date: Fri, 26 Apr 2024 14:22:00 +0200 Subject: [PATCH 3/4] Pin rayon and rayon-core to support MSRV 1.61 --- Cargo.toml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index b983a1222d..0ec32ee583 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -76,4 +76,5 @@ zerocopy = { version = "=0.8.0-alpha.6", default-features = false, features = [" rand_pcg = { path = "rand_pcg", version = "=0.9.0-alpha.1" } # Only to test serde1 bincode = "1.2.1" -rayon = "1.5.3" +rayon = "=1.7" +rayon-core = "=1.11" From 0935356be9e0c3b057fafa12dd258a0b10a4ea92 Mon Sep 17 00:00:00 2001 From: Vinzent Steinberg Date: Fri, 26 Apr 2024 14:25:51 +0200 Subject: [PATCH 4/4] Fix benches test in pipeline --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index f37ba69687..ee1f2032f1 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -79,7 +79,7 @@ jobs: run: | cargo test --target ${{ matrix.target }} --features=nightly cargo test --target ${{ matrix.target }} --all-features - cargo test --target ${{ matrix.target }} --manifest-path rand_benches/Cargo.toml --benches --features=small_rng,nightly + cargo test --target ${{ matrix.target }} --manifest-path rand_benches/Cargo.toml --benches cargo test --target ${{ matrix.target }} --manifest-path rand_distr/Cargo.toml --benches cargo test --target ${{ matrix.target }} --lib --tests --no-default-features - name: Test rand