Skip to content

Commit 4e2a70f

Browse files
authored
Allows benchmarks that do not use linspace to run on no_std (#1495)
1 parent 2a5cae1 commit 4e2a70f

File tree

6 files changed

+19
-1
lines changed

6 files changed

+19
-1
lines changed

benches/bench1.rs

+5
Original file line numberDiff line numberDiff line change
@@ -982,6 +982,7 @@ fn dot_extended(bench: &mut test::Bencher)
982982

983983
const MEAN_SUM_N: usize = 127;
984984

985+
#[cfg(feature = "std")]
985986
fn range_mat(m: Ix, n: Ix) -> Array2<f32>
986987
{
987988
assert!(m * n != 0);
@@ -990,27 +991,31 @@ fn range_mat(m: Ix, n: Ix) -> Array2<f32>
990991
.unwrap()
991992
}
992993

994+
#[cfg(feature = "std")]
993995
#[bench]
994996
fn mean_axis0(bench: &mut test::Bencher)
995997
{
996998
let a = range_mat(MEAN_SUM_N, MEAN_SUM_N);
997999
bench.iter(|| a.mean_axis(Axis(0)));
9981000
}
9991001

1002+
#[cfg(feature = "std")]
10001003
#[bench]
10011004
fn mean_axis1(bench: &mut test::Bencher)
10021005
{
10031006
let a = range_mat(MEAN_SUM_N, MEAN_SUM_N);
10041007
bench.iter(|| a.mean_axis(Axis(1)));
10051008
}
10061009

1010+
#[cfg(feature = "std")]
10071011
#[bench]
10081012
fn sum_axis0(bench: &mut test::Bencher)
10091013
{
10101014
let a = range_mat(MEAN_SUM_N, MEAN_SUM_N);
10111015
bench.iter(|| a.sum_axis(Axis(0)));
10121016
}
10131017

1018+
#[cfg(feature = "std")]
10141019
#[bench]
10151020
fn sum_axis1(bench: &mut test::Bencher)
10161021
{

benches/construct.rs

+2
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ fn zeros_f64(bench: &mut Bencher)
1919
bench.iter(|| Array::<f64, _>::zeros((128, 128)))
2020
}
2121

22+
#[cfg(feature = "std")]
2223
#[bench]
2324
fn map_regular(bench: &mut test::Bencher)
2425
{
@@ -28,6 +29,7 @@ fn map_regular(bench: &mut test::Bencher)
2829
bench.iter(|| a.map(|&x| 2. * x));
2930
}
3031

32+
#[cfg(feature = "std")]
3133
#[bench]
3234
fn map_stride(bench: &mut test::Bencher)
3335
{

benches/higher-order.rs

+5
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ const N: usize = 1024;
1212
const X: usize = 64;
1313
const Y: usize = 16;
1414

15+
#[cfg(feature = "std")]
1516
#[bench]
1617
fn map_regular(bench: &mut Bencher)
1718
{
@@ -26,6 +27,7 @@ pub fn double_array(mut a: ArrayViewMut2<'_, f64>)
2627
a *= 2.0;
2728
}
2829

30+
#[cfg(feature = "std")]
2931
#[bench]
3032
fn map_stride_double_f64(bench: &mut Bencher)
3133
{
@@ -38,6 +40,7 @@ fn map_stride_double_f64(bench: &mut Bencher)
3840
});
3941
}
4042

43+
#[cfg(feature = "std")]
4144
#[bench]
4245
fn map_stride_f64(bench: &mut Bencher)
4346
{
@@ -48,6 +51,7 @@ fn map_stride_f64(bench: &mut Bencher)
4851
bench.iter(|| av.map(|&x| 2. * x));
4952
}
5053

54+
#[cfg(feature = "std")]
5155
#[bench]
5256
fn map_stride_u32(bench: &mut Bencher)
5357
{
@@ -59,6 +63,7 @@ fn map_stride_u32(bench: &mut Bencher)
5963
bench.iter(|| av.map(|&x| 2 * x));
6064
}
6165

66+
#[cfg(feature = "std")]
6267
#[bench]
6368
fn fold_axis(bench: &mut Bencher)
6469
{

benches/iter.rs

+6
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ fn iter_sum_2d_transpose(bench: &mut Bencher)
4545
bench.iter(|| a.iter().sum::<i32>());
4646
}
4747

48+
#[cfg(feature = "std")]
4849
#[bench]
4950
fn iter_filter_sum_2d_u32(bench: &mut Bencher)
5051
{
@@ -55,6 +56,7 @@ fn iter_filter_sum_2d_u32(bench: &mut Bencher)
5556
bench.iter(|| b.iter().filter(|&&x| x < 75).sum::<u32>());
5657
}
5758

59+
#[cfg(feature = "std")]
5860
#[bench]
5961
fn iter_filter_sum_2d_f32(bench: &mut Bencher)
6062
{
@@ -65,6 +67,7 @@ fn iter_filter_sum_2d_f32(bench: &mut Bencher)
6567
bench.iter(|| b.iter().filter(|&&x| x < 75.).sum::<f32>());
6668
}
6769

70+
#[cfg(feature = "std")]
6871
#[bench]
6972
fn iter_filter_sum_2d_stride_u32(bench: &mut Bencher)
7073
{
@@ -76,6 +79,7 @@ fn iter_filter_sum_2d_stride_u32(bench: &mut Bencher)
7679
bench.iter(|| b.iter().filter(|&&x| x < 75).sum::<u32>());
7780
}
7881

82+
#[cfg(feature = "std")]
7983
#[bench]
8084
fn iter_filter_sum_2d_stride_f32(bench: &mut Bencher)
8185
{
@@ -87,6 +91,7 @@ fn iter_filter_sum_2d_stride_f32(bench: &mut Bencher)
8791
bench.iter(|| b.iter().filter(|&&x| x < 75.).sum::<f32>());
8892
}
8993

94+
#[cfg(feature = "std")]
9095
#[bench]
9196
fn iter_rev_step_by_contiguous(bench: &mut Bencher)
9297
{
@@ -98,6 +103,7 @@ fn iter_rev_step_by_contiguous(bench: &mut Bencher)
98103
});
99104
}
100105

106+
#[cfg(feature = "std")]
101107
#[bench]
102108
fn iter_rev_step_by_discontiguous(bench: &mut Bencher)
103109
{

benches/numeric.rs

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ const N: usize = 1024;
99
const X: usize = 64;
1010
const Y: usize = 16;
1111

12+
#[cfg(feature = "std")]
1213
#[bench]
1314
fn clip(bench: &mut Bencher)
1415
{

src/linalg/impl_linalg.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1071,7 +1071,6 @@ mod blas_tests
10711071

10721072
for stride in 1..=MAXSTRIDE {
10731073
let m = ArrayView::from_shape((N, N).strides((stride, 1)), &data).unwrap();
1074-
eprintln!("{:?}", m);
10751074

10761075
if stride < N {
10771076
assert_eq!(get_blas_compatible_layout(&m), None);

0 commit comments

Comments
 (0)