From 3e1dd3601186edf94bf73072d74870c7148e98ec Mon Sep 17 00:00:00 2001 From: Ryo Onodera Date: Sun, 10 Jul 2022 17:55:33 +0900 Subject: [PATCH] Propagate crossbeam's reduced-collection-frequency --- Cargo.toml | 8 +++++++- rayon-core/Cargo.toml | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index a3e0bff56..3f3b5bfa6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -18,9 +18,15 @@ exclude = ["/ci/*", "/scripts/*", "/.github/*", "/bors.toml"] members = ["rayon-demo", "rayon-core"] exclude = ["ci"] +[features] +crossbeam-epoch-reduced-collection-frequency = ["rayon-core/crossbeam-epoch-reduced-collection-frequency"] + [dependencies] rayon-core = { version = "1.9.2", path = "rayon-core" } -crossbeam-deque = "0.8.1" + +[dependencies.crossbeam-deque] +git = "https://github.com/ryoqun/crossbeam" +rev = "340232bf3fd76786836105b0c5e3b4fee05b1895" # This is a public dependency! [dependencies.either] diff --git a/rayon-core/Cargo.toml b/rayon-core/Cargo.toml index db0bb48e9..36602f777 100644 --- a/rayon-core/Cargo.toml +++ b/rayon-core/Cargo.toml @@ -14,13 +14,19 @@ readme = "README.md" keywords = ["parallel", "thread", "concurrency", "join", "performance"] categories = ["concurrency"] +[features] +crossbeam-epoch-reduced-collection-frequency = ["crossbeam-deque/epoch-reduced-collection-frequency"] + # Some dependencies may not be their latest version, in order to support older rustc. [dependencies] num_cpus = "1.2" crossbeam-channel = "0.5.0" -crossbeam-deque = "0.8.1" crossbeam-utils = "0.8.0" +[dependencies.crossbeam-deque] +git = "https://github.com/ryoqun/crossbeam" +rev = "340232bf3fd76786836105b0c5e3b4fee05b1895" + [dev-dependencies] rand = "0.8" rand_xorshift = "0.3"