fix/test/serial: more #[serial_test::serial] tags

fff-rs · Mar 28, 2020 · 7f3a5a2 · 7f3a5a2
1 parent beda2b0
commit 7f3a5a2
Show file tree

Hide file tree

Showing 16 changed files with 43 additions and 39 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/coaster-nn/src/tests/mod.rs b/coaster-nn/src/tests/mod.rs
@@ -199,14 +199,14 @@ macro_rules! test_cuda {
 
         #[cfg(feature = "cuda")]
         #[test]
-        #[serial]
+        #[serial_test::serial]
         fn $f32_name() {
             $test_name::<f32, _>(crate::tests::get_cuda_backend())
         }
 
         #[cfg(feature = "cuda")]
         #[test]
-        #[serial]
+        #[serial_test::serial]
         fn $f64_name() {
             $test_name::<f64, _>(crate::tests::get_cuda_backend())
         }
@@ -234,7 +234,7 @@ macro_rules! test_cross {
     ($test_name:ident, $f32_name:ident) => {
         #[cfg(all(feature = "native",feature = "cuda"))]
         #[test]
-        #[serial]
+        #[serial_test::serial]
         fn $f32_name() {
             $test_name::<_, _>(crate::tests::get_native_backend(), crate::tests::get_cuda_backend())
         }

diff --git a/coaster/Cargo.toml b/coaster/Cargo.toml
@@ -29,6 +29,7 @@ compiletest_rs = { version = "0.4", optional = true }
 [dev-dependencies]
 rand = "0.7"
 coaster-nn = { version = "0.4" }
+serial_test = "0.4"
 
 [features]
 default = ["native", "cuda"]

diff --git a/coaster/tests/backend_specs.rs b/coaster/tests/backend_specs.rs
@@ -33,7 +33,7 @@ mod backend_spec {
         use crate::co::*;
 
         #[test]
-        #[serial]
+        #[serial_test::serial]
         fn it_can_create_default_backend() {
             assert!(Backend::<Cuda>::default().is_ok());
         }

diff --git a/coaster/tests/framework_cuda_specs.rs b/coaster/tests/framework_cuda_specs.rs
@@ -8,22 +8,22 @@ mod framework_cuda_spec {
     use crate::co::frameworks::cuda::memory::*;
 
     #[test]
-    #[serial]
+    #[serial_test::serial]
     fn it_works() {
         let frm = Cuda::new();
         println!("{:?}", frm.hardwares());
     }
 
     #[test]
-    #[serial]
+    #[serial_test::serial]
     fn it_creates_context() {
         let frm = Cuda::new();
         let hardwares = &frm.hardwares()[0..1];
         println!("{:?}", frm.new_device(hardwares));
     }
 
     #[test]
-    #[serial]
+    #[serial_test::serial]
     #[allow(unused_must_use)]
     fn it_allocates_memory() {
         let vec_a = vec![0isize, 1, 2, -3, 4, 5, 6, 7];
@@ -34,7 +34,7 @@ mod framework_cuda_spec {
     }
 
     #[test]
-    #[serial]
+    #[serial_test::serial]
     #[allow(unused_must_use)]
     // Create a lot of new CUDA devices, tests for correct dropping of device
     fn it_creates_a_lot_of_devices() {
@@ -45,7 +45,7 @@ mod framework_cuda_spec {
     }
 
     #[test]
-    #[serial]
+    #[serial_test::serial]
     #[allow(unused_must_use)]
     // Allocate 128mb blocks with dropping them in between, tests for correct freeing of memory
     fn it_allocates_4gb_memory_same_device() {
@@ -58,7 +58,7 @@ mod framework_cuda_spec {
     }
 
     #[test]
-    #[serial]
+    #[serial_test::serial]
     fn it_can_synchronize_context() {
         let backend = Backend::<Cuda>::default().unwrap();
         backend.synchronize().unwrap();

diff --git a/coaster/tests/shared_memory_specs.rs b/coaster/tests/shared_memory_specs.rs
@@ -25,7 +25,7 @@ mod shared_memory_spec {
     }
 
     #[test]
-    #[serial]
+    #[serial_test::serial]
     #[cfg(feature = "cuda")]
     fn it_creates_new_shared_memory_for_cuda() {
         let ntv = Cuda::new();
@@ -62,7 +62,7 @@ mod shared_memory_spec {
     }
 
     #[test]
-    #[serial]
+    #[serial_test::serial]
     #[cfg(feature = "cuda")]
     fn it_syncs_from_native_to_cuda_and_back() {
         let cu = Cuda::new();

diff --git a/juice/Cargo.toml b/juice/Cargo.toml
@@ -35,6 +35,7 @@ capnpc = "0.12"
 
 [dev-dependencies]
 env_logger = "0.6"
+serial_test = "0.4"
 
 [features]
 default = ["native", "cuda"]

diff --git a/juice/src/layers/common/convolution.rs b/juice/src/layers/common/convolution.rs
@@ -328,7 +328,7 @@ mod tests {
     use crate::co::*;
 
     #[test]
-    #[serial]
+    #[serial_test::serial]
     #[cfg(feature="cuda")]
     fn correct_shapes() {
         let cfg = ConvolutionConfig {

diff --git a/juice/src/layers/common/rnn.rs b/juice/src/layers/common/rnn.rs
@@ -345,7 +345,7 @@ mod tests {
     }
 
     #[test]
-    #[serial]
+    #[serial_test::serial]
     #[cfg(feature = "cuda")]
     fn rnn_create_layer() {
         let cfg = RnnConfig {
@@ -397,7 +397,7 @@ mod tests {
     }
 
     #[test]
-    #[serial]
+    #[serial_test::serial]
     #[cfg(feature = "cuda")]
     fn rnn_forward_pass() {
         let backend: Backend<Cuda> = cuda_backend();

diff --git a/rcublas/cublas/src/api/context.rs b/rcublas/cublas/src/api/context.rs
@@ -166,21 +166,21 @@ mod test {
     use super::super::PointerMode;
 
     #[test]
-    #[serial]
+    #[serial_test::serial]
     fn create_context() {
         Context::new().unwrap();
     }
 
     #[test]
-    #[serial]
+    #[serial_test::serial]
     fn default_pointer_mode_is_host() {
         let ctx = Context::new().unwrap();
         let mode = ctx.pointer_mode().unwrap();
         assert_eq!(PointerMode::Host, mode);
     }
 
     #[test]
-    #[serial]
+    #[serial_test::serial]
     fn can_set_pointer_mode() {
         let mut context = Context::new().unwrap();
         // set to Device

diff --git a/rcublas/cublas/src/api/level1.rs b/rcublas/cublas/src/api/level1.rs
@@ -296,7 +296,7 @@ mod test {
     }
 
     #[test]
-    #[serial]
+    #[serial_test::serial]
     fn use_cuda_memory_for_asum() {
         let native = get_native_backend();
         let cuda = get_cuda_backend();
@@ -330,7 +330,7 @@ mod test {
     }
 
     #[test]
-    #[serial]
+    #[serial_test::serial]
     fn use_cuda_memory_for_axpy() {
         let native = get_native_backend();
         let cuda = get_cuda_backend();
@@ -367,7 +367,7 @@ mod test {
     }
 
     #[test]
-    #[serial]
+    #[serial_test::serial]
     fn use_cuda_memory_for_copy() {
         let native = get_native_backend();
         let cuda = get_cuda_backend();
@@ -399,7 +399,7 @@ mod test {
     }
 
     #[test]
-    #[serial]
+    #[serial_test::serial]
     fn use_cuda_memory_for_dot() {
         let native = get_native_backend();
         let cuda = get_cuda_backend();
@@ -436,7 +436,7 @@ mod test {
     }
 
     #[test]
-    #[serial]
+    #[serial_test::serial]
     fn use_cuda_memory_for_nrm2() {
         let native = get_native_backend();
         let cuda = get_cuda_backend();
@@ -468,7 +468,7 @@ mod test {
     }
 
     #[test]
-    #[serial]
+    #[serial_test::serial]
     fn use_cuda_memory_for_scal() {
         let native = get_native_backend();
         let cuda = get_cuda_backend();
@@ -499,7 +499,7 @@ mod test {
     }
 
     #[test]
-    #[serial]
+    #[serial_test::serial]
     fn use_cuda_memory_for_swap() {
         let native = get_native_backend();
         let cuda = get_cuda_backend();

diff --git a/rcublas/cublas/src/api/level3.rs b/rcublas/cublas/src/api/level3.rs
@@ -128,7 +128,7 @@ mod test {
     }
 
     #[test]
-    #[serial]
+    #[serial_test::serial]
     fn use_cuda_memory_for_gemm() {
         let native = get_native_backend();
         let cuda = get_cuda_backend();

diff --git a/rcublas/cublas/src/api/util.rs b/rcublas/cublas/src/api/util.rs
@@ -106,7 +106,7 @@ mod test {
     use super::super::Context;
 
     #[test]
-    #[serial]
+    #[serial_test::serial]
     fn manual_context_creation() {
         unsafe {
             let handle = API::ffi_create().unwrap();
@@ -115,7 +115,7 @@ mod test {
     }
 
     #[test]
-    #[serial]
+    #[serial_test::serial]
     fn default_pointer_mode_is_host() {
         unsafe {
             let context = Context::new().unwrap();
@@ -125,7 +125,7 @@ mod test {
     }
 
     #[test]
-    #[serial]
+    #[serial_test::serial]
     fn can_set_pointer_mode() {
         unsafe {
             let context = Context::new().unwrap();

diff --git a/rcudnn/cudnn/benches/cudnn_overhead.rs b/rcudnn/cudnn/benches/cudnn_overhead.rs
@@ -15,7 +15,7 @@ mod cudnn_spec {
     use rcudnn::Cudnn;
 
     #[test]
-    #[serial]
+    #[serial_test::serial]
     fn it_initializes_correctly() {
         /*
         match Cudnn::new() {
@@ -29,7 +29,7 @@ mod cudnn_spec {
     }
 
     #[test]
-    #[serial]
+    #[serial_test::serial]
     fn it_returns_version() {
         println!("cuDNN Version: {:?}", Cudnn::version());
     }

diff --git a/rcudnn/cudnn/tests/cudnn_specs.rs b/rcudnn/cudnn/tests/cudnn_specs.rs
@@ -22,7 +22,7 @@ mod cudnn_spec {
     };
 
     #[test]
-    #[serial]
+    #[serial_test::serial]
     fn it_initializes_correctly() {
         let cuda = Cuda::new();
         println!("{:?}", cuda.hardwares());
@@ -36,7 +36,7 @@ mod cudnn_spec {
     }
 
     #[test]
-    #[serial]
+    #[serial_test::serial]
     fn it_returns_version() {
         println!("cuDNN Version: {:?}", Cudnn::version());
     }
@@ -49,7 +49,7 @@ mod cudnn_spec {
      * Since then this has been rewritten to not use transmute but a sequence of unsafe optimizations.
      */
     #[test]
-    #[serial]
+    #[serial_test::serial]
     fn it_computes_sigmoid() {
         let cudnn = Cudnn::new().unwrap();
         let desc = TensorDescriptor::new(&[2, 2, 2], &[4, 2, 1], DataType::Float).unwrap();
@@ -84,7 +84,7 @@ mod cudnn_spec {
     }
 
     #[test]
-    #[serial]
+    #[serial_test::serial]
     fn it_finds_correct_convolution_algorithm_forward() {
         let cudnn = Cudnn::new().unwrap();
         let src = TensorDescriptor::new(&[2, 2, 2], &[4, 2, 1], DataType::Float).unwrap();
@@ -107,7 +107,7 @@ mod cudnn_spec {
     }
 
     #[test]
-    #[serial]
+    #[serial_test::serial]
     fn it_finds_correct_convolution_algorithm_backward() {
         let cudnn = Cudnn::new().unwrap();
         let src = TensorDescriptor::new(&[2, 2, 2], &[4, 2, 1], DataType::Float).unwrap();
@@ -130,14 +130,14 @@ mod cudnn_spec {
     }
 
     #[test]
-    #[serial]
+    #[serial_test::serial]
     fn it_allocates_cuda_device_memory() {
         let _ = Cudnn::new().unwrap();
         let _ = CudaDeviceMemory::new(1024).unwrap();
     }
 
     #[test]
-    #[serial]
+    #[serial_test::serial]
     fn it_computes_dropout_forward() {
         let cudnn = Cudnn::new().unwrap();
         let src = TensorDescriptor::new(&[2, 2, 2], &[4, 2, 1], DataType::Float).unwrap();

diff --git a/rcudnn/cudnn/tests/tensor_descriptor_specs.rs b/rcudnn/cudnn/tests/tensor_descriptor_specs.rs
@@ -7,7 +7,7 @@ mod tensor_descriptor_spec {
     use crate::cudnn::TensorDescriptor;
 
     #[test]
-    #[serial]
+    #[serial_test::serial]
     fn it_initializes_a_tensor_descriptor() {
         match TensorDescriptor::new(&[2, 2, 2], &[4, 2, 1], DataType::Float) {
             Ok(_) => assert!(true),