diff --git a/Cargo.lock b/Cargo.lock index f449cc4785..5cac11e595 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -8462,9 +8462,9 @@ checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3" [[package]] name = "rayon" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" +checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" dependencies = [ "either", "rayon-core", @@ -8472,14 +8472,12 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" +checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" dependencies = [ - "crossbeam-channel", "crossbeam-deque", "crossbeam-utils", - "num_cpus", ] [[package]] diff --git a/crates/sc-consensus-subspace/Cargo.toml b/crates/sc-consensus-subspace/Cargo.toml index dafc4169dc..f422417078 100644 --- a/crates/sc-consensus-subspace/Cargo.toml +++ b/crates/sc-consensus-subspace/Cargo.toml @@ -25,7 +25,7 @@ parking_lot = "0.12.1" prometheus-endpoint = { package = "substrate-prometheus-endpoint", git = "https://github.com/subspace/polkadot-sdk", rev = "920fb277d5ea16a3b0918052c7555026a1ac2c6c", version = "0.10.0-dev" } rand = "0.8.5" rand_chacha = "0.3.1" -rayon = "1.7.0" +rayon = "1.8.0" schnorrkel = "0.9.1" sc-client-api = { version = "4.0.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "920fb277d5ea16a3b0918052c7555026a1ac2c6c" } sc-consensus = { version = "0.10.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "920fb277d5ea16a3b0918052c7555026a1ac2c6c" } diff --git a/crates/sc-proof-of-time/Cargo.toml b/crates/sc-proof-of-time/Cargo.toml index c84fe91b78..6660bb5168 100644 --- a/crates/sc-proof-of-time/Cargo.toml +++ b/crates/sc-proof-of-time/Cargo.toml @@ -34,7 +34,7 @@ sp-runtime = { version = "24.0.0", git = "https://github.com/subspace/polkadot-s subspace-core-primitives = { version = "0.1.0", path = "../subspace-core-primitives" } subspace-proof-of-time = { version = "0.1.0", path = "../subspace-proof-of-time" } parking_lot = "0.12.1" -rayon = "1.7.0" +rayon = "1.8.0" thiserror = "1.0.48" tokio = { version = "1.32.0", features = ["macros", "time"] } tracing = "0.1.37" diff --git a/crates/subspace-archiving/Cargo.toml b/crates/subspace-archiving/Cargo.toml index bec72a9e95..9d49aee1a2 100644 --- a/crates/subspace-archiving/Cargo.toml +++ b/crates/subspace-archiving/Cargo.toml @@ -18,7 +18,7 @@ bench = false [dependencies] parity-scale-codec = { version = "3.6.5", default-features = false, features = ["derive"] } -rayon = { version = "1.7.0", optional = true } +rayon = { version = "1.8.0", optional = true } serde = { version = "1.0.183", optional = true, features = ["derive"] } subspace-core-primitives = { version = "0.1.0", path = "../subspace-core-primitives", default-features = false } subspace-erasure-coding = { version = "0.1.0", path = "../subspace-erasure-coding", default-features = false } diff --git a/crates/subspace-core-primitives/Cargo.toml b/crates/subspace-core-primitives/Cargo.toml index 5cc0b19de2..8a33b145cd 100644 --- a/crates/subspace-core-primitives/Cargo.toml +++ b/crates/subspace-core-primitives/Cargo.toml @@ -26,7 +26,7 @@ kzg = { git = "https://github.com/subspace/rust-kzg", rev = "1058cc8c8af8461b490 num-traits = { version = "0.2.16", default-features = false } parity-scale-codec = { version = "3.6.5", default-features = false, features = ["derive", "max-encoded-len"] } parking_lot = { version = "0.12.1", optional = true } -rayon = { version = "1.7.0", optional = true } +rayon = { version = "1.8.0", optional = true } scale-info = { version = "2.7.0", default-features = false, features = ["derive"] } serde = { version = "1.0.183", optional = true, features = ["alloc", "derive"] } serde_arrays = { version = "0.1.0", optional = true } diff --git a/crates/subspace-farmer-components/Cargo.toml b/crates/subspace-farmer-components/Cargo.toml index 1432174837..a1559df367 100644 --- a/crates/subspace-farmer-components/Cargo.toml +++ b/crates/subspace-farmer-components/Cargo.toml @@ -27,7 +27,7 @@ libc = "0.2.146" lru = "0.11.0" parity-scale-codec = "3.6.5" rand = "0.8.5" -rayon = "1.7.0" +rayon = "1.8.0" schnorrkel = "0.9.1" serde = { version = "1.0.183", features = ["derive"] } static_assertions = "1.1.0" diff --git a/crates/subspace-farmer/Cargo.toml b/crates/subspace-farmer/Cargo.toml index fe247f3604..ee1d51a803 100644 --- a/crates/subspace-farmer/Cargo.toml +++ b/crates/subspace-farmer/Cargo.toml @@ -33,7 +33,7 @@ parity-scale-codec = "3.6.5" parking_lot = "0.12.1" prometheus-client = "0.21.2" rand = "0.8.5" -rayon = "1.7.0" +rayon = "1.8.0" schnorrkel = "0.9.1" serde = { version = "1.0.183", features = ["derive"] } serde_json = "1.0.106" diff --git a/crates/subspace-proof-of-space/Cargo.toml b/crates/subspace-proof-of-space/Cargo.toml index a81abb684e..8a333659ae 100644 --- a/crates/subspace-proof-of-space/Cargo.toml +++ b/crates/subspace-proof-of-space/Cargo.toml @@ -18,7 +18,7 @@ bench = false [dependencies] chacha20 = { version = "0.9.1", default-features = false } derive_more = "0.99.17" -rayon = { version = "1.7.0", optional = true } +rayon = { version = "1.8.0", optional = true } seq-macro = "0.3.5" sha2 = { version = "0.10.7", default-features = false } subspace-core-primitives = { version = "0.1.0", path = "../subspace-core-primitives", default-features = false } @@ -27,6 +27,7 @@ subspace-core-primitives = { version = "0.1.0", path = "../subspace-core-primiti bitvec = "1.0.1" criterion = "0.5.1" rand = "0.8.5" +rayon = "1.8.0" subspace-chiapos = { git = "https://github.com/subspace/chiapos", rev = "3b1ab3ca24764d25da30e0c8243e0bf304b776a5" } [[bench]] diff --git a/crates/subspace-proof-of-space/src/chiapos/table.rs b/crates/subspace-proof-of-space/src/chiapos/table.rs index 183eace7b3..cad041d6ec 100644 --- a/crates/subspace-proof-of-space/src/chiapos/table.rs +++ b/crates/subspace-proof-of-space/src/chiapos/table.rs @@ -194,7 +194,7 @@ pub(super) fn compute_f1_simd( ) -> [Y; COMPUTE_F1_SIMD_FACTOR] { // Each element contains `K` desired bits of `partial_ys` in the final offset of eventual `ys` // with the rest of bits being in undefined state - let pre_ys_bytes = Simd::from(seq!(N in 0..8 { + let pre_ys_bytes: Simd<_, COMPUTE_F1_SIMD_FACTOR> = Simd::from(seq!(N in 0..8 { [ #( { @@ -212,7 +212,7 @@ pub(super) fn compute_f1_simd( )* ] })); - let pre_ys_right_offset = Simd::from(seq!(N in 0..8 { + let pre_ys_right_offset: Simd<_, COMPUTE_F1_SIMD_FACTOR> = Simd::from(seq!(N in 0..8 { [ #( { @@ -515,7 +515,7 @@ where .array_chunks::<{ K as usize * COMPUTE_F1_SIMD_FACTOR / u8::BITS as usize }>() .copied(), ) { - let xs = seq!(N in 0..8 { + let xs: [_; COMPUTE_F1_SIMD_FACTOR] = seq!(N in 0..8 { [ #( #[allow(clippy::erasing_op, clippy::identity_op)] @@ -551,7 +551,7 @@ where .array_chunks::<{ K as usize * COMPUTE_F1_SIMD_FACTOR / u8::BITS as usize }>() .copied(), ) { - let xs = seq!(N in 0..8 { + let xs: [_; COMPUTE_F1_SIMD_FACTOR] = seq!(N in 0..8 { [ #( #[allow(clippy::erasing_op, clippy::identity_op)]