Skip to content

Commit a7dcc69

Browse files
watsaigwatsaig
committed
formatting
1 parent 91ae90a commit a7dcc69

35 files changed

Lines changed: 437 additions & 999 deletions

‎crates/blas-tests/src/lib.rs‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
#[cfg(not(feature = "blas-src"))]
2-
compile_error!("Missing backend: could not compile.
2+
compile_error!(
3+
"Missing backend: could not compile.
34
Help: For this testing crate, select one of the blas backend features, for example \
4-
openblas-system");
5+
openblas-system"
6+
);

‎crates/blas-tests/tests/oper.rs‎

Lines changed: 5 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -315,12 +315,7 @@ fn gemm_c64_1_f()
315315
let mut y = range_mat_complex64(m, 1);
316316
let answer = reference_mat_mul(&a, &x) + &y;
317317
general_mat_mul(Complex64::new(1.0, 0.), &a, &x, Complex64::new(1.0, 0.), &mut y);
318-
assert_relative_eq!(
319-
y.mapv(|i| i.norm_sqr()),
320-
answer.mapv(|i| i.norm_sqr()),
321-
epsilon = 1e-12,
322-
max_relative = 1e-7
323-
);
318+
assert_relative_eq!(y.mapv(|i| i.norm_sqr()), answer.mapv(|i| i.norm_sqr()), epsilon = 1e-12, max_relative = 1e-7);
324319
}
325320

326321
#[test]
@@ -333,12 +328,7 @@ fn gemm_c32_1_f()
333328
let mut y = range_mat_complex(m, 1);
334329
let answer = reference_mat_mul(&a, &x) + &y;
335330
general_mat_mul(Complex32::new(1.0, 0.), &a, &x, Complex32::new(1.0, 0.), &mut y);
336-
assert_relative_eq!(
337-
y.mapv(|i| i.norm_sqr()),
338-
answer.mapv(|i| i.norm_sqr()),
339-
epsilon = 1e-12,
340-
max_relative = 1e-7
341-
);
331+
assert_relative_eq!(y.mapv(|i| i.norm_sqr()), answer.mapv(|i| i.norm_sqr()), epsilon = 1e-12, max_relative = 1e-7);
342332
}
343333

344334
#[test]
@@ -353,30 +343,15 @@ fn gemm_c64_actually_complex()
353343
let beta = Complex64::new(1.0, 1.0);
354344
let answer = alpha * reference_mat_mul(&a, &b) + beta * &y;
355345
general_mat_mul(alpha.clone(), &a, &b, beta.clone(), &mut y);
356-
assert_relative_eq!(
357-
y.mapv(|i| i.norm_sqr()),
358-
answer.mapv(|i| i.norm_sqr()),
359-
epsilon = 1e-12,
360-
max_relative = 1e-7
361-
);
346+
assert_relative_eq!(y.mapv(|i| i.norm_sqr()), answer.mapv(|i| i.norm_sqr()), epsilon = 1e-12, max_relative = 1e-7);
362347
}
363348

