Skip to content

Commit 19c0692

Browse files
committed
ci fixed for the parallelization feature
1 parent 453260b commit 19c0692

File tree

3 files changed

+30
-25
lines changed

3 files changed

+30
-25
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,14 @@ jobs:
3939
- name: Build-32bit
4040
run: cargo build --verbose --target i686-unknown-linux-musl
4141
- name: Build-wasm
42-
run: cargo build --verbose --target wasm32v1-none
42+
run: cargo build --verbose --no-default-features --target wasm32v1-none
4343

4444
- name: Test
4545
run: cargo test --verbose
4646
- name: Test-32bit
4747
run: cargo test --verbose --target i686-unknown-linux-musl
4848
- name: Check-wasm
49-
run: cargo check --verbose --target wasm32v1-none
49+
run: cargo check --verbose --no-default-features --target wasm32v1-none
5050

5151
- name: Clippy
5252
run: cargo clippy -- -D warnings --verbose
@@ -55,4 +55,4 @@ jobs:
5555
run: cargo +nightly miri test --verbose
5656

5757
- name: NoStd
58-
run: cargo +nightly no-std-check
58+
run: cargo +nightly no-std-check --no-default-features

examples/bench_parallelization.rs

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
// cargo run --release --example bench_parallelization
2-
// cargo run --release --example bench_parallelization -- --help
3-
// cargo run --release --example bench_parallelization -- --len 50000 --num-repetitions 20
1+
// cargo run --release --features orx-parallel --example bench_parallelization
2+
// cargo run --release --features orx-parallel --example bench_parallelization -- --help
3+
// cargo run --release --features orx-parallel --example bench_parallelization -- --len 50000 --num-repetitions 20
44

55
mod utils;
66

@@ -33,7 +33,7 @@ fn main() {
3333
let args = Args::parse();
3434

3535
let expected_output = {
36-
let list: Vec<_> = (0..args.len as usize).collect();
36+
let list: DoublyList<_> = (0..args.len as usize).collect();
3737

3838
list.iter()
3939
.filter(|x| *x % 3 != 0)
@@ -55,6 +55,7 @@ fn main() {
5555
.collect::<Vec<_>>()
5656
}),
5757
),
58+
#[cfg(feature = "orx-parallel")]
5859
(
5960
"Sequential computation over DoublyList",
6061
Box::new(move || {
@@ -67,6 +68,7 @@ fn main() {
6768
.collect::<Vec<_>>()
6869
}),
6970
),
71+
#[cfg(feature = "orx-parallel")]
7072
(
7173
"Parallelized over DoublyList using orx_parallel",
7274
Box::new(move || {

examples/demo_parallelization.rs

Lines changed: 21 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// cargo run --release --example demo_parallelization
1+
// cargo run --release --features orx-parallel --example demo_parallelization
22

33
use orx_linked_list::*;
44

@@ -12,21 +12,24 @@ fn main() {
1212
let total_num_characters: usize = input.iter_x().map(|x| x.len()).sum();
1313
assert_eq!(total_num_characters, expected_num_characters);
1414

15-
// computation using parallel iterator: replace `iter_x()` with `par_x()`
16-
17-
let total_num_characters: usize = input.par_x().map(|x| x.len()).sum();
18-
assert_eq!(total_num_characters, expected_num_characters);
19-
20-
// configure parallel computation
21-
let total_num_characters: usize = input
22-
.par_x()
23-
.num_threads(2)
24-
.chunk_size(64)
25-
.map(|x| x.len())
26-
.sum();
27-
assert_eq!(total_num_characters, expected_num_characters);
28-
29-
// consuming parallel iterator: replace `into_iter_x` with `into_par_x`
30-
let total_num_characters: usize = input.into_par_x().map(|x| x.len()).sum();
31-
assert_eq!(total_num_characters, expected_num_characters);
15+
#[cfg(feature = "orx-parallel")]
16+
{
17+
// computation using parallel iterator: replace `iter_x()` with `par_x()`
18+
19+
let total_num_characters: usize = input.par_x().map(|x| x.len()).sum();
20+
assert_eq!(total_num_characters, expected_num_characters);
21+
22+
// configure parallel computation
23+
let total_num_characters: usize = input
24+
.par_x()
25+
.num_threads(2)
26+
.chunk_size(64)
27+
.map(|x| x.len())
28+
.sum();
29+
assert_eq!(total_num_characters, expected_num_characters);
30+
31+
// consuming parallel iterator: replace `into_iter_x` with `into_par_x`
32+
let total_num_characters: usize = input.into_par_x().map(|x| x.len()).sum();
33+
assert_eq!(total_num_characters, expected_num_characters);
34+
}
3235
}

0 commit comments

Comments
 (0)