From b34f17954687bb72927821b717de89400128ab95 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Mon, 31 Aug 2020 20:38:33 -0700 Subject: [PATCH] Update to rayon 1.4.0 (bp #11898) (#11959) * Update to rayon 1.4.0 (#11898) Co-authored-by: sakridge Co-authored-by: Carl --- Cargo.lock | 10 +++++----- accounts-bench/Cargo.toml | 2 +- banking-bench/Cargo.toml | 2 +- bench-exchange/Cargo.toml | 2 +- bench-tps/Cargo.toml | 2 +- client/Cargo.toml | 2 +- core/Cargo.toml | 2 +- dos/Cargo.toml | 2 +- ledger/Cargo.toml | 2 +- perf/Cargo.toml | 2 +- poh-bench/Cargo.toml | 24 ++++++++++++++++++++++++ programs/bpf/Cargo.lock | 10 +++++----- runtime/Cargo.toml | 2 +- 13 files changed, 44 insertions(+), 20 deletions(-) create mode 100644 poh-bench/Cargo.toml diff --git a/Cargo.lock b/Cargo.lock index f2f8366de3f72a..6a4ae927d5400a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2679,9 +2679,9 @@ dependencies = [ [[package]] name = "rayon" -version = "1.3.1" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62f02856753d04e03e26929f820d0a0a337ebe71f849801eea335d464b349080" +checksum = "cfd016f0c045ad38b5251be2c9c0ab806917f82da4d36b2a327e5166adad9270" dependencies = [ "autocfg 1.0.0", "crossbeam-deque", @@ -2691,12 +2691,12 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.7.1" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e92e15d89083484e11353891f1af602cc661426deb9564c298b270c726973280" +checksum = "91739a34c4355b5434ce54c9086c5895604a9c278586d1f1aa95e04f66b525a0" dependencies = [ + "crossbeam-channel", "crossbeam-deque", - "crossbeam-queue", "crossbeam-utils", "lazy_static", "num_cpus", diff --git a/accounts-bench/Cargo.toml b/accounts-bench/Cargo.toml index 551e74274b1e0e..ab5e08f5cf9e86 100644 --- a/accounts-bench/Cargo.toml +++ b/accounts-bench/Cargo.toml @@ -9,7 +9,7 @@ homepage = "https://solana.com/" [dependencies] log = "0.4.6" -rayon = "1.3.0" +rayon = "1.4.0" solana-logger = { path = "../logger", version = "1.2.27" } solana-runtime = { path = "../runtime", version = "1.2.27" } solana-measure = { path = "../measure", version = "1.2.27" } diff --git a/banking-bench/Cargo.toml b/banking-bench/Cargo.toml index c34b7356763400..b2305797f667c5 100644 --- a/banking-bench/Cargo.toml +++ b/banking-bench/Cargo.toml @@ -12,7 +12,7 @@ clap = "2.33.1" crossbeam-channel = "0.4" log = "0.4.6" rand = "0.7.0" -rayon = "1.3.0" +rayon = "1.4.0" solana-core = { path = "../core", version = "1.2.27" } solana-clap-utils = { path = "../clap-utils", version = "1.2.27" } solana-streamer = { path = "../streamer", version = "1.2.27" } diff --git a/bench-exchange/Cargo.toml b/bench-exchange/Cargo.toml index ab29cdebf15da0..de063801202703 100644 --- a/bench-exchange/Cargo.toml +++ b/bench-exchange/Cargo.toml @@ -15,7 +15,7 @@ log = "0.4.8" num-derive = "0.3" num-traits = "0.2" rand = "0.7.0" -rayon = "1.3.0" +rayon = "1.4.0" serde_json = "1.0.53" serde_yaml = "0.8.12" solana-clap-utils = { path = "../clap-utils", version = "1.2.27" } diff --git a/bench-tps/Cargo.toml b/bench-tps/Cargo.toml index 8943afd43a765f..f3388f5d2f6a1d 100644 --- a/bench-tps/Cargo.toml +++ b/bench-tps/Cargo.toml @@ -11,7 +11,7 @@ homepage = "https://solana.com/" bincode = "1.3.1" clap = "2.33.1" log = "0.4.8" -rayon = "1.3.0" +rayon = "1.4.0" serde_json = "1.0.53" serde_yaml = "0.8.12" solana-clap-utils = { path = "../clap-utils", version = "1.2.27" } diff --git a/client/Cargo.toml b/client/Cargo.toml index 87f1e783a0c0f7..3a98843fde1e3d 100644 --- a/client/Cargo.toml +++ b/client/Cargo.toml @@ -14,7 +14,7 @@ bs58 = "0.3.1" indicatif = "0.14.0" jsonrpc-core = "14.1.0" log = "0.4.8" -rayon = "1.3.0" +rayon = "1.4.0" reqwest = { version = "0.10.4", default-features = false, features = ["blocking", "rustls-tls", "json"] } serde = "1.0.110" serde_derive = "1.0.103" diff --git a/core/Cargo.toml b/core/Cargo.toml index d53b688a46a2d4..32459fac642354 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -37,7 +37,7 @@ num_cpus = "1.13.0" num-traits = "0.2" rand = "0.7.0" rand_chacha = "0.2.2" -rayon = "1.3.0" +rayon = "1.4.0" regex = "1.3.7" serde = "1.0.110" serde_derive = "1.0.103" diff --git a/dos/Cargo.toml b/dos/Cargo.toml index 9ce64cd658b96f..96392a49c93dcb 100644 --- a/dos/Cargo.toml +++ b/dos/Cargo.toml @@ -12,7 +12,7 @@ bincode = "1.3.1" clap = "2.33.1" log = "0.4.8" rand = "0.7.0" -rayon = "1.3.0" +rayon = "1.4.0" solana-clap-utils = { path = "../clap-utils", version = "1.2.27" } solana-core = { path = "../core", version = "1.2.27" } solana-ledger = { path = "../ledger", version = "1.2.27" } diff --git a/ledger/Cargo.toml b/ledger/Cargo.toml index 4bcf4c57815180..115c125aa96a60 100644 --- a/ledger/Cargo.toml +++ b/ledger/Cargo.toml @@ -27,7 +27,7 @@ log = { version = "0.4.8" } num_cpus = "1.13.0" rand = "0.7.0" rand_chacha = "0.2.2" -rayon = "1.3.0" +rayon = "1.4.0" reed-solomon-erasure = { version = "4.0.2", features = ["simd-accel"] } regex = "1.3.7" serde = "1.0.110" diff --git a/perf/Cargo.toml b/perf/Cargo.toml index af7146e26a51b5..5c19b533d98223 100644 --- a/perf/Cargo.toml +++ b/perf/Cargo.toml @@ -12,7 +12,7 @@ edition = "2018" rand = "0.7.0" dlopen = "0.1.8" bincode = "1.3.1" -rayon = "1.3.0" +rayon = "1.4.0" serde = "1.0.110" dlopen_derive = "0.1.4" lazy_static = "1.4.0" diff --git a/poh-bench/Cargo.toml b/poh-bench/Cargo.toml new file mode 100644 index 00000000000000..d230b42f6ccc67 --- /dev/null +++ b/poh-bench/Cargo.toml @@ -0,0 +1,24 @@ +[package] +authors = ["Solana Maintainers "] +edition = "2018" +name = "solana-poh-bench" +version = "1.4.0" +repository = "https://github.com/solana-labs/solana" +license = "Apache-2.0" +homepage = "https://solana.com/" + +[dependencies] +clap = "2.33.1" +log = "0.4.6" +rand = "0.7.0" +rayon = "1.4.0" +solana-logger = { path = "../logger", version = "1.4.0" } +solana-ledger = { path = "../ledger", version = "1.4.0" } +solana-sdk = { path = "../sdk", version = "1.4.0" } +solana-clap-utils = { path = "../clap-utils", version = "1.4.0" } +solana-measure = { path = "../measure", version = "1.4.0" } +solana-version = { path = "../version", version = "1.4.0" } +solana-perf = { path = "../perf", version = "1.4.0" } + +[package.metadata.docs.rs] +targets = ["x86_64-unknown-linux-gnu"] diff --git a/programs/bpf/Cargo.lock b/programs/bpf/Cargo.lock index 0e91c5460f7273..9bc12df62bdf7f 100644 --- a/programs/bpf/Cargo.lock +++ b/programs/bpf/Cargo.lock @@ -1248,9 +1248,9 @@ dependencies = [ [[package]] name = "rayon" -version = "1.3.1" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62f02856753d04e03e26929f820d0a0a337ebe71f849801eea335d464b349080" +checksum = "cfd016f0c045ad38b5251be2c9c0ab806917f82da4d36b2a327e5166adad9270" dependencies = [ "autocfg", "crossbeam-deque", @@ -1260,12 +1260,12 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.7.1" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e92e15d89083484e11353891f1af602cc661426deb9564c298b270c726973280" +checksum = "91739a34c4355b5434ce54c9086c5895604a9c278586d1f1aa95e04f66b525a0" dependencies = [ + "crossbeam-channel", "crossbeam-deque", - "crossbeam-queue", "crossbeam-utils", "lazy_static", "num_cpus", diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml index fb08cc6ef9d3d7..c59f24a33ac033 100644 --- a/runtime/Cargo.toml +++ b/runtime/Cargo.toml @@ -24,7 +24,7 @@ num-derive = { version = "0.3" } num-traits = { version = "0.2" } num_cpus = "1.13.0" rand = "0.7.0" -rayon = "1.3.0" +rayon = "1.4.0" serde = { version = "1.0.110", features = ["rc"] } serde_derive = "1.0.103" solana-config-program = { path = "../programs/config", version = "1.2.27" }