updated single-svdlib, updated dependencies, added local transfer between ndarray and nalgebra

Author: Ian

Cargo.lock

@@ -4,23 +4,21 @@ description = "A Rust port of LAS2 from SVDLIBC"
 keywords = ["svd"]
 categories = ["algorithms", "data-structures", "mathematics", "science"]
 name = "single-svdlib"
-version = "1.0.6"
+version = "1.0.8"
 edition = "2021"
 license-file = "SVDLIBC-LICENSE.txt"
 
 [features]
 # simd = ["dep:simba", "single-utilities/simd"]
 
 [dependencies]
-anyhow = "1.0.97"
-nalgebra-sparse = "0.10.0"
+anyhow = "1.0"
+nalgebra-sparse = "0.11.0"
 num-traits = "0.2.19"
 rand = "0.9.0"
 rand_distr = "0.5.1"
 rayon = "1.10.0"
 thiserror = "2.0.9"
-nshare = {version = "0.10.0", features = ["nalgebra", "ndarray"] }
-ndarray = "0.16.1"
-single-utilities = "0.8.0"
-nalgebra = {version = "0.33.2", features = ["rayon"] }
-simba = {version = "0.9.0", optional = true}
+ndarray = "0.16"
+single-utilities = "0.8.7"
+nalgebra = {version = "0.34", features = ["rayon"] }

Cargo.toml

@@ -1,8 +1,7 @@
 use crate::error::SvdLibError;
-use crate::{Diagnostics, SMat, SvdFloat, SvdRec};
+use crate::{Diagnostics, IntoNdarray2, SMat, SvdFloat, SvdRec};
 use nalgebra_sparse::na::{ComplexField, DMatrix, DVector, RealField};
 use ndarray::Array1;
-use nshare::IntoNdarray2;
 use rand::prelude::{Distribution, StdRng};
 use rand::SeedableRng;
 use rand_distr::Normal;

src/randomized/mod.rs

@@ -1,10 +1,11 @@
 use rayon::iter::ParallelIterator;
 use nalgebra_sparse::na::{DMatrix, DVector};
-use ndarray::{Array1, Array2};
+use ndarray::{Array1, Array2, ShapeBuilder};
 use num_traits::{Float, Zero};
 use rayon::prelude::{IntoParallelIterator, IndexedParallelIterator};
 use single_utilities::traits::FloatOpsTS;
 use std::fmt::Debug;
+use nalgebra::{Dim, Dyn, Scalar};
 
 pub fn determine_chunk_size(nrows: usize) -> usize {
     let num_threads = rayon::current_num_threads();
@@ -110,3 +111,22 @@ impl SvdFloat for f64 {
         (b - a).abs() < f64::EPSILON
     }
 }
+
+pub trait IntoNdarray2 {
+    type Out;
+
+    fn into_ndarray2(self) -> Self::Out;
+}
+
+impl<N: Scalar> IntoNdarray2 for nalgebra::Matrix<N, Dyn, Dyn, nalgebra::VecStorage<N, Dyn, Dyn>>
+where
+    nalgebra::DefaultAllocator:
+    nalgebra::allocator::Allocator<Dyn, Dyn, Buffer<N> = nalgebra::VecStorage<N, Dyn, Dyn>>,
+{
+    type Out = ndarray::Array2<N>;
+
+    fn into_ndarray2(self) -> Self::Out {
+        ndarray::Array2::from_shape_vec(self.shape().strides(self.strides()), self.data.into())
+            .unwrap()
+    }
+}