Reorganize all mandatory modules into a parent module, core

Author: 9prady9

Cargo.toml

@@ -27,15 +27,15 @@ indexing = []
 graphics = []
 image = []
 lapack = []
-machine_learning = []
+ml = []
 macros = []
 random = []
 signal = []
 sparse = []
 statistics = []
 vision = []
 default = ["algorithm", "arithmetic", "blas", "data", "indexing", "graphics", "image", "lapack",
-"machine_learning", "macros", "random", "signal", "sparse", "statistics", "vision"]
+"ml", "macros", "random", "signal", "sparse", "statistics", "vision"]
 
 [dependencies]
 libc = "0.2"

examples/using_half.rs

@@ -5,7 +5,7 @@ fn main() {
     set_device(0);
     info();
 
-    let values: Vec<_> = (1u8..101).map(f32::from).collect();
+    let values: Vec<_> = (1u8..101).map(std::convert::From::from).collect();
 
     let half_values = values.iter().map(|&x| f16::from_f32(x)).collect::<Vec<_>>();
 

src/algorithm/mod.rs

@@ -1,8 +1,8 @@
-use crate::array::Array;
-use crate::defines::{AfError, BinaryOp};
-use crate::error::HANDLE_ERROR;
-use crate::util::af_array;
-use crate::util::{HasAfEnum, RealNumber, ReduceByKeyInput, Scanable};
+use super::core::{
+    af_array, AfError, Array, BinaryOp, HasAfEnum, RealNumber, ReduceByKeyInput, Scanable,
+    HANDLE_ERROR,
+};
+
 use libc::{c_double, c_int, c_uint};
 
 extern "C" {

src/blas/mod.rs

@@ -1,8 +1,5 @@
-use crate::array::Array;
-use crate::defines::{AfError, MatProp};
-use crate::error::HANDLE_ERROR;
-use crate::util::{af_array, to_u32};
-use crate::util::{FloatingPoint, HasAfEnum};
+use super::core::{af_array, AfError, Array, FloatingPoint, HasAfEnum, MatProp, HANDLE_ERROR};
+
 use libc::{c_int, c_uint, c_void};
 use std::vec::Vec;
 
@@ -133,8 +130,8 @@ pub fn gemm<T>(
         let mut out = output.get();
         let err_val = af_gemm(
             &mut out as *mut af_array,
-            to_u32(optlhs) as c_uint,
-            to_u32(optrhs) as c_uint,
+            optlhs as c_uint,
+            optrhs as c_uint,
             alpha.as_ptr() as *const c_void,
             lhs.get(),
             rhs.get(),
@@ -167,8 +164,8 @@ where
             &mut temp as *mut af_array,
             lhs.get(),
             rhs.get(),
-            to_u32(optlhs) as c_uint,
-            to_u32(optrhs) as c_uint,
+            optlhs as c_uint,
+            optrhs as c_uint,
         );
         HANDLE_ERROR(AfError::from(err_val));
         temp.into()
@@ -199,8 +196,8 @@ where
             &mut temp as *mut af_array,
             lhs.get(),
             rhs.get(),
-            to_u32(optlhs) as c_uint,
-            to_u32(optrhs) as c_uint,
+            optlhs as c_uint,
+            optrhs as c_uint,
         );
         HANDLE_ERROR(AfError::from(err_val));
         temp.into()

src/arith/mod.rs renamed to src/core/arith.rs

@@ -1,10 +1,11 @@
-use crate::array::Array;
-use crate::data::{constant, tile, ConstGenerator};
-use crate::defines::AfError;
-use crate::dim4::Dim4;
-use crate::error::HANDLE_ERROR;
-use crate::num::Zero;
-use crate::util::{af_array, HasAfEnum, ImplicitPromote};
+use super::array::Array;
+use super::data::{constant, tile, ConstGenerator};
+use super::defines::AfError;
+use super::dim4::Dim4;
+use super::error::HANDLE_ERROR;
+use super::util::{af_array, HasAfEnum, ImplicitPromote};
+use num::Zero;
+
 use libc::c_int;
 use num::Complex;
 use std::ops::Neg;
@@ -818,9 +819,7 @@ arith_func!(BitXor, bitxor, bitxor);
 mod op_assign {
 
     use super::*;
-    use crate::array::Array;
-    use crate::index::{assign_gen, Indexer};
-    use crate::seq::Seq;
+    use crate::core::{assign_gen, Array, Indexer, Seq};
     use std::ops::{AddAssign, DivAssign, MulAssign, RemAssign, SubAssign};
     use std::ops::{BitAndAssign, BitOrAssign, BitXorAssign, ShlAssign, ShrAssign};
 

src/array.rs renamed to src/core/array.rs

@@ -1,7 +1,8 @@
-use crate::defines::{AfError, Backend, DType};
-use crate::dim4::Dim4;
-use crate::error::HANDLE_ERROR;
-use crate::util::{af_array, dim_t, void_ptr, HasAfEnum};
+use super::defines::{AfError, Backend, DType};
+use super::dim4::Dim4;
+use super::error::HANDLE_ERROR;
+use super::util::{af_array, dim_t, void_ptr, HasAfEnum};
+
 use libc::{c_char, c_int, c_longlong, c_uint, c_void};
 use std::ffi::CString;
 use std::marker::PhantomData;

src/backend.rs renamed to src/core/backend.rs

@@ -1,8 +1,7 @@
-extern crate libc;
+use super::defines::{AfError, Backend};
+use super::error::HANDLE_ERROR;
 
-use self::libc::{c_int, c_uint};
-use crate::defines::{AfError, Backend};
-use crate::error::HANDLE_ERROR;
+use libc::{c_int, c_uint};
 
 extern "C" {
     fn af_set_backend(bknd: u8) -> c_int;

src/data/mod.rs renamed to src/core/data.rs

@@ -1,8 +1,9 @@
-use crate::array::Array;
-use crate::defines::{AfError, BorderType};
-use crate::dim4::Dim4;
-use crate::error::HANDLE_ERROR;
-use crate::util::{af_array, c32, c64, dim_t, u64_t, HasAfEnum};
+use super::array::Array;
+use super::defines::{AfError, BorderType};
+use super::dim4::Dim4;
+use super::error::HANDLE_ERROR;
+use super::util::{af_array, c32, c64, dim_t, u64_t, HasAfEnum};
+
 use libc::{c_double, c_int, c_uint};
 use std::option::Option;
 use std::vec::Vec;

src/defines.rs renamed to src/core/defines.rs

@@ -247,27 +247,29 @@ pub enum ColorSpace {
 #[derive(Clone, Copy, Debug, PartialEq)]
 pub enum MatProp {
     /// Default (no-op)
-    NONE,
+    NONE = 0,
     /// Data needs to be transposed
-    TRANS,
+    TRANS = 1,
     /// Data needs to be conjugate transposed
-    CTRANS,
+    CTRANS = 2,
     /// Matrix is upper triangular
-    UPPER,
+    CONJ = 4,
+    /// Matrix needs to be conjugate
+    UPPER = 32,
     /// Matrix is lower triangular
-    LOWER,
+    LOWER = 64,
     /// Matrix diagonal has unitary values
-    DIAGUNIT,
+    DIAGUNIT = 128,
     /// Matrix is symmetric
-    SYM,
+    SYM = 512,
     /// Matrix is positive definite
-    POSDEF,
+    POSDEF = 1024,
     /// Matrix is orthogonal
-    ORTHOG,
+    ORTHOG = 2048,
     /// Matrix is tri-diagonal
-    TRIDIAG,
+    TRIDIAG = 4096,
     /// Matrix is block-diagonal
-    BLOCKDIAG,
+    BLOCKDIAG = 8192,
 }
 
 /// Norm type

src/device/mod.rs renamed to src/core/device.rs

@@ -1,9 +1,8 @@
-extern crate libc;
+use super::defines::AfError;
+use super::error::HANDLE_ERROR;
+use super::util::free_host;
 
-use self::libc::{c_char, c_int, size_t};
-use crate::defines::AfError;
-use crate::error::HANDLE_ERROR;
-use crate::util::free_host;
+use libc::{c_char, c_int, size_t};
 use std::borrow::Cow;
 use std::ffi::{CStr, CString};