refactor/export: export important functionality from main module

autumnai · Feb 3, 2016 · 9ce42e7 · 9ce42e7
1 parent c8d6e8c
commit 9ce42e7
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 44 deletions.
diff --git a/README.md b/README.md
@@ -87,11 +87,7 @@ to your Cargo manifest.
 ```rust
 extern crate collenchyma as co;
 extern crate collenchyma_nn as nn;
-use co::backend::Backend;
-use co::framework::IFramework;
-use co::frameworks::{Cuda, Native};
-use co::memory::MemoryType;
-use co::tensor::SharedTensor;
+use co::*;
 use nn::*;
 
 fn write_to_memory<T: Copy>(mem: &mut MemoryType, data: &[T]) {

diff --git a/src/lib.rs b/src/lib.rs
@@ -74,11 +74,7 @@
 //! ```ignore
 //! extern crate collenchyma as co;
 //! extern crate collenchyma_nn as nn;
-//! use co::backend::Backend;
-//! use co::framework::IFramework;
-//! use co::frameworks::{Cuda, Native};
-//! use co::memory::MemoryType;
-//! use co::tensor::SharedTensor;
+//! use co::*;
 //! use nn::*;
 //!
 //! fn write_to_memory<T: Copy>(mem: &mut MemoryType, data: &[T]) {
@@ -174,3 +170,11 @@ pub mod operation;
 pub mod binary;
 pub mod error;
 pub mod plugin;
+
+pub use backend::*;
+pub use device::{IDevice, DeviceType};
+pub use hardware::{IHardware, HardwareType};
+pub use framework::IFramework;
+pub use frameworks::{Native, Cuda, OpenCL};
+pub use memory::{IMemory, MemoryType};
+pub use tensor::{SharedTensor, TensorDesc, ITensorDesc, IntoTensorDesc};
diff --git a/tests/backend_specs.rs b/tests/backend_specs.rs
@@ -3,12 +3,9 @@ extern crate libc;
 
 #[cfg(test)]
 mod backend_spec {
-
-
     #[cfg(feature = "native")]
     mod native {
-        use co::backend::{IBackend, Backend};
-        use co::frameworks::Native;
+        use co::*;
 
         #[test]
         fn it_can_create_default_backend() {
@@ -18,8 +15,7 @@ mod backend_spec {
 
     #[cfg(feature = "cuda")]
     mod cuda {
-        use co::backend::{IBackend, Backend};
-        use co::frameworks::Cuda;
+        use co::*;
 
         #[test]
         fn it_can_create_default_backend() {
@@ -29,9 +25,7 @@ mod backend_spec {
 
     #[cfg(feature = "opencl")]
     mod opencl {
-        use co::backend::{IBackend, Backend, BackendConfig};
-        use co::frameworks::OpenCL;
-        use co::framework::IFramework;
+        use co::*;
 
         #[test]
         fn it_can_create_default_backend() {

diff --git a/tests/framework_cuda_specs.rs b/tests/framework_cuda_specs.rs
@@ -4,12 +4,8 @@ extern crate libc;
 #[cfg(test)]
 #[cfg(feature = "cuda")]
 mod framework_cuda_spec {
-    use co::backend::{IBackend, Backend};
-    use co::framework::IFramework;
-    use co::frameworks::Cuda;
-    use co::device::DeviceType;
+    use co::*;
     use co::frameworks::cuda::memory::*;
-    use co::tensor::*;
 
     #[test]
     fn it_works() {

diff --git a/tests/framework_native_specs.rs b/tests/framework_native_specs.rs
@@ -3,9 +3,7 @@ extern crate collenchyma as co;
 #[cfg(test)]
 #[cfg(feature = "native")]
 mod framework_native_spec {
-
-    use co::framework::IFramework;
-    use co::frameworks::Native;
+    use co::*;
 
     #[test]
     fn it_works() {

diff --git a/tests/framework_opencl_specs.rs b/tests/framework_opencl_specs.rs
@@ -4,10 +4,7 @@ extern crate libc;
 #[cfg(test)]
 #[cfg(feature = "opencl")]
 mod framework_opencl_spec {
-
-    use co::device::DeviceType;
-    use co::framework::IFramework;
-    use co::frameworks::OpenCL;
+    use co::*;
     use co::frameworks::opencl::memory::*;
     use co::frameworks::opencl::queue::*;
 

diff --git a/tests/hardware_specs.rs b/tests/hardware_specs.rs
@@ -4,7 +4,7 @@ extern crate libc;
 #[cfg(test)]
 #[cfg(feature = "opencl")]
 mod hardware_spec {
-    use co::hardware::{IHardware, HardwareType};
+    use co::*;
     use co::frameworks::opencl::Device;
 
     #[test]

diff --git a/tests/shared_memory_specs.rs b/tests/shared_memory_specs.rs
@@ -3,16 +3,7 @@ extern crate libc;
 
 #[cfg(test)]
 mod shared_memory_spec {
-
-    use co::framework::IFramework;
-    #[cfg(feature = "native")]
-    use co::frameworks::Native;
-    #[cfg(feature = "cuda")]
-    use co::frameworks::Cuda;
-    #[cfg(feature = "opencl")]
-    use co::frameworks::OpenCL;
-    use co::memory::MemoryType;
-    use co::tensor::*;
+    use co::*;
 
     fn write_to_memory<T: Copy>(mem: &mut MemoryType, data: &[T]) {
         match mem {

diff --git a/tests/tensor_specs.rs b/tests/tensor_specs.rs
@@ -2,8 +2,7 @@ extern crate collenchyma as co;
 
 #[cfg(test)]
 mod tensor_spec {
-
-    use co::tensor::*;
+    use co::*;
 
     #[test]
     fn it_returns_correct_tensor_desc_stride() {