Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions benches/bench1.rs
Original file line number Diff line number Diff line change
Expand Up @@ -982,6 +982,7 @@ fn dot_extended(bench: &mut test::Bencher)

const MEAN_SUM_N: usize = 127;

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

#[cfg(feature = "std")]
#[bench]
fn mean_axis0(bench: &mut test::Bencher)
{
let a = range_mat(MEAN_SUM_N, MEAN_SUM_N);
bench.iter(|| a.mean_axis(Axis(0)));
}

#[cfg(feature = "std")]
#[bench]
fn mean_axis1(bench: &mut test::Bencher)
{
let a = range_mat(MEAN_SUM_N, MEAN_SUM_N);
bench.iter(|| a.mean_axis(Axis(1)));
}

#[cfg(feature = "std")]
#[bench]
fn sum_axis0(bench: &mut test::Bencher)
{
let a = range_mat(MEAN_SUM_N, MEAN_SUM_N);
bench.iter(|| a.sum_axis(Axis(0)));
}

#[cfg(feature = "std")]
#[bench]
fn sum_axis1(bench: &mut test::Bencher)
{
Expand Down
2 changes: 2 additions & 0 deletions benches/construct.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ fn zeros_f64(bench: &mut Bencher)
bench.iter(|| Array::<f64, _>::zeros((128, 128)))
}

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

#[cfg(feature = "std")]
#[bench]
fn map_stride(bench: &mut test::Bencher)
{
Expand Down
5 changes: 5 additions & 0 deletions benches/higher-order.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ const N: usize = 1024;
const X: usize = 64;
const Y: usize = 16;

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

#[cfg(feature = "std")]
#[bench]
fn map_stride_double_f64(bench: &mut Bencher)
{
Expand All @@ -38,6 +40,7 @@ fn map_stride_double_f64(bench: &mut Bencher)
});
}

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

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

#[cfg(feature = "std")]
#[bench]
fn fold_axis(bench: &mut Bencher)
{
Expand Down
6 changes: 6 additions & 0 deletions benches/iter.rs
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ fn iter_sum_2d_transpose(bench: &mut Bencher)
bench.iter(|| a.iter().sum::<i32>());
}

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

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

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

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

#[cfg(feature = "std")]
#[bench]
fn iter_rev_step_by_contiguous(bench: &mut Bencher)
{
Expand All @@ -98,6 +103,7 @@ fn iter_rev_step_by_contiguous(bench: &mut Bencher)
});
}

#[cfg(feature = "std")]
#[bench]
fn iter_rev_step_by_discontiguous(bench: &mut Bencher)
{
Expand Down
1 change: 1 addition & 0 deletions benches/numeric.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ const N: usize = 1024;
const X: usize = 64;
const Y: usize = 16;

#[cfg(feature = "std")]
#[bench]
fn clip(bench: &mut Bencher)
{
Expand Down
1 change: 0 additions & 1 deletion src/linalg/impl_linalg.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1071,7 +1071,6 @@ mod blas_tests

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

if stride < N {
assert_eq!(get_blas_compatible_layout(&m), None);
Expand Down