Multiple interface updates for LU decomposition

algorithms/src/lib.rs

@@ -1,9 +1,6 @@
 //! Collection of Linear Solver Algorithms and Interfaces
 #![cfg_attr(feature = "strict", deny(warnings))]
 
-extern crate rlst_blis_src;
-extern crate rlst_netlib_lapack_src;
-
 //pub mod dense;
 // pub mod iterative_solvers;
 // pub mod lapack;

common/src/traits/operations.rs

@@ -133,17 +133,17 @@ pub trait PermuteRows {
 /// Multiply First * Second and sum into Self
 pub trait MultInto<First, Second> {
     type Item: Scalar;
-    fn mult_into(&mut self, alpha: Self::Item, arr_a: First, arr_b: Second, beta: Self::Item);
+    fn mult_into(self, alpha: Self::Item, arr_a: First, arr_b: Second, beta: Self::Item) -> Self;
 }
 
 /// Multiply First * Second and sum into Self. Allow to resize Self if necessary
 pub trait MultIntoResize<First, Second> {
     type Item: Scalar;
     fn mult_into_resize(
-        &mut self,
+        self,
         alpha: Self::Item,
         arr_a: First,
         arr_b: Second,
         beta: Self::Item,
-    );
+    ) -> Self;
 }

dense/Cargo.toml

@@ -23,19 +23,18 @@ cauchy = "0.4"
 rand = "0.8"
 itertools = "0.10"
 rand_distr = "0.4"
-rlst-blis = { path = "../blis"}
-approx = { version = "0.5", features=["num-complex"] }
-rlst-operator = {path = "../operator"}
-rlst-common = {path = "../common"}
-rlst-lapack = {path = "../lapack"}
+rlst-blis = { path = "../blis" }
+approx = { version = "0.5", features = ["num-complex"] }
+rlst-operator = { path = "../operator" }
+rlst-common = { path = "../common" }
+rlst-lapack = { path = "../lapack" }
 paste = "1"
 rand_chacha = "0.3"
+rlst-blis-src = { path = "../blis-src" }
+rlst-netlib-lapack-src = { path = "../netlib-lapack-src" }
 
 [dev-dependencies]
 criterion = { version = "0.3", features = ["html_reports"] }
 
 [package.metadata.docs.rs]
-rustdoc-args = [ "--html-in-header", "katex-header.html" ]
-
-
-
+rustdoc-args = ["--html-in-header", "katex-header.html"]

dense/src/array.rs

@@ -239,3 +239,10 @@ impl<
         self.0.resize_in_place(shape)
     }
 }
+
+/// Create an empty array of given type and dimension.
+pub fn empty_array<Item: Scalar, const NDIM: usize>() -> DynamicArray<Item, NDIM> {
+    let shape = [0; NDIM];
+    let container = VectorContainer::new(0);
+    Array::new(BaseArray::new(container, shape))
+}

dense/src/array/mult_into.rs

@@ -29,15 +29,18 @@ impl<
     type Item = Item;
 
     fn mult_into(
-        &mut self,
+        mut self,
         alpha: Item,
         arr_a: Array<Item, ArrayImplFirst, 2>,
         arr_b: Array<Item, ArrayImplSecond, 2>,
         beta: Item,
-    ) {
+    ) -> Self {
         let transa = TransMode::NoTrans;
         let transb = TransMode::NoTrans;
-        crate::matrix_multiply::matrix_multiply(transa, transb, alpha, &arr_a, &arr_b, beta, self)
+        crate::matrix_multiply::matrix_multiply(
+            transa, transb, alpha, &arr_a, &arr_b, beta, &mut self,
+        );
+        self
     }
 }
 
@@ -64,12 +67,12 @@ impl<
     type Item = Item;
 
     fn mult_into(
-        &mut self,
+        mut self,
         alpha: Item,
         arr_a: Array<Item, ArrayImplFirst, 2>,
         arr_b: Array<Item, ArrayImplSecond, 1>,
         beta: Item,
-    ) {
+    ) -> Self {
         let transa = TransMode::NoTrans;
         let transb = TransMode::NoTrans;
 
@@ -84,7 +87,8 @@ impl<
             &arr_with_padded_dim,
             beta,
             &mut self_with_padded_dim,
-        )
+        );
+        self
     }
 }
 
@@ -111,12 +115,12 @@ impl<
     type Item = Item;
 
     fn mult_into(
-        &mut self,
+        mut self,
         alpha: Item,
         arr_a: Array<Item, ArrayImplFirst, 1>,
         arr_b: Array<Item, ArrayImplSecond, 2>,
         beta: Item,
-    ) {
+    ) -> Self {
         let transa = TransMode::NoTrans;
         let transb = TransMode::NoTrans;
 
@@ -131,7 +135,8 @@ impl<
             &arr_b,
             beta,
             &mut self_with_padded_dim,
-        )
+        );
+        self
     }
 }
 
@@ -161,12 +166,12 @@ impl<
     type Item = Item;
 
     fn mult_into_resize(
-        &mut self,
+        mut self,
         alpha: Item,
         arr_a: Array<Item, ArrayImplFirst, 2>,
         arr_b: Array<Item, ArrayImplSecond, 2>,
         beta: Item,
-    ) {
+    ) -> Self {
         let transa = TransMode::NoTrans;
         let transb = TransMode::NoTrans;
 
@@ -175,7 +180,10 @@ impl<
             self.resize_in_place(expected_shape);
         }
 
-        crate::matrix_multiply::matrix_multiply(transa, transb, alpha, &arr_a, &arr_b, beta, self)
+        crate::matrix_multiply::matrix_multiply(
+            transa, transb, alpha, &arr_a, &arr_b, beta, &mut self,
+        );
+        self
     }
 }
 
@@ -203,12 +211,12 @@ impl<
     type Item = Item;
 
     fn mult_into_resize(
-        &mut self,
+        mut self,
         alpha: Item,
         arr_a: Array<Item, ArrayImplFirst, 2>,
         arr_b: Array<Item, ArrayImplSecond, 1>,
         beta: Item,
-    ) {
+    ) -> Self {
         let transa = TransMode::NoTrans;
         let transb = TransMode::NoTrans;
 
@@ -229,7 +237,8 @@ impl<
             &arr_with_padded_dim,
             beta,
             &mut self_with_padded_dim,
-        )
+        );
+        self
     }
 }
 
@@ -257,12 +266,12 @@ impl<
     type Item = Item;
 
     fn mult_into_resize(
-        &mut self,
+        mut self,
         alpha: Item,
         arr_a: Array<Item, ArrayImplFirst, 1>,
         arr_b: Array<Item, ArrayImplSecond, 2>,
         beta: Item,
-    ) {
+    ) -> Self {
         let transa = TransMode::NoTrans;
         let transb = TransMode::NoTrans;
 
@@ -283,6 +292,7 @@ impl<
             &arr_b,
             beta,
             &mut self_with_padded_dim,
-        )
+        );
+        self
     }
 }

dense/src/lib.rs

@@ -33,6 +33,9 @@
 //! - [Examples](crate::examples)
 #![cfg_attr(feature = "strict", deny(warnings))]
 
+extern crate rlst_blis_src;
+extern crate rlst_netlib_lapack_src;
+
 pub mod base_array;
 pub mod data_container;
 pub mod linalg;