Bump ndarray version (#30)

Author: ryanleh

rust/algebra/Cargo.toml

@@ -32,7 +32,7 @@ failure_derive = { version = "0.1.1" }
 
 serde = { version = "1", features = [ "derive" ] }
 num-traits = { version = "0.2.6"}
-ndarray = { version = "0.12", features = [ "serde-1" ] }
+ndarray = { version = "0.15.4", features = [ "serde-1" ] }
 
 colored = { version = "1", optional = true }
 rayon = { version = "1", optional = true }

rust/algebra/src/lib.rs

@@ -25,7 +25,6 @@
     unsafe_code
 )]
 #![deny(unsafe_code)]
-#![feature(const_fn_trait_bound)]
 
 #[macro_use]
 extern crate derivative;

rust/crypto-primitives/Cargo.toml

@@ -24,7 +24,7 @@ rand_chacha = { version = "0.1.1" }
 num-traits = { version = "0.2" }
 arrayvec = { version = "0.5" }
 serde = { version = "1", features = [ "derive" ] }
-ndarray = { version = "0.12", features = [ "serde" ] }
+ndarray = { version = "0.15.4", features = [ "serde" ] }
 fancy-garbling = { version = "0.3", git = "https://github.com/pratyush/fancy-garbling/", branch = "add-serde", features = [ "serde1" ] }
 rand = { version = "0.6" }
 

rust/neural-network/Cargo.toml

@@ -21,7 +21,7 @@ edition = "2018"
 algebra = { path = "../algebra" }
 crypto-primitives = { path = "../crypto-primitives" }
 serde = { version = "1", features = [ "derive" ] }
-ndarray = { version = "0.12", features = [ "serde-1" ] }
+ndarray = { version = "0.15.4", features = [ "serde-1" ] }
 rand = { version = "0.6" }
 npy = { version = "0.4" } 
 npy-derive = { version = "0.4" }

rust/neural-network/src/tensors/macros.rs

@@ -70,7 +70,7 @@ macro_rules! ndarray_impl {
 
             #[inline]
             fn into_iter(self) -> Self::IntoIter {
-                self.0.into_iter()
+                (&self.0).into_iter()
             }
         }
 

rust/protocols-sys/Cargo.toml

@@ -24,7 +24,7 @@ cmake = { version = "0.1.42" }
 algebra= { path="../algebra" }
 crypto-primitives= { path="../crypto-primitives" }
 neural-network = { path="../neural-network" }
-ndarray = { version = "0.12", features = [ "serde-1" ] }
+ndarray = { version = "0.15.4", features = [ "serde-1" ] }
 num-traits = { version = "0.2.6"}
 rand = { version = "0.6" }
 

rust/protocols-sys/src/server_cg.rs

@@ -87,7 +87,7 @@ impl<'a> ServerCG for Conv2D<'a> {
             for (inp_c, tmp_i) in tmp_image.iter_mut().enumerate() {
                 *tmp_i = kernel
                     .slice(s![out_c, inp_c, .., ..])
-                    .into_slice()
+                    .to_slice()
                     .expect("Error converting kernel")
                     .as_ptr();
             }
@@ -162,7 +162,7 @@ impl<'a> ServerCG for FullyConnected<'a> {
         for row in 0..data.filter_h as usize {
             kernel_vec[row] = kernel
                 .slice(s![row, .., .., ..])
-                .into_slice()
+                .to_slice()
                 .expect("Error converting kernel")
                 .as_ptr();
         }

rust/protocols/Cargo.toml

@@ -21,7 +21,7 @@ num-traits = { version = "0.2.6"}
 bench-utils = { path = "../bench-utils" }
 algebra = { path = "../algebra" }
 protocols-sys = { path = "../protocols-sys" }
-ndarray = { version = "0.12", features = [ "serde-1" ] }
+ndarray = { version = "0.15.4", features = [ "serde-1" ] }
 crypto-primitives = { path = "../crypto-primitives" }
 ocelot = { version = "0.3", git = "https://github.com/GaloisInc/ocelot/" }
 scuttlebutt = { version = "0.3", git = "https://github.com/GaloisInc/scuttlebutt/", features = [ "serde" ], tag = "0.3.2" }