Skip to content

Commit b5556f8

Browse files
jturner314jturner314
authored
Merge pull request #943 from jturner314/remove-axissliceinfo-step_by
Check expr type for expr;step in s![] macro at compile time, and remove AxisSliceInfo::step_by
2 parents 2bcbb2a + 7e1f7d7 commit b5556f8

File tree

4 files changed

+25
-47
lines changed

4 files changed

+25
-47
lines changed

‎blas-tests/tests/oper.rs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ extern crate num_traits;
66
use ndarray::linalg::general_mat_mul;
77
use ndarray::linalg::general_mat_vec_mul;
88
use ndarray::prelude::*;
9-
use ndarray::{AxisSliceInfo, Ix, Ixs};
9+
use ndarray::{AxisSliceInfo, Ix, Ixs, Slice};
1010
use ndarray::{Data, LinalgScalar};
1111

1212
use approx::{assert_abs_diff_eq, assert_relative_eq};
@@ -419,12 +419,12 @@ fn scaled_add_3() {
419419
let mut a = range_mat64(m, k);
420420
let mut answer = a.clone();
421421
let cdim = if n == 1 { vec![q] } else { vec![n, q] };
422-
let cslice = if n == 1 {
423-
vec![AxisSliceInfo::from(..).step_by(s2)]
422+
let cslice: Vec<AxisSliceInfo> = if n == 1 {
423+
vec![Slice::from(..).step_by(s2).into()]
424424
} else {
425425
vec![
426-
AxisSliceInfo::from(..).step_by(s1),
427-
AxisSliceInfo::from(..).step_by(s2),
426+
Slice::from(..).step_by(s1).into(),
427+
Slice::from(..).step_by(s2).into(),
428428
]
429429
};
430430

‎src/slice.rs‎

Lines changed: 7 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -92,13 +92,13 @@ pub struct NewAxis;
9292
///
9393
/// `AxisSliceInfo::Slice { start: a, end: Some(b), step: 2 }` is every second
9494
/// element from `a` until `b`. It can also be created with
95-
/// `AxisSliceInfo::from(a..b).step_by(2)`. The Python equivalent is `[a:b:2]`.
96-
/// The macro equivalent is `s![a..b;2]`.
95+
/// `AxisSliceInfo::from(Slice::from(a..b).step_by(2))`. The Python equivalent
96+
/// is `[a:b:2]`. The macro equivalent is `s![a..b;2]`.
9797
///
9898
/// `AxisSliceInfo::Slice { start: a, end: None, step: -1 }` is every element,
9999
/// from `a` until the end, in reverse order. It can also be created with
100-
/// `AxisSliceInfo::from(a..).step_by(-1)`. The Python equivalent is `[a::-1]`.
101-
/// The macro equivalent is `s![a..;-1]`.
100+
/// `AxisSliceInfo::from(Slice::from(a..).step_by(-1))`. The Python equivalent
101+
/// is `[a::-1]`. The macro equivalent is `s![a..;-1]`.
102102
///
103103
/// `AxisSliceInfo::NewAxis` is a new axis of length 1. It can also be created
104104
/// with `AxisSliceInfo::from(NewAxis)`. The Python equivalent is
@@ -136,30 +136,6 @@ impl AxisSliceInfo {
136136
pub fn is_new_axis(&self) -> bool {
137137
matches!(self, AxisSliceInfo::NewAxis)
138138
}
139-
140-
/// Returns a new `AxisSliceInfo` with the given step size (multiplied with
141-
/// the previous step size).
142-
///
143-
/// `step` must be nonzero.
144-
/// (This method checks with a debug assertion that `step` is not zero.)
145-
///
146-
/// **Panics** if `self` is not the `AxisSliceInfo::Slice` variant.
147-
#[inline]
148-
pub fn step_by(self, step: isize) -> Self {
149-
debug_assert_ne!(step, 0, "AxisSliceInfo::step_by: step must be nonzero");
150-
match self {
151-
AxisSliceInfo::Slice {
152-
start,
153-
end,
154-
step: orig_step,
155-
} => AxisSliceInfo::Slice {
156-
start,
157-
end,
158-
step: orig_step * step,
159-
},
160-
_ => panic!("AxisSliceInfo::step_by: `self` must be the `Slice` variant"),
161-
}
162-
}
163139
}
164140

165141
impl fmt::Display for AxisSliceInfo {
@@ -880,7 +856,9 @@ macro_rules! s(
880856
};
881857
// convert range/index/new-axis and step into AxisSliceInfo
882858
(@convert $r:expr, $s:expr) => {
883-
<$crate::AxisSliceInfo as ::std::convert::From<_>>::from($r).step_by($s as isize)
859+
<$crate::AxisSliceInfo as ::std::convert::From<_>>::from(
860+
<$crate::Slice as ::std::convert::From<_>>::from($r).step_by($s as isize)
861+
)
884862
};
885863
($($t:tt)*) => {
886864
$crate::s![@parse

‎tests/array.rs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ fn test_slice_array_dyn() {
223223
AxisSliceInfo::from(1..),
224224
AxisSliceInfo::from(1),
225225
AxisSliceInfo::from(NewAxis),
226-
AxisSliceInfo::from(..).step_by(2),
226+
AxisSliceInfo::from(Slice::from(..).step_by(2)),
227227
])
228228
.unwrap();
229229
arr.slice(info);
@@ -232,7 +232,7 @@ fn test_slice_array_dyn() {
232232
let info2 = SliceInfo::<_, Ix3, IxDyn>::try_from([
233233
AxisSliceInfo::from(1..),
234234
AxisSliceInfo::from(1),
235-
AxisSliceInfo::from(..).step_by(2),
235+
AxisSliceInfo::from(Slice::from(..).step_by(2)),
236236
])
237237
.unwrap();
238238
arr.view().slice_collapse(info2);
@@ -245,7 +245,7 @@ fn test_slice_dyninput_array_dyn() {
245245
AxisSliceInfo::from(1..),
246246
AxisSliceInfo::from(1),
247247
AxisSliceInfo::from(NewAxis),
248-
AxisSliceInfo::from(..).step_by(2),
248+
AxisSliceInfo::from(Slice::from(..).step_by(2)),
249249
])
250250
.unwrap();
251251
arr.slice(info);
@@ -254,7 +254,7 @@ fn test_slice_dyninput_array_dyn() {
254254
let info2 = SliceInfo::<_, Ix3, IxDyn>::try_from([
255255
AxisSliceInfo::from(1..),
256256
AxisSliceInfo::from(1),
257-
AxisSliceInfo::from(..).step_by(2),
257+
AxisSliceInfo::from(Slice::from(..).step_by(2)),
258258
])
259259
.unwrap();
260260
arr.view().slice_collapse(info2);
@@ -267,7 +267,7 @@ fn test_slice_dyninput_vec_fixed() {
267267
AxisSliceInfo::from(1..),
268268
AxisSliceInfo::from(1),
269269
AxisSliceInfo::from(NewAxis),
270-
AxisSliceInfo::from(..).step_by(2),
270+
AxisSliceInfo::from(Slice::from(..).step_by(2)),
271271
])
272272
.unwrap();
273273
arr.slice(info);
@@ -276,7 +276,7 @@ fn test_slice_dyninput_vec_fixed() {
276276
let info2 = SliceInfo::<_, Ix3, Ix2>::try_from(vec![
277277
AxisSliceInfo::from(1..),
278278
AxisSliceInfo::from(1),
279-
AxisSliceInfo::from(..).step_by(2),
279+
AxisSliceInfo::from(Slice::from(..).step_by(2)),
280280
])
281281
.unwrap();
282282
arr.view().slice_collapse(info2);
@@ -289,7 +289,7 @@ fn test_slice_dyninput_vec_dyn() {
289289
AxisSliceInfo::from(1..),
290290
AxisSliceInfo::from(1),
291291
AxisSliceInfo::from(NewAxis),
292-
AxisSliceInfo::from(..).step_by(2),
292+
AxisSliceInfo::from(Slice::from(..).step_by(2)),
293293
])
294294
.unwrap();
295295
arr.slice(info);
@@ -298,7 +298,7 @@ fn test_slice_dyninput_vec_dyn() {
298298
let info2 = SliceInfo::<_, Ix3, IxDyn>::try_from(vec![
299299
AxisSliceInfo::from(1..),
300300
AxisSliceInfo::from(1),
301-
AxisSliceInfo::from(..).step_by(2),
301+
AxisSliceInfo::from(Slice::from(..).step_by(2)),
302302
])
303303
.unwrap();
304304
arr.view().slice_collapse(info2);

‎tests/oper.rs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -561,7 +561,7 @@ fn scaled_add_2() {
561561
#[test]
562562
fn scaled_add_3() {
563563
use approx::assert_relative_eq;
564-
use ndarray::{SliceInfo, AxisSliceInfo};
564+
use ndarray::{AxisSliceInfo, Slice, SliceInfo};
565565
use std::convert::TryFrom;
566566

567567
let beta = -2.3;
@@ -583,12 +583,12 @@ fn scaled_add_3() {
583583
let mut a = range_mat64(m, k);
584584
let mut answer = a.clone();
585585
let cdim = if n == 1 { vec![q] } else { vec![n, q] };
586-
let cslice = if n == 1 {
587-
vec![AxisSliceInfo::from(..).step_by(s2)]
586+
let cslice: Vec<AxisSliceInfo> = if n == 1 {
587+
vec![Slice::from(..).step_by(s2).into()]
588588
} else {
589589
vec![
590-
AxisSliceInfo::from(..).step_by(s1),
591-
AxisSliceInfo::from(..).step_by(s2),
590+
Slice::from(..).step_by(s1).into(),
591+
Slice::from(..).step_by(s2).into(),
592592
]
593593
};
594594

0 commit comments

Comments
 (0)