Updating to use latest rlst

bem/Cargo.toml

@@ -31,10 +31,10 @@ itertools = "0.10"
 mpi = { version = "0.6.*", optional = true }
 num = "0.4"
 rayon = "1.7"
-rlst = { git = "https://github.com/linalg-rs/rlst.git", branch = "legacy"}
-rlst-blis-src = { git = "https://github.com/linalg-rs/rlst.git", branch = "legacy" }
-rlst-dense = { git = "https://github.com/linalg-rs/rlst.git", branch = "legacy" }
-rlst-algorithms = { git = "https://github.com/linalg-rs/rlst.git", branch = "legacy" }
+rlst = { git = "https://github.com/linalg-rs/rlst.git" }
+rlst-blis-src = { git = "https://github.com/linalg-rs/rlst.git" }
+rlst-dense = { git = "https://github.com/linalg-rs/rlst.git" }
+rlst-common = { git = "https://github.com/linalg-rs/rlst.git" }
 
 [dev-dependencies]
 criterion = { version = "0.3", features = ["html_reports"]}

bem/benches/assembly_benchmark.rs

@@ -24,7 +24,7 @@ pub fn full_assembly_benchmark(c: &mut Criterion) {
         );
 
         let space = SerialFunctionSpace::new(&grid, &element);
-        let mut matrix = zero_matrix((space.dofmap().global_size(), space.dofmap().global_size()));
+        let mut matrix = zero_matrix([space.dofmap().global_size(), space.dofmap().global_size()]);
 
         group.bench_function(
             &format!(
@@ -62,7 +62,7 @@ pub fn assembly_parts_benchmark(c: &mut Criterion) {
         );
 
         let space = SerialFunctionSpace::new(&grid, &element);
-        let mut matrix = zero_matrix((space.dofmap().global_size(), space.dofmap().global_size()));
+        let mut matrix = zero_matrix([space.dofmap().global_size(), space.dofmap().global_size()]);
 
         let colouring = space.compute_cell_colouring();
 
@@ -101,8 +101,6 @@ pub fn assembly_parts_benchmark(c: &mut Criterion) {
                     batched::assemble_nonsingular::<16, 16>(
                         &mut matrix,
                         &laplace_3d::Laplace3dKernel::new(),
-                        false,
-                        false,
                         &space,
                         &space,
                         &colouring,

bem/examples/assemble.rs

@@ -34,7 +34,7 @@ fn main() {
         space0.dofmap().global_size()
     );
     let mut matrix =
-        zero_matrix::<f64>((space1.dofmap().global_size(), space0.dofmap().global_size()));
+        zero_matrix::<f64>([space1.dofmap().global_size(), space0.dofmap().global_size()]);
 
     println!("Assembling dense matrix (complex)");
     assemble_batched(

bem/src/assembly.rs

@@ -67,7 +67,7 @@ mod test {
     use bempp_traits::element::{Continuity, ElementFamily};
     // use num::complex::Complex;
     use bempp_traits::bem::FunctionSpace;
-    use rlst_dense::RandomAccessByRef;
+    use rlst_dense::traits::RandomAccessByRef;
 
     #[test]
     fn test_laplace_single_layer() {
@@ -88,7 +88,7 @@ mod test {
         let space1 = SerialFunctionSpace::new(&grid, &element1);
 
         let mut matrix =
-            zero_matrix::<f64>((space1.dofmap().global_size(), space0.dofmap().global_size()));
+            zero_matrix::<f64>([space1.dofmap().global_size(), space0.dofmap().global_size()]);
         batched::assemble(
             &mut matrix,
             &Laplace3dKernel::new(),
@@ -99,7 +99,7 @@ mod test {
         );
 
         let mut matrix2 =
-            zero_matrix::<f64>((space1.dofmap().global_size(), space0.dofmap().global_size()));
+            zero_matrix::<f64>([space1.dofmap().global_size(), space0.dofmap().global_size()]);
 
         assemble_batched(
             &mut matrix2,
@@ -112,8 +112,8 @@ mod test {
         for i in 0..space1.dofmap().global_size() {
             for j in 0..space0.dofmap().global_size() {
                 assert_relative_eq!(
-                    *matrix.get(i, j).unwrap(),
-                    *matrix2.get(i, j).unwrap(),
+                    *matrix.get([i, j]).unwrap(),
+                    *matrix2.get([i, j]).unwrap(),
                     epsilon = 0.0001
                 );
             }