arnaucube/poulpy
1
0
Fork 0
mirror of https://github.com/arnaucube/poulpy.git synced 2026-02-10 13:16:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

updated Scalar name

Browse Source
This commit is contained in:
Jean-Philippe Bossuat
2025-05-07 11:57:56 +02:00
parent ccebb80660
commit a6224f7563
2 changed files with 40 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
base2k/src/scalar_znx.rs
View File

@@ -5,13 +5,13 @@ use rand_core::RngCore;
use rand_distr::{Distribution, weighted::WeightedIndex}; use rand_distr::{Distribution, weighted::WeightedIndex};
use sampling::source::Source; use sampling::source::Source;
pub struct Scalar<D> { pub struct ScalarZnx<D> {
data: D, data: D,
n: usize, n: usize,
cols: usize, cols: usize,
} }
impl<D> ZnxInfos for Scalar<D> { impl<D> ZnxInfos for ScalarZnx<D> {
fn cols(&self) -> usize { fn cols(&self) -> usize {
self.cols self.cols
} }
@@ -29,30 +29,30 @@ impl<D> ZnxInfos for Scalar<D> {
} }
} }
impl<D> ZnxSliceSize for Scalar<D> { impl<D> ZnxSliceSize for ScalarZnx<D> {
fn sl(&self) -> usize { fn sl(&self) -> usize {
self.n() self.n()
} }
} }
impl<D> DataView for Scalar<D> { impl<D> DataView for ScalarZnx<D> {
type D = D; type D = D;
fn data(&self) -> &Self::D { fn data(&self) -> &Self::D {
&self.data &self.data
} }
} }
impl<D> DataViewMut for Scalar<D> { impl<D> DataViewMut for ScalarZnx<D> {
fn data_mut(&mut self) -> &mut Self::D { fn data_mut(&mut self) -> &mut Self::D {
&mut self.data &mut self.data
} }
} }
impl<D: AsRef<[u8]>> ZnxView for Scalar<D> { impl<D: AsRef<[u8]>> ZnxView for ScalarZnx<D> {
type Scalar = i64; type Scalar = i64;
} }
impl<D: AsMut<[u8]> + AsRef<[u8]>> Scalar<D> { impl<D: AsMut<[u8]> + AsRef<[u8]>> ScalarZnx<D> {
pub fn fill_ternary_prob(&mut self, col: usize, prob: f64, source: &mut Source) { pub fn fill_ternary_prob(&mut self, col: usize, prob: f64, source: &mut Source) {
let choices: [i64; 3] = [-1, 0, 1]; let choices: [i64; 3] = [-1, 0, 1];
let weights: [f64; 3] = [prob / 2.0, 1.0 - prob, prob / 2.0]; let weights: [f64; 3] = [prob / 2.0, 1.0 - prob, prob / 2.0];
@@ -71,7 +71,7 @@ impl<D: AsMut<[u8]> + AsRef<[u8]>> Scalar<D> {
} }
} }
impl<D: From<Vec<u8>>> Scalar<D> { impl<D: From<Vec<u8>>> ScalarZnx<D> {
pub(crate) fn bytes_of<S: Sized>(n: usize, cols: usize) -> usize { pub(crate) fn bytes_of<S: Sized>(n: usize, cols: usize) -> usize {
n * cols * size_of::<S>() n * cols * size_of::<S>()
} }
@@ -96,37 +96,37 @@ impl<D: From<Vec<u8>>> Scalar<D> {
} }
} }
pub type ScalarOwned = Scalar<Vec<u8>>; pub type ScalarZnxOwned = ScalarZnx<Vec<u8>>;
pub trait ScalarAlloc { pub trait ScalarZnxAlloc {
fn bytes_of_scalar(&self, cols: usize) -> usize; fn bytes_of_scalar(&self, cols: usize) -> usize;
fn new_scalar(&self, cols: usize) -> ScalarOwned; fn new_scalar(&self, cols: usize) -> ScalarZnxOwned;
fn new_scalar_from_bytes(&self, cols: usize, bytes: Vec<u8>) -> ScalarOwned; fn new_scalar_from_bytes(&self, cols: usize, bytes: Vec<u8>) -> ScalarZnxOwned;
} }
impl<B: Backend> ScalarAlloc for Module<B> { impl<B: Backend> ScalarZnxAlloc for Module<B> {
fn bytes_of_scalar(&self, cols: usize) -> usize { fn bytes_of_scalar(&self, cols: usize) -> usize {
ScalarOwned::bytes_of::<i64>(self.n(), cols) ScalarZnxOwned::bytes_of::<i64>(self.n(), cols)
} }
fn new_scalar(&self, cols: usize) -> ScalarOwned { fn new_scalar(&self, cols: usize) -> ScalarZnxOwned {
ScalarOwned::new::<i64>(self.n(), cols) ScalarZnxOwned::new::<i64>(self.n(), cols)
} }
fn new_scalar_from_bytes(&self, cols: usize, bytes: Vec<u8>) -> ScalarOwned { fn new_scalar_from_bytes(&self, cols: usize, bytes: Vec<u8>) -> ScalarZnxOwned {
ScalarOwned::new_from_bytes::<i64>(self.n(), cols, bytes) ScalarZnxOwned::new_from_bytes::<i64>(self.n(), cols, bytes)
} }
} }
pub trait ScalarToRef { pub trait ScalarZnxToRef {
fn to_ref(&self) -> Scalar<&[u8]>; fn to_ref(&self) -> ScalarZnx<&[u8]>;
} }
pub trait ScalarToMut { pub trait ScalarZnxToMut {
fn to_mut(&mut self) -> Scalar<&mut [u8]>; fn to_mut(&mut self) -> ScalarZnx<&mut [u8]>;
} }
impl ScalarToMut for Scalar<Vec<u8>> { impl ScalarZnxToMut for ScalarZnx<Vec<u8>> {
fn to_mut(&mut self) -> Scalar<&mut [u8]> { fn to_mut(&mut self) -> ScalarZnx<&mut [u8]> {
Scalar { ScalarZnx {
data: self.data.as_mut_slice(), data: self.data.as_mut_slice(),
n: self.n, n: self.n,
cols: self.cols, cols: self.cols,
@@ -134,9 +134,9 @@ impl ScalarToMut for Scalar<Vec<u8>> {
} }
} }
impl ScalarToRef for Scalar<Vec<u8>> { impl ScalarZnxToRef for ScalarZnx<Vec<u8>> {
fn to_ref(&self) -> Scalar<&[u8]> { fn to_ref(&self) -> ScalarZnx<&[u8]> {
Scalar { ScalarZnx {
data: self.data.as_slice(), data: self.data.as_slice(),
n: self.n, n: self.n,
cols: self.cols, cols: self.cols,
@@ -144,9 +144,9 @@ impl ScalarToRef for Scalar<Vec<u8>> {
} }
} }
impl ScalarToMut for Scalar<&mut [u8]> { impl ScalarZnxToMut for ScalarZnx<&mut [u8]> {
fn to_mut(&mut self) -> Scalar<&mut [u8]> { fn to_mut(&mut self) -> ScalarZnx<&mut [u8]> {
Scalar { ScalarZnx {
data: self.data, data: self.data,
n: self.n, n: self.n,
cols: self.cols, cols: self.cols,
@@ -154,9 +154,9 @@ impl ScalarToMut for Scalar<&mut [u8]> {
} }
} }
impl ScalarToRef for Scalar<&mut [u8]> { impl ScalarZnxToRef for ScalarZnx<&mut [u8]> {
fn to_ref(&self) -> Scalar<&[u8]> { fn to_ref(&self) -> ScalarZnx<&[u8]> {
Scalar { ScalarZnx {
data: self.data, data: self.data,
n: self.n, n: self.n,
cols: self.cols, cols: self.cols,
@@ -164,9 +164,9 @@ impl ScalarToRef for Scalar<&mut [u8]> {
} }
} }
impl ScalarToRef for Scalar<&[u8]> { impl ScalarZnxToRef for ScalarZnx<&[u8]> {
fn to_ref(&self) -> Scalar<&[u8]> { fn to_ref(&self) -> ScalarZnx<&[u8]> {
Scalar { ScalarZnx {
data: self.data, data: self.data,
n: self.n, n: self.n,
cols: self.cols, cols: self.cols,

6
base2k/src/scalar_znx_dft_ops.rs
View File

@@ -2,7 +2,7 @@ use crate::ffi::svp;
use crate::ffi::vec_znx_dft::vec_znx_dft_t; use crate::ffi::vec_znx_dft::vec_znx_dft_t;
use crate::znx_base::{ZnxInfos, ZnxView, ZnxViewMut}; use crate::znx_base::{ZnxInfos, ZnxView, ZnxViewMut};
use crate::{ use crate::{
Backend, FFT64, Module, ScalarToRef, ScalarZnxDft, ScalarZnxDftOwned, ScalarZnxDftToMut, ScalarZnxDftToRef, Backend, FFT64, Module, ScalarZnxToRef, ScalarZnxDft, ScalarZnxDftOwned, ScalarZnxDftToMut, ScalarZnxDftToRef,
VecZnxDft, VecZnxDftToMut, VecZnxDftToRef, VecZnxDft, VecZnxDftToMut, VecZnxDftToRef,
}; };
@@ -16,7 +16,7 @@ pub trait ScalarZnxDftOps<BACKEND: Backend> {
fn svp_prepare<R, A>(&self, res: &mut R, res_col: usize, a: &A, a_col: usize) fn svp_prepare<R, A>(&self, res: &mut R, res_col: usize, a: &A, a_col: usize)
where where
R: ScalarZnxDftToMut<BACKEND>, R: ScalarZnxDftToMut<BACKEND>,
A: ScalarToRef; A: ScalarZnxToRef;
fn svp_apply<R, A, B>(&self, res: &mut R, res_col: usize, a: &A, a_col: usize, b: &B, b_col: usize) fn svp_apply<R, A, B>(&self, res: &mut R, res_col: usize, a: &A, a_col: usize, b: &B, b_col: usize)
where where
R: VecZnxDftToMut<BACKEND>, R: VecZnxDftToMut<BACKEND>,
@@ -46,7 +46,7 @@ impl ScalarZnxDftOps<FFT64> for Module<FFT64> {
fn svp_prepare<R, A>(&self, res: &mut R, res_col: usize, a: &A, a_col: usize) fn svp_prepare<R, A>(&self, res: &mut R, res_col: usize, a: &A, a_col: usize)
where where
R: ScalarZnxDftToMut<FFT64>, R: ScalarZnxDftToMut<FFT64>,
A: ScalarToRef, A: ScalarZnxToRef,
{ {
unsafe { unsafe {
svp::svp_prepare( svp::svp_prepare(