Skip to content

Commit f9210c4

Browse files
committed
FEAT: Update ndarray-parallel for rayon 1.0
1 parent a9cac28 commit f9210c4

File tree

4 files changed

+7
-8
lines changed

4 files changed

+7
-8
lines changed

parallel/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ keywords = ["data-structure", "multidimensional", "parallel", "concurrent"]
1313
categories = ["data-structures", "science", "concurrency"]
1414

1515
[dependencies]
16-
rayon = { version = "0.9.0" }
16+
rayon = { version = "1.0" }
1717
ndarray = { version = "0.11.0", path = "../" }
1818

1919
[dev-dependencies]

parallel/benches/rayon.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@ use std::cmp::max;
2121
fn set_threads() {
2222
let n = max(1, num_cpus::get() / 2);
2323
//println!("Using {} threads", n);
24-
let cfg = rayon::Configuration::new().num_threads(n);
25-
let _ = rayon::initialize(cfg);
24+
let _ = rayon::ThreadPoolBuilder::new().num_threads(n).build_global();
2625
}
2726

2827
#[bench]

parallel/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
//! a.axis_iter(Axis(0))
5959
//! .into_par_iter()
6060
//! .map(|row| row.scalar_sum())
61-
//! .collect_into(&mut sums);
61+
//! .collect_into_vec(&mut sums);
6262
//!
6363
//! assert_eq!(sums, [120., 376., 632., 888.]);
6464
//! }

parallel/src/par.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ macro_rules! par_iter_wrapper {
5353
bridge(self, consumer)
5454
}
5555

56-
fn opt_len(&mut self) -> Option<usize> {
56+
fn opt_len(&self) -> Option<usize> {
5757
Some(self.iter.len())
5858
}
5959
}
@@ -68,7 +68,7 @@ macro_rules! par_iter_wrapper {
6868
callback.callback(ParallelProducer(self.iter))
6969
}
7070

71-
fn len(&mut self) -> usize {
71+
fn len(&self) -> usize {
7272
ExactSizeIterator::len(&self.iter)
7373
}
7474

@@ -145,7 +145,7 @@ macro_rules! par_iter_view_wrapper {
145145
bridge_unindexed(ParallelProducer(self.iter), consumer)
146146
}
147147

148-
fn opt_len(&mut self) -> Option<usize> {
148+
fn opt_len(&self) -> Option<usize> {
149149
None
150150
}
151151
}
@@ -223,7 +223,7 @@ macro_rules! zip_impl {
223223
bridge_unindexed(ParallelProducer(self.iter), consumer)
224224
}
225225

226-
fn opt_len(&mut self) -> Option<usize> {
226+
fn opt_len(&self) -> Option<usize> {
227227
None
228228
}
229229
}

0 commit comments

Comments
 (0)