Skip to content

Commit 428eb4a

Browse files
committed
Move unit tests to their respective module files
1 parent 9508028 commit 428eb4a

File tree

6 files changed

+93
-68
lines changed

6 files changed

+93
-68
lines changed

src/core/data.rs

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -958,3 +958,22 @@ pub fn pad<T: HasAfEnum>(
958958
temp.into()
959959
}
960960
}
961+
962+
#[cfg(test)]
963+
mod tests {
964+
use super::reorder_v2;
965+
966+
use super::super::random::randu;
967+
968+
use crate::dim4;
969+
970+
#[test]
971+
fn check_reorder_api() {
972+
let a = randu::<f32>(dim4!(4, 5, 2, 3));
973+
974+
let _transposed = reorder_v2(&a, 1, 0, None);
975+
let _swap_0_2 = reorder_v2(&a, 2, 1, Some(vec![0]));
976+
let _swap_1_2 = reorder_v2(&a, 0, 2, Some(vec![1]));
977+
let _swap_0_3 = reorder_v2(&a, 3, 1, Some(vec![2, 0]));
978+
}
979+
}

src/core/macros.rs

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -233,3 +233,72 @@ macro_rules! view {
233233
}
234234
};
235235
}
236+
237+
#[cfg(test)]
238+
mod tests {
239+
use super::super::array::Array;
240+
use super::super::index::index;
241+
use super::super::random::randu;
242+
243+
#[test]
244+
fn dim4_construction() {
245+
let dim1d = dim4!(2);
246+
let dim2d = dim4!(2, 3);
247+
let dim3d = dim4!(2, 3, 4);
248+
let dim4d = dim4!(2, 3, 4, 2);
249+
let _dimn = dim4!(dim1d[0], dim2d[1], dim3d[2], dim4d[3]);
250+
}
251+
252+
#[test]
253+
fn seq_construction() {
254+
let default_seq = seq!();
255+
let _range_1_to_10_step_1 = seq!(0:9:1);
256+
let _range_1_to_10_step_1_2 = seq!(f32; 0.0:9.0:1.5);
257+
let _range_from_exprs = seq!(default_seq.begin(), default_seq.end(), default_seq.step());
258+
let _range_from_exprs2 = seq!(f32; default_seq.begin() as f32,
259+
default_seq.end() as f32, default_seq.step() as f32);
260+
}
261+
262+
#[test]
263+
fn seq_view() {
264+
let mut dim4d = dim4!(5, 3, 2, 1);
265+
dim4d[2] = 1;
266+
267+
let a = randu::<f32>(dim4d);
268+
let seqs = &[seq!(1:3:1), seq!()];
269+
let sub = index(&a, seqs);
270+
af_print!("A", a);
271+
af_print!("Indexed A", sub);
272+
}
273+
274+
#[test]
275+
fn view_macro() {
276+
let dims = dim4!(5, 5, 2, 1);
277+
let a = randu::<f32>(dims);
278+
let b = a.clone();
279+
let c = a.clone();
280+
let d = a.clone();
281+
let e = a.clone();
282+
283+
let v = view!(a);
284+
af_print!("v = a[None]", v);
285+
286+
let m = view!(c[1:3:1, 1:3:2]);
287+
af_print!("m = c[:, :]", m);
288+
289+
let x = seq!(1:3:1);
290+
let y = seq!(1:3:2);
291+
let u = view!(b[x, y]);
292+
af_print!("u = b[seq(), seq()]", u);
293+
294+
let values: [u32; 3] = [1, 2, 3];
295+
let indices = Array::new(&values, dim4!(3, 1, 1, 1));
296+
let indices2 = Array::new(&values, dim4!(3, 1, 1, 1));
297+
298+
let w = view!(d[indices, indices2]);
299+
af_print!("w = d[Array, Array]", w);
300+
301+
let z = view!(e[indices, y]);
302+
af_print!("z = e[Array, Seq]", z);
303+
}
304+
}

tests/data.rs

Lines changed: 0 additions & 13 deletions
This file was deleted.

tests/index_macro.rs

Lines changed: 0 additions & 32 deletions
This file was deleted.

tests/scalar_arith.rs

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
11
use ::arrayfire::*;
22
use float_cmp::approx_eq;
33

4-
#[allow(non_snake_case)]
54
#[test]
65
fn check_scalar_arith() {
76
let dims = Dim4::new(&[5, 5, 1, 1]);
8-
let A = randu::<f32>(dims);
7+
let a = randu::<f32>(dims);
98
let s: f32 = 2.0;
10-
let scalar_as_lhs = s * &A;
11-
let scalar_as_rhs = &A * s;
12-
let C = constant(s, dims);
13-
let no_scalars = A * C;
9+
let scalar_as_lhs = s * &a;
10+
let scalar_as_rhs = &a * s;
11+
let c = constant(s, dims);
12+
let no_scalars = a * c;
1413
let scalar_res_comp = eq(&scalar_as_lhs, &scalar_as_rhs, false);
1514
let res_comp = eq(&scalar_as_lhs, &no_scalars, false);
1615
let scalar_res = all_true_all(&scalar_res_comp);

tests/seq_macro.rs

Lines changed: 0 additions & 17 deletions
This file was deleted.

0 commit comments

Comments
 (0)