diff options
author | Jeff Vander Stoep <jeffv@google.com> | 2023-03-10 20:32:17 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-03-10 20:32:17 +0000 |
commit | c7a291994efff0716ff725cb4ab0bf56f38ea0e0 (patch) | |
tree | 233a7ce1b06fc9c6a665f69f59d627b1111a8cf9 /src/stats/univariate/mod.rs | |
parent | 84147751e0fdbd38c3def24d5ad557400ef35b7e (diff) | |
parent | 19ca233fef56526b0864105a9061466883eca900 (diff) | |
download | criterion-c7a291994efff0716ff725cb4ab0bf56f38ea0e0.tar.gz |
Upgrade criterion to 0.4.0 am: 3c611a33f1 am: 8f1301829e am: 40e0d40821 am: 19ca233fef
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/criterion/+/2438096
Change-Id: Ic4a7be53328a27ef5efbe5b108ad3d53bb566024
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'src/stats/univariate/mod.rs')
-rwxr-xr-x | src/stats/univariate/mod.rs | 55 |
1 files changed, 42 insertions, 13 deletions
diff --git a/src/stats/univariate/mod.rs b/src/stats/univariate/mod.rs index 8dfb5f8..5b22127 100755 --- a/src/stats/univariate/mod.rs +++ b/src/stats/univariate/mod.rs @@ -11,6 +11,7 @@ pub mod outliers; use crate::stats::float::Float; use crate::stats::tuple::{Tuple, TupledDistributionsBuilder}; +#[cfg(feature = "rayon")] use rayon::prelude::*; use std::cmp; @@ -42,11 +43,42 @@ where let nresamples_sqrt = (nresamples as f64).sqrt().ceil() as usize; let per_chunk = (nresamples + nresamples_sqrt - 1) / nresamples_sqrt; - (0..nresamples_sqrt) - .into_par_iter() - .map_init( - || (Resamples::new(a), Resamples::new(b)), - |(a_resamples, b_resamples), i| { + #[cfg(feature = "rayon")] + { + (0..nresamples_sqrt) + .into_par_iter() + .map_init( + || (Resamples::new(a), Resamples::new(b)), + |(a_resamples, b_resamples), i| { + let start = i * per_chunk; + let end = cmp::min((i + 1) * per_chunk, nresamples); + let a_resample = a_resamples.next(); + + let mut sub_distributions: T::Builder = + TupledDistributionsBuilder::new(end - start); + + for _ in start..end { + let b_resample = b_resamples.next(); + sub_distributions.push(statistic(a_resample, b_resample)); + } + sub_distributions + }, + ) + .reduce( + || T::Builder::new(0), + |mut a, mut b| { + a.extend(&mut b); + a + }, + ) + .complete() + } + #[cfg(not(feature = "rayon"))] + { + let mut a_resamples = Resamples::new(a); + let mut b_resamples = Resamples::new(b); + (0..nresamples_sqrt) + .map(|i| { let start = i * per_chunk; let end = cmp::min((i + 1) * per_chunk, nresamples); let a_resample = a_resamples.next(); @@ -59,14 +91,11 @@ where sub_distributions.push(statistic(a_resample, b_resample)); } sub_distributions - }, - ) - .reduce( - || T::Builder::new(0), - |mut a, mut b| { + }) + .fold(T::Builder::new(0), |mut a, mut b| { a.extend(&mut b); a - }, - ) - .complete() + }) + .complete() + } } |