diff -r 495448cca603 -r 6aa955ad8122 src/nalgebra_support.rs --- a/src/nalgebra_support.rs Thu May 01 08:40:33 2025 -0500 +++ b/src/nalgebra_support.rs Thu May 01 13:06:58 2025 -0500 @@ -8,95 +8,118 @@ [`num_traits`] does. */ +use crate::euclidean::*; +use crate::instance::Instance; +use crate::linops::*; +use crate::mapping::{BasicDecomposition, Space}; +use crate::norms::*; +use crate::types::Float; +use nalgebra::base::allocator::Allocator; +use nalgebra::base::constraint::{SameNumberOfColumns, SameNumberOfRows, ShapeConstraint}; +use nalgebra::base::dimension::*; use nalgebra::{ - Matrix, Storage, StorageMut, OMatrix, Dim, DefaultAllocator, Scalar, - ClosedAddAssign, ClosedMulAssign, SimdComplexField, Vector, OVector, RealField, - LpNorm, UniformNorm + ClosedAddAssign, ClosedMulAssign, DefaultAllocator, Dim, LpNorm, Matrix, OMatrix, OVector, + RealField, Scalar, SimdComplexField, Storage, StorageMut, UniformNorm, Vector, }; -use nalgebra::base::constraint::{ - ShapeConstraint, SameNumberOfRows, SameNumberOfColumns -}; -use nalgebra::base::dimension::*; -use nalgebra::base::allocator::Allocator; +use num_traits::identities::{One, Zero}; use std::ops::Mul; -use num_traits::identities::{Zero, One}; -use crate::linops::*; -use crate::euclidean::*; -use crate::mapping::{Space, BasicDecomposition}; -use crate::types::Float; -use crate::norms::*; -use crate::instance::Instance; -impl Space for Matrix +impl Space for Matrix where - SM: Storage + Clone, - N : Dim, M : Dim, E : Scalar + Zero + One + ClosedAddAssign + ClosedMulAssign, - DefaultAllocator : Allocator, + SM: Storage + Clone, + N: Dim, + M: Dim, + E: Scalar + Zero + One + ClosedAddAssign + ClosedMulAssign, + DefaultAllocator: Allocator, { type Decomp = BasicDecomposition; } -impl Mapping> for Matrix -where SM: Storage, SV: Storage + Clone, - N : Dim, M : Dim, K : Dim, E : Scalar + Zero + One + ClosedAddAssign + ClosedMulAssign, - DefaultAllocator : Allocator, - DefaultAllocator : Allocator, - DefaultAllocator : Allocator, - DefaultAllocator : Allocator { - type Codomain = OMatrix; +impl Mapping> for Matrix +where + SM: Storage, + SV: Storage + Clone, + N: Dim, + M: Dim, + K: Dim, + E: Scalar + Zero + One + ClosedAddAssign + ClosedMulAssign, + DefaultAllocator: Allocator, + DefaultAllocator: Allocator, + DefaultAllocator: Allocator, + DefaultAllocator: Allocator, +{ + type Codomain = OMatrix; #[inline] - fn apply>>( - &self, x : I - ) -> Self::Codomain { + fn apply>>(&self, x: I) -> Self::Codomain { x.either(|owned| self.mul(owned), |refr| self.mul(refr)) } } - -impl<'a, SM,SV,N,M,K,E> Linear> for Matrix -where SM: Storage, SV: Storage + Clone, - N : Dim, M : Dim, K : Dim, E : Scalar + Zero + One + ClosedAddAssign + ClosedMulAssign, - DefaultAllocator : Allocator, - DefaultAllocator : Allocator, - DefaultAllocator : Allocator, - DefaultAllocator : Allocator { +impl<'a, SM, SV, N, M, K, E> Linear> for Matrix +where + SM: Storage, + SV: Storage + Clone, + N: Dim, + M: Dim, + K: Dim, + E: Scalar + Zero + One + ClosedAddAssign + ClosedMulAssign, + DefaultAllocator: Allocator, + DefaultAllocator: Allocator, + DefaultAllocator: Allocator, + DefaultAllocator: Allocator, +{ } -impl GEMV, Matrix> for Matrix -where SM: Storage, SV1: Storage + Clone, SV2: StorageMut, - N : Dim, M : Dim, K : Dim, E : Scalar + Zero + One + Float, - DefaultAllocator : Allocator, - DefaultAllocator : Allocator, - DefaultAllocator : Allocator, - DefaultAllocator : Allocator { - +impl GEMV, Matrix> + for Matrix +where + SM: Storage, + SV1: Storage + Clone, + SV2: StorageMut, + N: Dim, + M: Dim, + K: Dim, + E: Scalar + Zero + One + Float, + DefaultAllocator: Allocator, + DefaultAllocator: Allocator, + DefaultAllocator: Allocator, + DefaultAllocator: Allocator, +{ #[inline] - fn gemv>>( - &self, y : &mut Matrix, α : E, x : I, β : E + fn gemv>>( + &self, + y: &mut Matrix, + α: E, + x: I, + β: E, ) { x.eval(|x̃| Matrix::gemm(y, α, self, x̃, β)) } #[inline] - fn apply_mut<'a, I : Instance>>(&self, y : &mut Matrix, x : I) { + fn apply_mut<'a, I: Instance>>(&self, y: &mut Matrix, x: I) { x.eval(|x̃| self.mul_to(x̃, y)) } } -impl AXPY> for Vector -where SM: StorageMut + Clone, SV1: Storage + Clone, - M : Dim, E : Scalar + Zero + One + Float, - DefaultAllocator : Allocator { +impl AXPY> for Vector +where + SM: StorageMut + Clone, + SV1: Storage + Clone, + M: Dim, + E: Scalar + Zero + One + Float, + DefaultAllocator: Allocator, +{ type Owned = OVector; #[inline] - fn axpy>>(&mut self, α : E, x : I, β : E) { + fn axpy>>(&mut self, α: E, x: I, β: E) { x.eval(|x̃| Matrix::axpy(self, α, x̃, β)) } #[inline] - fn copy_from>>(&mut self, y : I) { + fn copy_from>>(&mut self, y: I) { y.eval(|ỹ| Matrix::copy_from(self, ỹ)) } @@ -125,26 +148,40 @@ } }*/ -impl Projection for Vector -where SM: StorageMut + Clone, - M : Dim, E : Scalar + Zero + One + Float + RealField, - DefaultAllocator : Allocator { +impl Projection for Vector +where + SM: StorageMut + Clone, + M: Dim, + E: Scalar + Zero + One + Float + RealField, + DefaultAllocator: Allocator, +{ #[inline] - fn proj_ball_mut(&mut self, ρ : E, _ : Linfinity) { - self.iter_mut().for_each(|v| *v = num_traits::clamp(*v, -ρ, ρ)) + fn proj_ball_mut(&mut self, ρ: E, _: Linfinity) { + self.iter_mut() + .for_each(|v| *v = num_traits::clamp(*v, -ρ, ρ)) } } -impl<'own,SV1,SV2,SM,N,M,K,E> Adjointable, Matrix> -for Matrix -where SM: Storage, SV1: Storage + Clone, SV2: Storage + Clone, - N : Dim, M : Dim, K : Dim, E : Scalar + Zero + One + SimdComplexField, - DefaultAllocator : Allocator, - DefaultAllocator : Allocator, - DefaultAllocator : Allocator, - DefaultAllocator : Allocator { - type AdjointCodomain = OMatrix; - type Adjoint<'a> = OMatrix where SM : 'a; +impl<'own, SV1, SV2, SM, N, M, K, E> Adjointable, Matrix> + for Matrix +where + SM: Storage, + SV1: Storage + Clone, + SV2: Storage + Clone, + N: Dim, + M: Dim, + K: Dim, + E: Scalar + Zero + One + SimdComplexField, + DefaultAllocator: Allocator, + DefaultAllocator: Allocator, + DefaultAllocator: Allocator, + DefaultAllocator: Allocator, +{ + type AdjointCodomain = OMatrix; + type Adjoint<'a> + = OMatrix + where + SM: 'a; #[inline] fn adjoint(&self) -> Self::Adjoint<'_> { @@ -160,7 +197,7 @@ m2: &Matrix, ) -> T::SimdRealField where - T: SimdComplexField, + T: SimdComplexField, R1: Dim, C1: Dim, S1: Storage, @@ -177,38 +214,38 @@ // TODO: should allow different input storages in `Euclidean`. -impl Euclidean -for Vector -where M : Dim, - S : StorageMut + Clone, - E : Float + Scalar + Zero + One + RealField, - DefaultAllocator : Allocator { - +impl Euclidean for Vector +where + M: Dim, + S: StorageMut + Clone, + E: Float + Scalar + Zero + One + RealField, + DefaultAllocator: Allocator, +{ type Output = OVector; #[inline] - fn dot>(&self, other : I) -> E { - Vector::::dot(self, other.ref_instance()) + fn dot>(&self, other: I) -> E { + Vector::::dot(self, other.ref_instance()) } #[inline] fn norm2_squared(&self) -> E { - Vector::::norm_squared(self) + Vector::::norm_squared(self) } #[inline] - fn dist2_squared>(&self, other : I) -> E { + fn dist2_squared>(&self, other: I) -> E { metric_distance_squared(self, other.ref_instance()) } } -impl StaticEuclidean -for Vector -where M : DimName, - S : StorageMut + Clone, - E : Float + Scalar + Zero + One + RealField, - DefaultAllocator : Allocator { - +impl StaticEuclidean for Vector +where + M: DimName, + S: StorageMut + Clone, + E: Float + Scalar + Zero + One + RealField, + DefaultAllocator: Allocator, +{ #[inline] fn origin() -> OVector { OVector::zeros() @@ -216,13 +253,13 @@ } /// The default norm for `Vector` is [`L2`]. -impl Normed -for Vector -where M : Dim, - S : Storage + Clone, - E : Float + Scalar + Zero + One + RealField, - DefaultAllocator : Allocator { - +impl Normed for Vector +where + M: Dim, + S: Storage + Clone, + E: Float + Scalar + Zero + One + RealField, + DefaultAllocator: Allocator, +{ type NormExp = L2; #[inline] @@ -232,91 +269,95 @@ #[inline] fn is_zero(&self) -> bool { - Vector::::norm_squared(self) == E::ZERO + Vector::::norm_squared(self) == E::ZERO } } -impl HasDual -for Vector -where M : Dim, - S : Storage + Clone, - E : Float + Scalar + Zero + One + RealField, - DefaultAllocator : Allocator { +impl HasDual for Vector +where + M: Dim, + S: Storage + Clone, + E: Float + Scalar + Zero + One + RealField, + DefaultAllocator: Allocator, +{ // TODO: Doesn't work with different storage formats. type DualSpace = Self; } -impl Norm -for Vector -where M : Dim, - S : Storage, - E : Float + Scalar + Zero + One + RealField, - DefaultAllocator : Allocator { - +impl Norm for Vector +where + M: Dim, + S: Storage, + E: Float + Scalar + Zero + One + RealField, + DefaultAllocator: Allocator, +{ #[inline] - fn norm(&self, _ : L1) -> E { + fn norm(&self, _: L1) -> E { nalgebra::Norm::norm(&LpNorm(1), self) } } -impl Dist -for Vector -where M : Dim, - S : Storage + Clone, - E : Float + Scalar + Zero + One + RealField, - DefaultAllocator : Allocator { +impl Dist for Vector +where + M: Dim, + S: Storage + Clone, + E: Float + Scalar + Zero + One + RealField, + DefaultAllocator: Allocator, +{ #[inline] - fn dist>(&self, other : I, _ : L1) -> E { + fn dist>(&self, other: I, _: L1) -> E { nalgebra::Norm::metric_distance(&LpNorm(1), self, other.ref_instance()) } } -impl Norm -for Vector -where M : Dim, - S : Storage, - E : Float + Scalar + Zero + One + RealField, - DefaultAllocator : Allocator { - +impl Norm for Vector +where + M: Dim, + S: Storage, + E: Float + Scalar + Zero + One + RealField, + DefaultAllocator: Allocator, +{ #[inline] - fn norm(&self, _ : L2) -> E { + fn norm(&self, _: L2) -> E { nalgebra::Norm::norm(&LpNorm(2), self) } } -impl Dist -for Vector -where M : Dim, - S : Storage + Clone, - E : Float + Scalar + Zero + One + RealField, - DefaultAllocator : Allocator { +impl Dist for Vector +where + M: Dim, + S: Storage + Clone, + E: Float + Scalar + Zero + One + RealField, + DefaultAllocator: Allocator, +{ #[inline] - fn dist>(&self, other : I, _ : L2) -> E { + fn dist>(&self, other: I, _: L2) -> E { nalgebra::Norm::metric_distance(&LpNorm(2), self, other.ref_instance()) } } -impl Norm -for Vector -where M : Dim, - S : Storage, - E : Float + Scalar + Zero + One + RealField, - DefaultAllocator : Allocator { - +impl Norm for Vector +where + M: Dim, + S: Storage, + E: Float + Scalar + Zero + One + RealField, + DefaultAllocator: Allocator, +{ #[inline] - fn norm(&self, _ : Linfinity) -> E { + fn norm(&self, _: Linfinity) -> E { nalgebra::Norm::norm(&UniformNorm, self) } } -impl Dist -for Vector -where M : Dim, - S : Storage + Clone, - E : Float + Scalar + Zero + One + RealField, - DefaultAllocator : Allocator { +impl Dist for Vector +where + M: Dim, + S: Storage + Clone, + E: Float + Scalar + Zero + One + RealField, + DefaultAllocator: Allocator, +{ #[inline] - fn dist>(&self, other : I, _ : Linfinity) -> E { + fn dist>(&self, other: I, _: Linfinity) -> E { nalgebra::Norm::metric_distance(&UniformNorm, self, other.ref_instance()) } } @@ -329,15 +370,15 @@ /// from [`nalgebra`] conflicting with them. Only when absolutely necessary to work with /// nalgebra, one can convert to the nalgebra view of the same type using the methods of /// this trait. -pub trait ToNalgebraRealField : Float { +pub trait ToNalgebraRealField: Float { /// The nalgebra type corresponding to this type. Usually same as `Self`. /// /// This type only carries `nalgebra` traits. - type NalgebraType : RealField; + type NalgebraType: RealField; /// The “mixed” type corresponding to this type. Usually same as `Self`. /// /// This type carries both `num_traits` and `nalgebra` traits. - type MixedType : RealField + Float; + type MixedType: RealField + Float; /// Convert to the nalgebra view of `self`. fn to_nalgebra(self) -> Self::NalgebraType; @@ -346,10 +387,10 @@ fn to_nalgebra_mixed(self) -> Self::MixedType; /// Convert from the nalgebra view of `self`. - fn from_nalgebra(t : Self::NalgebraType) -> Self; + fn from_nalgebra(t: Self::NalgebraType) -> Self; /// Convert from the mixed (nalgebra and num_traits) view to `self`. - fn from_nalgebra_mixed(t : Self::MixedType) -> Self; + fn from_nalgebra_mixed(t: Self::MixedType) -> Self; } impl ToNalgebraRealField for f32 { @@ -357,17 +398,24 @@ type MixedType = f32; #[inline] - fn to_nalgebra(self) -> Self::NalgebraType { self } - - #[inline] - fn to_nalgebra_mixed(self) -> Self::MixedType { self } + fn to_nalgebra(self) -> Self::NalgebraType { + self + } #[inline] - fn from_nalgebra(t : Self::NalgebraType) -> Self { t } + fn to_nalgebra_mixed(self) -> Self::MixedType { + self + } #[inline] - fn from_nalgebra_mixed(t : Self::MixedType) -> Self { t } + fn from_nalgebra(t: Self::NalgebraType) -> Self { + t + } + #[inline] + fn from_nalgebra_mixed(t: Self::MixedType) -> Self { + t + } } impl ToNalgebraRealField for f64 { @@ -375,15 +423,22 @@ type MixedType = f64; #[inline] - fn to_nalgebra(self) -> Self::NalgebraType { self } + fn to_nalgebra(self) -> Self::NalgebraType { + self + } #[inline] - fn to_nalgebra_mixed(self) -> Self::MixedType { self } + fn to_nalgebra_mixed(self) -> Self::MixedType { + self + } #[inline] - fn from_nalgebra(t : Self::NalgebraType) -> Self { t } + fn from_nalgebra(t: Self::NalgebraType) -> Self { + t + } #[inline] - fn from_nalgebra_mixed(t : Self::MixedType) -> Self { t } + fn from_nalgebra_mixed(t: Self::MixedType) -> Self { + t + } } -