Implement CanSlice<IxDyn> for [AxisSliceInfo]

Author: jturner314

blas-tests/tests/oper.rs

@@ -6,7 +6,7 @@ extern crate num_traits;
 use ndarray::linalg::general_mat_mul;
 use ndarray::linalg::general_mat_vec_mul;
 use ndarray::prelude::*;
-use ndarray::{AxisSliceInfo, Ix, Ixs, SliceInfo};
+use ndarray::{AxisSliceInfo, Ix, Ixs};
 use ndarray::{Data, LinalgScalar};
 
 use approx::{assert_abs_diff_eq, assert_relative_eq};
@@ -432,7 +432,7 @@ fn scaled_add_3() {
 
                 {
                     let mut av = a.slice_mut(s![..;s1, ..;s2]);
-                    let c = c.slice(&SliceInfo::<_, IxDyn, IxDyn>::new(cslice).unwrap());
+                    let c = c.slice(&*cslice);
 
                     let mut answerv = answer.slice_mut(s![..;s1, ..;s2]);
                     answerv += &(beta * &c);

src/impl_methods.rs

@@ -343,7 +343,7 @@ where
     /// (**Panics** if `D` is `IxDyn` and `info` does not match the number of array axes.)
     pub fn slice<I>(&self, info: &I) -> ArrayView<'_, A, I::OutDim>
     where
-        I: CanSlice<D>,
+        I: CanSlice<D> + ?Sized,
         S: Data,
     {
         self.view().slice_move(info)
@@ -361,7 +361,7 @@ where
     /// (**Panics** if `D` is `IxDyn` and `info` does not match the number of array axes.)
     pub fn slice_mut<I>(&mut self, info: &I) -> ArrayViewMut<'_, A, I::OutDim>
     where
-        I: CanSlice<D>,
+        I: CanSlice<D> + ?Sized,
         S: DataMut,
     {
         self.view_mut().slice_move(info)
@@ -412,7 +412,7 @@ where
     /// (**Panics** if `D` is `IxDyn` and `info` does not match the number of array axes.)
     pub fn slice_move<I>(mut self, info: &I) -> ArrayBase<S, I::OutDim>
     where
-        I: CanSlice<D>,
+        I: CanSlice<D> + ?Sized,
     {
         // Slice and collapse in-place without changing the number of dimensions.
         self.slice_collapse(info);
@@ -464,7 +464,7 @@ where
     /// (**Panics** if `D` is `IxDyn` and `info` does not match the number of array axes.)
     pub fn slice_collapse<I>(&mut self, info: &I)
     where
-        I: CanSlice<D>,
+        I: CanSlice<D> + ?Sized,
     {
         assert_eq!(
             info.in_ndim(),

src/slice.rs

@@ -360,6 +360,18 @@ where
     }
 }
 
+unsafe impl CanSlice<IxDyn> for [AxisSliceInfo] {
+    type OutDim = IxDyn;
+
+    fn in_ndim(&self) -> usize {
+        self.iter().filter(|s| !s.is_new_axis()).count()
+    }
+
+    fn out_ndim(&self) -> usize {
+        self.iter().filter(|s| !s.is_index()).count()
+    }
+}
+
 /// Represents all of the necessary information to perform a slice.
 ///
 /// The type `T` is typically `[AxisSliceInfo; n]`, `[AxisSliceInfo]`, or
@@ -422,13 +434,13 @@ where
     ///
     /// Errors if `Din` or `Dout` is not consistent with `indices`.
     pub fn new(indices: T) -> Result<SliceInfo<T, Din, Dout>, ShapeError> {
-        if let Some(ndim) = Din::NDIM {
-            if ndim != indices.as_ref().iter().filter(|s| !s.is_new_axis()).count() {
+        if let Some(in_ndim) = Din::NDIM {
+            if in_ndim != indices.as_ref().in_ndim() {
                 return Err(ShapeError::from_kind(ErrorKind::IncompatibleShape));
             }
         }
-        if let Some(ndim) = Dout::NDIM {
-            if ndim != indices.as_ref().iter().filter(|s| !s.is_index()).count() {
+        if let Some(out_ndim) = Dout::NDIM {
+            if out_ndim != indices.as_ref().out_ndim() {
                 return Err(ShapeError::from_kind(ErrorKind::IncompatibleShape));
             }
         }
@@ -456,11 +468,7 @@ where
         if let Some(ndim) = Din::NDIM {
             ndim
         } else {
-            self.indices
-                .as_ref()
-                .iter()
-                .filter(|s| !s.is_new_axis())
-                .count()
+            self.indices.as_ref().in_ndim()
         }
     }
 
@@ -475,11 +483,7 @@ where
         if let Some(ndim) = Dout::NDIM {
             ndim
         } else {
-            self.indices
-                .as_ref()
-                .iter()
-                .filter(|s| !s.is_index())
-                .count()
+            self.indices.as_ref().out_ndim()
         }
     }
 }