364349
#[test]
365350
fn gen_mat_vec_mul()
366351
{
367352
let alpha = -2.3;
368353
let beta = 3.14;
369-
let sizes = vec![
370-
(4, 4),
371-
(8, 8),
372-
(17, 15),
373-
(4, 17),
374-
(17, 3),
375-
(19, 18),
376-
(16, 17),
377-
(15, 16),
378-
(67, 63),
379-
];
354+
let sizes = vec![(4, 4), (8, 8), (17, 15), (4, 17), (17, 3), (19, 18), (16, 17), (15, 16), (67, 63)];
380355
// test different strides
381356
for &s1 in &[1, 2, -1, -2] {
382357
for &s2 in &[1, 2, -1, -2] {
@@ -408,17 +383,7 @@ fn gen_mat_vec_mul()
408383
#[test]
409384
fn vec_mat_mul()
410385
{
411-
let sizes = vec![
412-
(4, 4),
413-
(8, 8),
414-
(17, 15),
415-
(4, 17),
416-
(17, 3),
417-
(19, 18),
418-
(16, 17),
419-
(15, 16),
420-
(67, 63),
421-
];
386+
let sizes = vec![(4, 4), (8, 8), (17, 15), (4, 17), (17, 3), (19, 18), (16, 17), (15, 16), (67, 63)];
422387
// test different strides
423388
for &s1 in &[1, 2, -1, -2] {
424389
for &s2 in &[1, 2, -1, -2] {

‎crates/numeric-tests/tests/accuracy.rs‎

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -216,9 +216,14 @@ where
216216
let diff = &c - &reference;
217217
let max_diff = diff.iter().copied().fold(A::zero(), A::max);
218218
let max_elt = reference.iter().copied().fold(A::zero(), A::max);
219-
println!("Max elt diff={:?}, max={:?}, ratio={:.4e}", max_diff, max_elt, (max_diff/max_elt).as_());
220-
assert!((max_diff / max_elt).as_() < limit,
221-
"Expected relative norm diff < {:e}, found {:?} / {:?}", limit, max_diff, max_elt);
219+
println!("Max elt diff={:?}, max={:?}, ratio={:.4e}", max_diff, max_elt, (max_diff / max_elt).as_());
220+
assert!(
221+
(max_diff / max_elt).as_() < limit,
222+
"Expected relative norm diff < {:e}, found {:?} / {:?}",
223+
limit,
224+
max_diff,
225+
max_elt
226+
);
222227
}
223228
}
224229

@@ -249,9 +254,14 @@ where
249254
let max_elt = |elt: &Complex<_>| A::max(A::abs(elt.re), A::abs(elt.im));
250255
let max_diff = diff.iter().map(max_elt).fold(A::zero(), A::max);
251256
let max_elt = reference.iter().map(max_elt).fold(A::zero(), A::max);
252-
println!("Max elt diff={:?}, max={:?}, ratio={:.4e}", max_diff, max_elt, (max_diff/max_elt).as_());
253-
assert!((max_diff / max_elt).as_() < limit,
254-
"Expected relative norm diff < {:e}, found {:?} / {:?}", limit, max_diff, max_elt);
257+
println!("Max elt diff={:?}, max={:?}, ratio={:.4e}", max_diff, max_elt, (max_diff / max_elt).as_());
258+
assert!(
259+
(max_diff / max_elt).as_() < limit,
260+
"Expected relative norm diff < {:e}, found {:?} / {:?}",
261+
limit,
262+
max_diff,
263+
max_elt
264+
);
255265
}
256266
}
257267

‎src/array_approx.rs‎

Lines changed: 9 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -89,19 +89,14 @@ macro_rules! impl_approx_traits {
8989
A::default_max_relative()
9090
}
9191

92-
fn relative_eq(
93-
&self,
94-
other: &ArrayRef<B, D>,
95-
epsilon: A::Epsilon,
96-
max_relative: A::Epsilon,
97-
) -> bool {
92+
fn relative_eq(&self, other: &ArrayRef<B, D>, epsilon: A::Epsilon, max_relative: A::Epsilon) -> bool {
9893
if self.shape() != other.shape() {
9994
return false;
10095
}
10196

102-
Zip::from(self).and(other).all(move |a, b| {
103-
A::relative_eq(a, b, epsilon.clone(), max_relative.clone())
104-
})
97+
Zip::from(self)
98+
.and(other)
99+
.all(move |a, b| A::relative_eq(a, b, epsilon.clone(), max_relative.clone()))
105100
}
106101
}
107102

@@ -118,12 +113,7 @@ macro_rules! impl_approx_traits {
118113
A::default_max_relative()
119114
}
120115

121-
fn relative_eq(
122-
&self,
123-
other: &ArrayBase<S2, D>,
124-
epsilon: A::Epsilon,
125-
max_relative: A::Epsilon,
126-
) -> bool {
116+
fn relative_eq(&self, other: &ArrayBase<S2, D>, epsilon: A::Epsilon, max_relative: A::Epsilon) -> bool {
127117
(**self).relative_eq(other, epsilon, max_relative)
128118
}
129119
}
@@ -139,12 +129,7 @@ macro_rules! impl_approx_traits {
139129
A::default_max_ulps()
140130
}
141131

142-
fn ulps_eq(
143-
&self,
144-
other: &ArrayRef<B, D>,
145-
epsilon: A::Epsilon,
146-
max_ulps: u32,
147-
) -> bool {
132+
fn ulps_eq(&self, other: &ArrayRef<B, D>, epsilon: A::Epsilon, max_ulps: u32) -> bool {
148133
if self.shape() != other.shape() {
149134
return false;
150135
}
@@ -168,12 +153,7 @@ macro_rules! impl_approx_traits {
168153
A::default_max_ulps()
169154
}
170155

171-
fn ulps_eq(
172-
&self,
173-
other: &ArrayBase<S2, D>,
174-
epsilon: A::Epsilon,
175-
max_ulps: u32,
176-
) -> bool {
156+
fn ulps_eq(&self, other: &ArrayBase<S2, D>, epsilon: A::Epsilon, max_ulps: u32) -> bool {
177157
(**self).ulps_eq(other, epsilon, max_ulps)
178158
}
179159
}
@@ -183,8 +163,8 @@ macro_rules! impl_approx_traits {
183163
use crate::prelude::*;
184164
use alloc::vec;
185165
use $approx::{
186-
assert_abs_diff_eq, assert_abs_diff_ne, assert_relative_eq, assert_relative_ne,
187-
assert_ulps_eq, assert_ulps_ne,
166+
assert_abs_diff_eq, assert_abs_diff_ne, assert_relative_eq, assert_relative_ne, assert_ulps_eq,
167+
assert_ulps_ne,
188168
};
189169

190170
#[test]

‎src/arrayformat.rs‎

Lines changed: 4 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -221,13 +221,7 @@ impl<A: fmt::Debug, D: Dimension> fmt::Debug for ArrayRef<A, D>
221221
format_array(self, f, <_>::fmt, &fmt_opt)?;
222222

223223
// Add extra information for Debug
224-
write!(
225-
f,
226-
", shape={:?}, strides={:?}, layout={:?}",
227-
self.shape(),
228-
self.strides(),
229-
self.view().layout(),
230-
)?;
224+
write!(f, ", shape={:?}, strides={:?}, layout={:?}", self.shape(), self.strides(), self.view().layout(),)?;
231225
match D::NDIM {
232226
Some(ndim) => write!(f, ", const ndim={}", ndim)?,
233227
None => write!(f, ", dynamic ndim={}", self.ndim())?,
@@ -355,12 +349,7 @@ mod formatting_with_omit
355349
fn assert_str_eq(expected: &str, actual: &str)
356350
{
357351
// use assert to avoid printing the strings twice on failure
358-
assert!(
359-
expected == actual,
360-
"formatting assertion failed\nexpected:\n{}\nactual:\n{}\n",
361-
expected,
362-
actual,
363-
);
352+
assert!(expected == actual, "formatting assertion failed\nexpected:\n{}\nactual:\n{}\n", expected, actual,);
364353
}
365354

366355
fn ellipsize(limit: usize, sep: &str, elements: impl IntoIterator<Item = impl fmt::Display>) -> String
@@ -456,10 +445,7 @@ mod formatting_with_omit
456445
let a = Array2::from_elem((ARRAY_MANY_ELEMENT_LIMIT / 10, 10), 1);
457446
let actual = format!("{}", a);
458447
let row = format!("{}", a.row(0));
459-
let expected = format!(
460-
"[{}]",
461-
ellipsize(AXIS_LIMIT_COL, ",\n ", (0..a.nrows()).map(|_| &row))
462-
);
448+
let expected = format!("[{}]", ellipsize(AXIS_LIMIT_COL, ",\n ", (0..a.nrows()).map(|_| &row)));
463449
assert_str_eq(&expected, &actual);
464450
}
465451

@@ -480,10 +466,7 @@ mod formatting_with_omit
480466
let a = Array2::from_elem((AXIS_2D_OVERFLOW_LIMIT + overflow, AXIS_2D_OVERFLOW_LIMIT + overflow), 1);
481467
let actual = format!("{}", a);
482468
let row = format!("[{}]", ellipsize(AXIS_LIMIT_ROW, ", ", a.row(0)));
483-
let expected = format!(
484-
"[{}]",
485-
ellipsize(AXIS_LIMIT_COL, ",\n ", (0..a.nrows()).map(|_| &row))
486-
);
469+
let expected = format!("[{}]", ellipsize(AXIS_LIMIT_COL, ",\n ", (0..a.nrows()).map(|_| &row)));
487470
assert_str_eq(&expected, &actual);
488471
}
489472

‎src/arraytraits.rs‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -580,10 +580,7 @@ where Slice: AsMut<[A]>
580580
{
581581
let xs = slice.as_mut();
582582
if mem::size_of::<A>() == 0 {
583-
assert!(
584-
xs.len() <= isize::MAX as usize,
585-
"Slice length must fit in `isize`.",
586-
);
583+
assert!(xs.len() <= isize::MAX as usize, "Slice length must fit in `isize`.",);
587584
}
588585
unsafe { Self::from_shape_ptr(xs.len(), xs.as_mut_ptr()) }
589586
}
@@ -619,10 +616,7 @@ impl<'a, A, const N: usize> From<&'a mut [[A; N]]> for ArrayViewMut<'a, A, Ix2>
619616
if size_of::<A>() == 0 {
620617
dimension::size_of_shape_checked(&dim).expect("Product of non-zero axis lengths must not overflow isize.");
621618
} else if N == 0 {
622-
assert!(
623-
xs.len() <= isize::MAX as usize,
624-
"Product of non-zero axis lengths must not overflow isize.",
625-
);
619+
assert!(xs.len() <= isize::MAX as usize, "Product of non-zero axis lengths must not overflow isize.",);
626620
}
627621

628622
// `cols * rows` is guaranteed to fit in `isize` because we checked that it fits in

‎src/dimension/mod.rs‎

Lines changed: 11 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -410,18 +410,8 @@ fn to_abs_slice(axis_len: usize, slice: Slice) -> (usize, usize, isize)
410410
if end < start {
411411
end = start;
412412
}
413-
ndassert!(
414-
start <= axis_len,
415-
"Slice begin {} is past end of axis of length {}",
416-
start,
417-
axis_len,
418-
);
419-
ndassert!(
420-
end <= axis_len,
421-
"Slice end {} is past end of axis of length {}",
422-
end,
423-
axis_len,
424-
);
413+
ndassert!(start <= axis_len, "Slice begin {} is past end of axis of length {}", start, axis_len,);
414+
ndassert!(end <= axis_len, "Slice end {} is past end of axis of length {}", end, axis_len,);
425415
ndassert!(step != 0, "Slice stride must not be zero");
426416
(start, end, step)
427417
}
@@ -1100,14 +1090,8 @@ mod test
11001090
assert_eq!(slice_min_max(10, Slice::new(-8, Some(8), -3)), Some((4, 7)));
11011091
assert_eq!(slice_min_max(10, Slice::new(1, Some(-2), -3)), Some((1, 7)));
11021092
assert_eq!(slice_min_max(10, Slice::new(2, Some(-2), -3)), Some((4, 7)));
1103-
assert_eq!(
1104-
slice_min_max(10, Slice::new(-9, Some(-2), -3)),
1105-
Some((1, 7))
1106-
);
1107-
assert_eq!(
1108-
slice_min_max(10, Slice::new(-8, Some(-2), -3)),
1109-
Some((4, 7))
1110-
);
1093+
assert_eq!(slice_min_max(10, Slice::new(-9, Some(-2), -3)), Some((1, 7)));
1094+
assert_eq!(slice_min_max(10, Slice::new(-8, Some(-2), -3)), Some((4, 7)));
11111095
assert_eq!(slice_min_max(9, Slice::new(2, None, -3)), Some((2, 8)));
11121096
assert_eq!(slice_min_max(9, Slice::new(-7, None, -3)), Some((2, 8)));
11131097
assert_eq!(slice_min_max(9, Slice::new(3, None, -3)), Some((5, 8)));
@@ -1117,46 +1101,18 @@ mod test
11171101
#[test]
11181102
fn slices_intersect_true()
11191103
{
1120-
assert!(slices_intersect(
1121-
&Dim([4, 5]),
1122-
s![NewAxis, .., NewAxis, ..],
1123-
s![.., NewAxis, .., NewAxis]
1124-
));
1125-
assert!(slices_intersect(
1126-
&Dim([4, 5]),
1127-
s![NewAxis, 0, ..],
1128-
s![0, ..]
1129-
));
1130-
assert!(slices_intersect(
1131-
&Dim([4, 5]),
1132-
s![..;2, ..],
1133-
s![..;3, NewAxis, ..]
1134-
));
1135-
assert!(slices_intersect(
1136-
&Dim([4, 5]),
1137-
s![.., ..;2],
1138-
s![.., 1..;3, NewAxis]
1139-
));
1104+
assert!(slices_intersect(&Dim([4, 5]), s![NewAxis, .., NewAxis, ..], s![.., NewAxis, .., NewAxis]));
1105+
assert!(slices_intersect(&Dim([4, 5]), s![NewAxis, 0, ..], s![0, ..]));
1106+
assert!(slices_intersect(&Dim([4, 5]), s![..;2, ..], s![..;3, NewAxis, ..]));
1107+
assert!(slices_intersect(&Dim([4, 5]), s![.., ..;2], s![.., 1..;3, NewAxis]));
11401108
assert!(slices_intersect(&Dim([4, 10]), s![.., ..;9], s![.., 3..;6]));
11411109
}
11421110

11431111
#[test]
11441112
fn slices_intersect_false()
11451113
{
1146-
assert!(!slices_intersect(
1147-
&Dim([4, 5]),
1148-
s![..;2, ..],
1149-
s![NewAxis, 1..;2, ..]
1150-
));
1151-
assert!(!slices_intersect(
1152-
&Dim([4, 5]),
1153-
s![..;2, NewAxis, ..],
1154-
s![1..;3, ..]
1155-
));
1156-
assert!(!slices_intersect(
1157-
&Dim([4, 5]),
1158-
s![.., ..;9],
1159-
s![.., 3..;6, NewAxis]
1160-
));
1114+
assert!(!slices_intersect(&Dim([4, 5]), s![..;2, ..], s![NewAxis, 1..;2, ..]));
1115+
assert!(!slices_intersect(&Dim([4, 5]), s![..;2, NewAxis, ..], s![1..;3, ..]));
1116+
assert!(!slices_intersect(&Dim([4, 5]), s![.., ..;9], s![.., 3..;6, NewAxis]));
11611117
}
11621118
}

0 commit comments

Comments
 (0)