Move znx layouts traits to layouts

This commit is contained in:
Pro7ech
2025-08-24 17:21:05 +02:00
parent bf513dc555
commit 62448e0293
88 changed files with 169 additions and 193 deletions

View File

@@ -6,7 +6,6 @@ mod vec_znx_big;
mod vec_znx_dft;
mod vmp_pmat;
mod zn;
mod znx_base;
pub use module::*;
pub use scratch::*;
@@ -16,4 +15,3 @@ pub use vec_znx_big::*;
pub use vec_znx_dft::*;
pub use vmp_pmat::*;
pub use zn::*;
pub use znx_base::*;

View File

@@ -1,9 +1,8 @@
use itertools::izip;
use rug::{Assign, Float};
use crate::{
api::{ZnxInfos, ZnxView, ZnxViewMut, ZnxZero},
layouts::{DataMut, DataRef, VecZnx, VecZnxToMut, VecZnxToRef, Zn, ZnToMut, ZnToRef},
use crate::layouts::{
DataMut, DataRef, VecZnx, VecZnxToMut, VecZnxToRef, Zn, ZnToMut, ZnToRef, ZnxInfos, ZnxView, ZnxViewMut, ZnxZero,
};
impl<D: DataMut> VecZnx<D> {

View File

@@ -1,7 +1,9 @@
use crate::{
alloc_aligned,
api::{DataView, DataViewMut, FillUniform, Reset, ZnxInfos, ZnxSliceSize, ZnxView, ZnxViewMut, ZnxZero},
layouts::{Data, DataMut, DataRef, ReaderFrom, ToOwnedDeep, VecZnx, WriterTo},
layouts::{
Data, DataMut, DataRef, DataView, DataViewMut, FillUniform, ReaderFrom, Reset, ToOwnedDeep, VecZnx, WriterTo, ZnxInfos,
ZnxSliceSize, ZnxView, ZnxViewMut, ZnxZero,
},
source::Source,
};
use std::fmt;

View File

@@ -11,6 +11,7 @@ mod vec_znx_big;
mod vec_znx_dft;
mod vmp_pmat;
mod zn;
mod znx_base;
pub use mat_znx::*;
pub use module::*;
@@ -23,6 +24,7 @@ pub use vec_znx_big::*;
pub use vec_znx_dft::*;
pub use vmp_pmat::*;
pub use zn::*;
pub use znx_base::*;
pub trait Data = PartialEq + Eq + Sized;
pub trait DataRef = Data + AsRef<[u8]>;

View File

@@ -4,8 +4,10 @@ use rand_distr::{Distribution, weighted::WeightedIndex};
use crate::{
alloc_aligned,
api::{DataView, DataViewMut, FillUniform, Reset, ZnxInfos, ZnxSliceSize, ZnxView, ZnxViewMut, ZnxZero},
layouts::{Data, DataMut, DataRef, ReaderFrom, ToOwnedDeep, VecZnx, WriterTo},
layouts::{
Data, DataMut, DataRef, DataView, DataViewMut, FillUniform, ReaderFrom, Reset, ToOwnedDeep, VecZnx, WriterTo, ZnxInfos,
ZnxSliceSize, ZnxView, ZnxViewMut, ZnxZero,
},
source::Source,
};

View File

@@ -4,10 +4,7 @@ use rug::{
ops::{AddAssignRound, DivAssignRound, SubAssignRound},
};
use crate::{
api::ZnxInfos,
layouts::{DataRef, VecZnx},
};
use crate::layouts::{DataRef, VecZnx, ZnxInfos};
impl<D: DataRef> VecZnx<D> {
pub fn std(&self, basek: usize, col: usize) -> f64 {

View File

@@ -2,8 +2,7 @@ use std::marker::PhantomData;
use crate::{
alloc_aligned,
api::{DataView, DataViewMut, ZnxInfos, ZnxSliceSize, ZnxView},
layouts::{Backend, Data, DataMut, DataRef, ReaderFrom, WriterTo},
layouts::{Backend, Data, DataMut, DataRef, DataView, DataViewMut, ReaderFrom, WriterTo, ZnxInfos, ZnxSliceSize, ZnxView},
oep::SvpPPolAllocBytesImpl,
};

View File

@@ -2,8 +2,10 @@ use std::fmt;
use crate::{
alloc_aligned,
api::{DataView, DataViewMut, FillUniform, Reset, ZnxInfos, ZnxSliceSize, ZnxView, ZnxViewMut, ZnxZero},
layouts::{Data, DataMut, DataRef, ReaderFrom, ToOwnedDeep, WriterTo},
layouts::{
Data, DataMut, DataRef, DataView, DataViewMut, FillUniform, ReaderFrom, Reset, ToOwnedDeep, WriterTo, ZnxInfos,
ZnxSliceSize, ZnxView, ZnxViewMut, ZnxZero,
},
source::Source,
};

View File

@@ -5,8 +5,7 @@ use std::fmt;
use crate::{
alloc_aligned,
api::{DataView, DataViewMut, ZnxInfos, ZnxSliceSize, ZnxView, ZnxViewMut, ZnxZero},
layouts::{Backend, Data, DataMut, DataRef},
layouts::{Backend, Data, DataMut, DataRef, DataView, DataViewMut, ZnxInfos, ZnxSliceSize, ZnxView, ZnxViewMut, ZnxZero},
oep::VecZnxBigAllocBytesImpl,
};

View File

@@ -4,8 +4,9 @@ use rand_distr::num_traits::Zero;
use crate::{
alloc_aligned,
api::{DataView, DataViewMut, ZnxInfos, ZnxSliceSize, ZnxView, ZnxViewMut, ZnxZero},
layouts::{Backend, Data, DataMut, DataRef, VecZnxBig},
layouts::{
Backend, Data, DataMut, DataRef, DataView, DataViewMut, VecZnxBig, ZnxInfos, ZnxSliceSize, ZnxView, ZnxViewMut, ZnxZero,
},
oep::VecZnxBigAllocBytesImpl,
};
#[derive(PartialEq, Eq)]

View File

@@ -2,8 +2,7 @@ use std::marker::PhantomData;
use crate::{
alloc_aligned,
api::{DataView, DataViewMut, ZnxInfos, ZnxView},
layouts::{Backend, Data, DataMut, DataRef},
layouts::{Backend, Data, DataMut, DataRef, DataView, DataViewMut, ZnxInfos, ZnxView},
oep::VmpPMatAllocBytesImpl,
};

View File

@@ -2,8 +2,10 @@ use std::fmt;
use crate::{
alloc_aligned,
api::{DataView, DataViewMut, FillUniform, Reset, ZnxInfos, ZnxSliceSize, ZnxView, ZnxViewMut, ZnxZero},
layouts::{Data, DataMut, DataRef, ReaderFrom, ToOwnedDeep, WriterTo},
layouts::{
Data, DataMut, DataRef, DataView, DataViewMut, FillUniform, ReaderFrom, Reset, ToOwnedDeep, WriterTo, ZnxInfos,
ZnxSliceSize, ZnxView, ZnxViewMut, ZnxZero,
},
source::Source,
};

View File

@@ -1,6 +1,5 @@
use crate::{
api::ZnxInfos,
layouts::{Backend, DataRef, MatZnx, ScalarZnx, Scratch, ScratchOwned, SvpPPol, VecZnx, VecZnxBig, VecZnxDft, VmpPMat},
use crate::layouts::{
Backend, DataRef, MatZnx, ScalarZnx, Scratch, ScratchOwned, SvpPPol, VecZnx, VecZnxBig, VecZnxDft, VmpPMat, ZnxInfos,
};
/// # THIS TRAIT IS AN OPEN EXTENSION POINT (unsafe)

View File

@@ -1,8 +1,7 @@
use std::fmt::Debug;
use crate::{
api::{FillUniform, Reset},
layouts::{ReaderFrom, WriterTo},
layouts::{FillUniform, ReaderFrom, Reset, WriterTo},
source::Source,
};

View File

@@ -1,6 +1,5 @@
use crate::{
api::{ZnxInfos, ZnxViewMut},
layouts::VecZnx,
layouts::{VecZnx, ZnxInfos, ZnxViewMut},
source::Source,
};

View File

@@ -1,6 +1,6 @@
use crate::{
api::{VecZnxAddNormal, VecZnxFillUniform, ZnxView},
layouts::{Backend, Module, VecZnx},
api::{VecZnxAddNormal, VecZnxFillUniform},
layouts::{Backend, Module, VecZnx, ZnxView},
source::Source,
};

View File

@@ -2,9 +2,8 @@ use crate::{
api::{
ModuleNew, ScratchOwnedAlloc, ScratchOwnedBorrow, VecZnxBigAlloc, VecZnxBigNormalize, VecZnxBigNormalizeTmpBytes,
VecZnxDftAlloc, VecZnxDftFromVecZnx, VecZnxDftToVecZnxBigTmpA, VmpApply, VmpApplyTmpBytes, VmpPMatAlloc, VmpPrepare,
ZnxInfos, ZnxViewMut,
},
layouts::{MatZnx, Module, ScratchOwned, VecZnx, VecZnxBig, VecZnxDft, VmpPMat},
layouts::{MatZnx, Module, ScratchOwned, VecZnx, VecZnxBig, VecZnxDft, VmpPMat, ZnxInfos, ZnxViewMut},
oep::{
ModuleNewImpl, ScratchOwnedAllocImpl, ScratchOwnedBorrowImpl, VecZnxBigAllocImpl, VecZnxBigNormalizeImpl,
VecZnxBigNormalizeTmpBytesImpl, VecZnxDftAllocImpl, VecZnxDftFromVecZnxImpl, VecZnxDftToVecZnxBigTmpAImpl, VmpApplyImpl,