fix/benches: fix cargo bench compilation [SKIP_CHANGELOG]

Looks like benchmarks are superseded by examples/benchmarks.rs and should
be removed altogether, but while they are here they should at least compile
cleanly. Well, now benches compile but panic on tensor dimension mismatch.

Author: alexandermorozov

benches/network_benches.rs

@@ -14,14 +14,8 @@ mod cuda {
     use std::sync::{Arc, RwLock};
     use leaf::layers::*;
     use leaf::layer::*;
-    use leaf::network::*;
     use std::rc::Rc;
 
-    #[cfg(feature = "native")]
-    fn native_backend() -> Rc<Backend<Native>> {
-        Rc::new(Backend::<Native>::default().unwrap())
-    }
-
     #[cfg(feature = "cuda")]
     fn cuda_backend() -> Rc<Backend<Cuda>> {
         Rc::new(Backend::<Cuda>::default().unwrap())
@@ -76,7 +70,7 @@ mod cuda {
     #[ignore]
     #[cfg(feature = "cuda")]
     fn bench_mnsit_forward_1(b: &mut Bencher) {
-        let mut cfg = NetworkConfig::default();
+        let mut cfg = SequentialConfig::default();
         // set up input
         cfg.add_input("in", &vec![1, 30, 30]);
         cfg.add_input("label", &vec![1, 1, 10]);
@@ -98,18 +92,14 @@ mod cuda {
         // cfg.add_layer(loss_cfg);
 
         let backend = cuda_backend();
-        let native_backend = native_backend();
-        let mut network = Network::from_config(backend.clone(), &cfg);
-        let loss = &mut 0f32;
+        let mut network = Layer::from_config(
+            backend.clone(), &LayerConfig::new("network", LayerType::Sequential(cfg)));
 
         let _ = timeit_loops!(10, {
             let inp = SharedTensor::<f32>::new(backend.device(), &vec![1, 30, 30]).unwrap();
-            let label = SharedTensor::<f32>::new(native_backend.device(), &vec![1, 1, 10]).unwrap();
-
             let inp_lock = Arc::new(RwLock::new(inp));
-            let label_lock = Arc::new(RwLock::new(label));
 
-            network.forward(&[inp_lock, label_lock], loss);
+            network.forward(&[inp_lock]);
         });
         // b.iter(|| {
         //     for _ in 0..1 {
@@ -128,7 +118,7 @@ mod cuda {
     // #[ignore]
     #[cfg(feature = "cuda")]
     fn alexnet_forward(b: &mut Bencher) {
-        let mut cfg = NetworkConfig::default();
+        let mut cfg = SequentialConfig::default();
         // Layer: data
         cfg.add_input("data", &vec![128, 3, 224, 224]);
         // Layer: conv1
@@ -265,15 +255,15 @@ mod cuda {
 
         let backend = cuda_backend();
         // let native_backend = native_backend();
-        let mut network = Network::from_config(backend.clone(), &cfg);
+        let mut network = Layer::from_config(
+            backend.clone(), &LayerConfig::new("network", LayerType::Sequential(cfg)));
 
         let func = || {
             let forward_time = timeit_loops!(1, {
-                let loss = &mut 0f32;
                 let inp = SharedTensor::<f32>::new(backend.device(), &vec![128, 3, 112, 112]).unwrap();
 
                 let inp_lock = Arc::new(RwLock::new(inp));
-                network.forward(&[inp_lock], loss);
+                network.forward(&[inp_lock]);
             });
             println!("Forward step: {}", forward_time);
         };
@@ -285,7 +275,7 @@ mod cuda {
     #[cfg(feature = "cuda")]
     fn small_alexnet_forward(b: &mut Bencher) {
         // let _ = env_logger::init();
-        let mut cfg = NetworkConfig::default();
+        let mut cfg = SequentialConfig::default();
         // Layer: data
         cfg.add_input("data", &vec![128, 3, 112, 112]);
         // Layer: conv1
@@ -422,14 +412,14 @@ mod cuda {
 
         let backend = cuda_backend();
         // let native_backend = native_backend();
-        let mut network = Network::from_config(backend.clone(), &cfg);
+        let mut network = Layer::from_config(
+            backend.clone(), &LayerConfig::new("network", LayerType::Sequential(cfg)));
 
         let mut func = || {
-            let loss = &mut 0f32;
             let inp = SharedTensor::<f32>::new(backend.device(), &vec![128, 3, 112, 112]).unwrap();
 
             let inp_lock = Arc::new(RwLock::new(inp));
-            network.forward(&[inp_lock], loss);
+            network.forward(&[inp_lock]);
         };
         { func(); bench_profile(b, func, 10); }
     }