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

Add cross-base2k GGSW product

Browse Source
This commit is contained in:
Pro7ech
2025-11-18 09:30:54 +01:00
parent f39e3e2865
commit 0d4f7ed424
9 changed files with 255 additions and 339 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
poulpy-core/src/automorphism/glwe_ct.rs
View File

@@ -27,7 +27,7 @@ impl<DataSelf: DataMut> GLWE<DataSelf> {
pub fn automorphism<M, A, K, BE: Backend>(&mut self, module: &M, a: &A, key: &K, scratch: &mut Scratch<BE>) pub fn automorphism<M, A, K, BE: Backend>(&mut self, module: &M, a: &A, key: &K, scratch: &mut Scratch<BE>)
where where
M: GLWEAutomorphism<BE>, M: GLWEAutomorphism<BE>,
A: GLWEToRef, A: GLWEToRef + GLWEInfos,
K: GetGaloisElement + GGLWEPreparedToRef<BE> + GGLWEInfos, K: GetGaloisElement + GGLWEPreparedToRef<BE> + GGLWEInfos,
Scratch<BE>: ScratchTakeCore<BE>, Scratch<BE>: ScratchTakeCore<BE>,
{ {
@@ -37,7 +37,7 @@ impl<DataSelf: DataMut> GLWE<DataSelf> {
pub fn automorphism_add<M, A, K, BE: Backend>(&mut self, module: &M, a: &A, key: &K, scratch: &mut Scratch<BE>) pub fn automorphism_add<M, A, K, BE: Backend>(&mut self, module: &M, a: &A, key: &K, scratch: &mut Scratch<BE>)
where where
M: GLWEAutomorphism<BE>, M: GLWEAutomorphism<BE>,
A: GLWEToRef, A: GLWEToRef + GLWEInfos,
K: GetGaloisElement + GGLWEPreparedToRef<BE> + GGLWEInfos, K: GetGaloisElement + GGLWEPreparedToRef<BE> + GGLWEInfos,
Scratch<BE>: ScratchTakeCore<BE>, Scratch<BE>: ScratchTakeCore<BE>,
{ {
@@ -47,7 +47,7 @@ impl<DataSelf: DataMut> GLWE<DataSelf> {
pub fn automorphism_sub<M, A, K, BE: Backend>(&mut self, module: &M, a: &A, key: &K, scratch: &mut Scratch<BE>) pub fn automorphism_sub<M, A, K, BE: Backend>(&mut self, module: &M, a: &A, key: &K, scratch: &mut Scratch<BE>)
where where
M: GLWEAutomorphism<BE>, M: GLWEAutomorphism<BE>,
A: GLWEToRef, A: GLWEToRef + GLWEInfos,
K: GetGaloisElement + GGLWEPreparedToRef<BE> + GGLWEInfos, K: GetGaloisElement + GGLWEPreparedToRef<BE> + GGLWEInfos,
Scratch<BE>: ScratchTakeCore<BE>, Scratch<BE>: ScratchTakeCore<BE>,
{ {
@@ -57,7 +57,7 @@ impl<DataSelf: DataMut> GLWE<DataSelf> {
pub fn automorphism_sub_negate<M, A, K, BE: Backend>(&mut self, module: &M, a: &A, key: &K, scratch: &mut Scratch<BE>) pub fn automorphism_sub_negate<M, A, K, BE: Backend>(&mut self, module: &M, a: &A, key: &K, scratch: &mut Scratch<BE>)
where where
M: GLWEAutomorphism<BE>, M: GLWEAutomorphism<BE>,
A: GLWEToRef, A: GLWEToRef + GLWEInfos,
K: GetGaloisElement + GGLWEPreparedToRef<BE> + GGLWEInfos, K: GetGaloisElement + GGLWEPreparedToRef<BE> + GGLWEInfos,
Scratch<BE>: ScratchTakeCore<BE>, Scratch<BE>: ScratchTakeCore<BE>,
{ {
@@ -110,46 +110,46 @@ pub trait GLWEAutomorphism<BE: Backend> {
fn glwe_automorphism<R, A, K>(&self, res: &mut R, a: &A, key: &K, scratch: &mut Scratch<BE>) fn glwe_automorphism<R, A, K>(&self, res: &mut R, a: &A, key: &K, scratch: &mut Scratch<BE>)
where where
R: GLWEToMut, R: GLWEToMut + GLWEInfos,
A: GLWEToRef, A: GLWEToRef + GLWEInfos,
K: GetGaloisElement + GGLWEPreparedToRef<BE> + GGLWEInfos; K: GetGaloisElement + GGLWEPreparedToRef<BE> + GGLWEInfos;
fn glwe_automorphism_inplace<R, K>(&self, res: &mut R, key: &K, scratch: &mut Scratch<BE>) fn glwe_automorphism_inplace<R, K>(&self, res: &mut R, key: &K, scratch: &mut Scratch<BE>)
where where
R: GLWEToMut, R: GLWEToMut + GLWEInfos,
K: GetGaloisElement + GGLWEPreparedToRef<BE> + GGLWEInfos; K: GetGaloisElement + GGLWEPreparedToRef<BE> + GGLWEInfos;
fn glwe_automorphism_add<R, A, K>(&self, res: &mut R, a: &A, key: &K, scratch: &mut Scratch<BE>) fn glwe_automorphism_add<R, A, K>(&self, res: &mut R, a: &A, key: &K, scratch: &mut Scratch<BE>)
where where
R: GLWEToMut, R: GLWEToMut + GLWEInfos,
A: GLWEToRef, A: GLWEToRef + GLWEInfos,
K: GetGaloisElement + GGLWEPreparedToRef<BE> + GGLWEInfos; K: GetGaloisElement + GGLWEPreparedToRef<BE> + GGLWEInfos;
fn glwe_automorphism_add_inplace<R, K>(&self, res: &mut R, key: &K, scratch: &mut Scratch<BE>) fn glwe_automorphism_add_inplace<R, K>(&self, res: &mut R, key: &K, scratch: &mut Scratch<BE>)
where where
R: GLWEToMut, R: GLWEToMut + GLWEInfos,
K: GetGaloisElement + GGLWEPreparedToRef<BE> + GGLWEInfos; K: GetGaloisElement + GGLWEPreparedToRef<BE> + GGLWEInfos;
fn glwe_automorphism_sub<R, A, K>(&self, res: &mut R, a: &A, key: &K, scratch: &mut Scratch<BE>) fn glwe_automorphism_sub<R, A, K>(&self, res: &mut R, a: &A, key: &K, scratch: &mut Scratch<BE>)
where where
R: GLWEToMut, R: GLWEToMut + GLWEInfos,
A: GLWEToRef, A: GLWEToRef + GLWEInfos,
K: GetGaloisElement + GGLWEPreparedToRef<BE> + GGLWEInfos; K: GetGaloisElement + GGLWEPreparedToRef<BE> + GGLWEInfos;
fn glwe_automorphism_sub_negate<R, A, K>(&self, res: &mut R, a: &A, key: &K, scratch: &mut Scratch<BE>) fn glwe_automorphism_sub_negate<R, A, K>(&self, res: &mut R, a: &A, key: &K, scratch: &mut Scratch<BE>)
where where
R: GLWEToMut, R: GLWEToMut + GLWEInfos,
A: GLWEToRef, A: GLWEToRef + GLWEInfos,
K: GetGaloisElement + GGLWEPreparedToRef<BE> + GGLWEInfos; K: GetGaloisElement + GGLWEPreparedToRef<BE> + GGLWEInfos;
fn glwe_automorphism_sub_inplace<R, K>(&self, res: &mut R, key: &K, scratch: &mut Scratch<BE>) fn glwe_automorphism_sub_inplace<R, K>(&self, res: &mut R, key: &K, scratch: &mut Scratch<BE>)
where where
R: GLWEToMut, R: GLWEToMut + GLWEInfos,
K: GetGaloisElement + GGLWEPreparedToRef<BE> + GGLWEInfos; K: GetGaloisElement + GGLWEPreparedToRef<BE> + GGLWEInfos;
fn glwe_automorphism_sub_negate_inplace<R, K>(&self, res: &mut R, key: &K, scratch: &mut Scratch<BE>) fn glwe_automorphism_sub_negate_inplace<R, K>(&self, res: &mut R, key: &K, scratch: &mut Scratch<BE>)
where where
R: GLWEToMut, R: GLWEToMut + GLWEInfos,
K: GetGaloisElement + GGLWEPreparedToRef<BE> + GGLWEInfos; K: GetGaloisElement + GGLWEPreparedToRef<BE> + GGLWEInfos;
} }
@@ -179,8 +179,8 @@ where
fn glwe_automorphism<R, A, K>(&self, res: &mut R, a: &A, key: &K, scratch: &mut Scratch<BE>) fn glwe_automorphism<R, A, K>(&self, res: &mut R, a: &A, key: &K, scratch: &mut Scratch<BE>)
where where
R: GLWEToMut, R: GLWEToMut + GLWEInfos,
A: GLWEToRef, A: GLWEToRef + GLWEInfos,
K: GetGaloisElement + GGLWEPreparedToRef<BE> + GGLWEInfos, K: GetGaloisElement + GGLWEPreparedToRef<BE> + GGLWEInfos,
Scratch<BE>: ScratchTakeCore<BE>, Scratch<BE>: ScratchTakeCore<BE>,
{ {
@@ -195,7 +195,7 @@ where
fn glwe_automorphism_inplace<R, K>(&self, res: &mut R, key: &K, scratch: &mut Scratch<BE>) fn glwe_automorphism_inplace<R, K>(&self, res: &mut R, key: &K, scratch: &mut Scratch<BE>)
where where
R: GLWEToMut, R: GLWEToMut + GLWEInfos,
K: GetGaloisElement + GGLWEPreparedToRef<BE> + GGLWEInfos, K: GetGaloisElement + GGLWEPreparedToRef<BE> + GGLWEInfos,
Scratch<BE>: ScratchTakeCore<BE>, Scratch<BE>: ScratchTakeCore<BE>,
{ {
@@ -210,8 +210,8 @@ where
fn glwe_automorphism_add<R, A, K>(&self, res: &mut R, a: &A, key: &K, scratch: &mut Scratch<BE>) fn glwe_automorphism_add<R, A, K>(&self, res: &mut R, a: &A, key: &K, scratch: &mut Scratch<BE>)
where where
R: GLWEToMut, R: GLWEToMut + GLWEInfos,
A: GLWEToRef, A: GLWEToRef + GLWEInfos,
K: GetGaloisElement + GGLWEPreparedToRef<BE> + GGLWEInfos, K: GetGaloisElement + GGLWEPreparedToRef<BE> + GGLWEInfos,
Scratch<BE>: ScratchTakeCore<BE>, Scratch<BE>: ScratchTakeCore<BE>,
{ {

279
poulpy-core/src/external_product/glwe.rs
View File

@@ -1,10 +1,10 @@
use poulpy_hal::{ use poulpy_hal::{
api::{ api::{
ModuleN, ScratchTakeBasic, VecZnxBigAddSmallInplace, VecZnxBigNormalize, VecZnxBigNormalizeTmpBytes, VecZnxDftApply, ModuleN, ScratchAvailable, ScratchTakeBasic, VecZnxBigAddSmallInplace, VecZnxBigNormalize, VecZnxBigNormalizeTmpBytes,
VecZnxDftBytesOf, VecZnxIdftApplyConsume, VecZnxNormalize, VecZnxNormalizeTmpBytes, VmpApplyDftToDft, VecZnxDftApply, VecZnxDftBytesOf, VecZnxIdftApplyConsume, VecZnxNormalize, VecZnxNormalizeTmpBytes, VmpApplyDftToDft,
VmpApplyDftToDftAdd, VmpApplyDftToDftTmpBytes, VmpApplyDftToDftAdd, VmpApplyDftToDftTmpBytes,
}, },
layouts::{Backend, DataMut, DataViewMut, Module, Scratch, VecZnx, VecZnxBig, VecZnxDft}, layouts::{Backend, DataMut, DataViewMut, Module, Scratch, VecZnxBig, VecZnxDft},
}; };
use crate::{ use crate::{
@@ -30,7 +30,7 @@ impl GLWE<Vec<u8>> {
impl<DataSelf: DataMut> GLWE<DataSelf> { impl<DataSelf: DataMut> GLWE<DataSelf> {
pub fn external_product<A, B, M, BE: Backend>(&mut self, module: &M, a: &A, b: &B, scratch: &mut Scratch<BE>) pub fn external_product<A, B, M, BE: Backend>(&mut self, module: &M, a: &A, b: &B, scratch: &mut Scratch<BE>)
where where
A: GLWEToRef, A: GLWEToRef + GLWEInfos,
B: GGSWPreparedToRef<BE> + GGSWInfos, B: GGSWPreparedToRef<BE> + GGSWInfos,
M: GLWEExternalProduct<BE>, M: GLWEExternalProduct<BE>,
Scratch<BE>: ScratchTakeCore<BE>, Scratch<BE>: ScratchTakeCore<BE>,
@@ -57,20 +57,14 @@ pub trait GLWEExternalProduct<BE: Backend> {
fn glwe_external_product_inplace<R, D>(&self, res: &mut R, a: &D, scratch: &mut Scratch<BE>) fn glwe_external_product_inplace<R, D>(&self, res: &mut R, a: &D, scratch: &mut Scratch<BE>)
where where
R: GLWEToMut, R: GLWEToMut + GLWEInfos,
D: GGSWPreparedToRef<BE> + GGSWInfos, D: GGSWPreparedToRef<BE> + GGSWInfos,
Scratch<BE>: ScratchTakeCore<BE>; Scratch<BE>: ScratchTakeCore<BE>;
fn glwe_external_product<R, A, D>(&self, res: &mut R, lhs: &A, rhs: &D, scratch: &mut Scratch<BE>) fn glwe_external_product<R, A, D>(&self, res: &mut R, lhs: &A, rhs: &D, scratch: &mut Scratch<BE>)
where where
R: GLWEToMut, R: GLWEToMut + GLWEInfos,
A: GLWEToRef, A: GLWEToRef + GLWEInfos,
D: GGSWPreparedToRef<BE> + GGSWInfos,
Scratch<BE>: ScratchTakeCore<BE>;
fn glwe_external_product_add<R, A, D>(&self, res: &mut R, lhs: &A, rhs: &D, scratch: &mut Scratch<BE>)
where
R: GLWEToMut,
A: GLWEToRef,
D: GGSWPreparedToRef<BE> + GGSWInfos, D: GGSWPreparedToRef<BE> + GGSWInfos,
Scratch<BE>: ScratchTakeCore<BE>; Scratch<BE>: ScratchTakeCore<BE>;
} }
@@ -84,169 +78,114 @@ where
+ VecZnxBigAddSmallInplace<BE> + VecZnxBigAddSmallInplace<BE>
+ GLWENormalize<BE>, + GLWENormalize<BE>,
{ {
fn glwe_external_product_tmp_bytes<R, A, B>(&self, res_infos: &R, a_infos: &A, b_infos: &B) -> usize fn glwe_external_product_tmp_bytes<R, A, B>(&self, res: &R, a: &A, ggsw: &B) -> usize
where where
R: GLWEInfos, R: GLWEInfos,
A: GLWEInfos, A: GLWEInfos,
B: GGSWInfos, B: GGSWInfos,
{ {
let res_dft: usize = self.bytes_of_vec_znx_dft((b_infos.rank() + 1).into(), b_infos.size()); let cols: usize = res.rank().as_usize() + 1;
res_dft let size: usize = if a.base2k() != ggsw.base2k() {
+ self let a_conv_infos = &GLWELayout {
.glwe_external_product_internal_tmp_bytes(res_infos, a_infos, b_infos) n: a.n(),
.max(self.vec_znx_big_normalize_tmp_bytes()) base2k: ggsw.base2k(),
k: a.k(),
rank: a.rank(),
};
self.glwe_external_product_internal_tmp_bytes(res, a_conv_infos, ggsw) + GLWE::bytes_of_from_infos(a_conv_infos)
} else {
self.glwe_external_product_internal_tmp_bytes(res, a, ggsw)
};
size.max(self.vec_znx_big_normalize_tmp_bytes()) + self.bytes_of_vec_znx_dft(cols, ggsw.size())
} }
fn glwe_external_product_inplace<R, D>(&self, res: &mut R, a: &D, scratch: &mut Scratch<BE>) fn glwe_external_product_inplace<R, D>(&self, res: &mut R, ggsw: &D, scratch: &mut Scratch<BE>)
where where
R: GLWEToMut, R: GLWEToMut + GLWEInfos,
D: GGSWPreparedToRef<BE> + GGSWInfos, D: GGSWPreparedToRef<BE> + GGSWInfos,
Scratch<BE>: ScratchTakeCore<BE>, Scratch<BE>: ScratchTakeCore<BE>,
{ {
let res: &mut GLWE<&mut [u8]> = &mut res.to_mut(); assert_eq!(ggsw.rank(), res.rank());
let rhs: &GGSWPrepared<&[u8], BE> = &a.to_ref(); assert_eq!(ggsw.n(), res.n());
assert!(scratch.available() >= self.glwe_external_product_tmp_bytes(res, res, ggsw));
let basek_in: usize = res.base2k().into(); let base2k_res: usize = res.base2k().as_usize();
let basek_ggsw: usize = rhs.base2k().into(); let base2k_ggsw: usize = ggsw.base2k().as_usize();
#[cfg(debug_assertions)] let (res_dft, scratch_1) = scratch.take_vec_znx_dft(self, (res.rank() + 1).into(), ggsw.size()); // Todo optimise
{
use poulpy_hal::api::ScratchAvailable;
assert_eq!(rhs.rank(), res.rank()); let res_big: VecZnxBig<&mut [u8], BE> = if base2k_res != base2k_ggsw {
assert_eq!(rhs.n(), res.n());
assert!(scratch.available() >= self.glwe_external_product_tmp_bytes(res, res, rhs));
}
let (res_dft, scratch_1) = scratch.take_vec_znx_dft(self, (res.rank() + 1).into(), a.size()); // Todo optimise
let res_big = self.glwe_external_product_internal(res_dft, res, a, scratch_1);
for j in 0..(res.rank() + 1).into() {
self.vec_znx_big_normalize(
basek_in,
&mut res.data,
j,
basek_ggsw,
&res_big,
j,
scratch_1,
);
}
}
fn glwe_external_product<R, A, D>(&self, res: &mut R, lhs: &A, rhs: &D, scratch: &mut Scratch<BE>)
where
R: GLWEToMut,
A: GLWEToRef,
D: GGSWPreparedToRef<BE>,
Scratch<BE>: ScratchTakeCore<BE>,
{
let res: &mut GLWE<&mut [u8]> = &mut res.to_mut();
let lhs: &GLWE<&[u8]> = &lhs.to_ref();
let rhs: &GGSWPrepared<&[u8], BE> = &rhs.to_ref();
let basek_ggsw: usize = rhs.base2k().into();
let basek_out: usize = res.base2k().into();
#[cfg(debug_assertions)]
{
use poulpy_hal::api::ScratchAvailable;
assert_eq!(rhs.rank(), lhs.rank());
assert_eq!(rhs.rank(), res.rank());
assert_eq!(rhs.n(), res.n());
assert_eq!(lhs.n(), res.n());
assert!(scratch.available() >= self.glwe_external_product_tmp_bytes(res, lhs, rhs));
}
let (res_dft, scratch_1) = scratch.take_vec_znx_dft(self, (res.rank() + 1).into(), rhs.size()); // Todo optimise
let res_big = self.glwe_external_product_internal(res_dft, lhs, rhs, scratch_1);
for j in 0..(res.rank() + 1).into() {
self.vec_znx_big_normalize(
basek_out,
&mut res.data,
j,
basek_ggsw,
&res_big,
j,
scratch_1,
);
}
}
fn glwe_external_product_add<R, A, D>(&self, res: &mut R, a: &A, key: &D, scratch: &mut Scratch<BE>)
where
R: GLWEToMut,
A: GLWEToRef,
D: GGSWPreparedToRef<BE>,
Scratch<BE>: ScratchTakeCore<BE>,
{
let res: &mut GLWE<&mut [u8]> = &mut res.to_mut();
let a: &GLWE<&[u8]> = &a.to_ref();
let key: &GGSWPrepared<&[u8], BE> = &key.to_ref();
assert_eq!(a.base2k(), res.base2k());
let res_base2k: usize = res.base2k().into();
let key_base2k: usize = key.base2k().into();
#[cfg(debug_assertions)]
{
use poulpy_hal::api::ScratchAvailable;
assert_eq!(key.rank(), a.rank());
assert_eq!(key.rank(), res.rank());
assert_eq!(key.n(), res.n());
assert_eq!(a.n(), res.n());
assert!(scratch.available() >= self.glwe_external_product_tmp_bytes(res, a, key));
}
if res_base2k == key_base2k {
let (res_dft, scratch_1) = scratch.take_vec_znx_dft(self, (res.rank() + 1).into(), key.size()); // Todo optimise
let mut res_big = self.glwe_external_product_internal(res_dft, a, key, scratch_1);
for j in 0..(res.rank() + 1).into() {
self.vec_znx_big_add_small_inplace(&mut res_big, j, res.data(), j);
self.vec_znx_big_normalize(
res_base2k,
&mut res.data,
j,
key_base2k,
&res_big,
j,
scratch_1,
);
}
} else {
let (mut a_conv, scratch_1) = scratch.take_glwe(&GLWELayout {
n: a.n(),
base2k: key.base2k(),
k: a.k(),
rank: a.rank(),
});
let (mut res_conv, scratch_2) = scratch_1.take_glwe(&GLWELayout { let (mut res_conv, scratch_2) = scratch_1.take_glwe(&GLWELayout {
n: res.n(), n: res.n(),
base2k: key.base2k(), base2k: ggsw.base2k(),
k: res.k(), k: res.k(),
rank: res.rank(), rank: res.rank(),
}); });
self.glwe_normalize(&mut a_conv, a, scratch_2);
self.glwe_normalize(&mut res_conv, res, scratch_2); self.glwe_normalize(&mut res_conv, res, scratch_2);
let (res_dft, scratch_2) = scratch_2.take_vec_znx_dft(self, (res.rank() + 1).into(), key.size()); // Todo optimise self.glwe_external_product_internal(res_dft, &res_conv, ggsw, scratch_2)
let mut res_big = self.glwe_external_product_internal(res_dft, &a_conv, key, scratch_2); } else {
self.glwe_external_product_internal(res_dft, res, ggsw, scratch_1)
};
let res: &mut GLWE<&mut [u8]> = &mut res.to_mut();
for j in 0..(res.rank() + 1).into() { for j in 0..(res.rank() + 1).into() {
self.vec_znx_big_add_small_inplace(&mut res_big, j, res_conv.data(), j);
self.vec_znx_big_normalize( self.vec_znx_big_normalize(
res_base2k, base2k_res,
&mut res.data, res.data_mut(),
j, j,
key_base2k, base2k_ggsw,
&res_big, &res_big,
j, j,
scratch_2, scratch_1,
); );
} }
} }
fn glwe_external_product<R, A, G>(&self, res: &mut R, a: &A, ggsw: &G, scratch: &mut Scratch<BE>)
where
R: GLWEToMut + GLWEInfos,
A: GLWEToRef + GLWEInfos,
G: GGSWPreparedToRef<BE> + GGSWInfos,
Scratch<BE>: ScratchTakeCore<BE>,
{
assert_eq!(ggsw.rank(), a.rank());
assert_eq!(ggsw.rank(), res.rank());
assert_eq!(ggsw.n(), res.n());
assert_eq!(a.n(), res.n());
assert!(scratch.available() >= self.glwe_external_product_tmp_bytes(res, a, ggsw));
let base2k_a: usize = a.base2k().into();
let base2k_ggsw: usize = ggsw.base2k().into();
let base2k_res: usize = res.base2k().into();
let (res_dft, scratch_1) = scratch.take_vec_znx_dft(self, (res.rank() + 1).into(), ggsw.size()); // Todo optimise
let res_big: VecZnxBig<&mut [u8], BE> = if base2k_a != base2k_ggsw {
let (mut a_conv, scratch_2) = scratch_1.take_glwe(&GLWELayout {
n: a.n(),
base2k: ggsw.base2k(),
k: a.k(),
rank: a.rank(),
});
self.glwe_normalize(&mut a_conv, a, scratch_2);
self.glwe_external_product_internal(res_dft, &a_conv, ggsw, scratch_2)
} else {
self.glwe_external_product_internal(res_dft, a, ggsw, scratch_1)
};
let res: &mut GLWE<&mut [u8]> = &mut res.to_mut();
for j in 0..(res.rank() + 1).into() {
self.vec_znx_big_normalize(
base2k_res,
res.data_mut(),
j,
base2k_ggsw,
&res_big,
j,
scratch_1,
);
}
} }
} }
@@ -309,12 +248,7 @@ where
); );
let normalize_big: usize = self.vec_znx_normalize_tmp_bytes(); let normalize_big: usize = self.vec_znx_normalize_tmp_bytes();
if a_infos.base2k() == b_infos.base2k() { a_dft + vmp.max(normalize_big)
a_dft + (vmp | normalize_big)
} else {
let normalize_conv: usize = VecZnx::bytes_of(self.n(), (b_infos.rank() + 1).into(), in_size);
(a_dft + normalize_conv + (self.vec_znx_normalize_tmp_bytes() | vmp)) | normalize_big
}
} }
fn glwe_external_product_internal<DR, A, G>( fn glwe_external_product_internal<DR, A, G>(
@@ -333,17 +267,15 @@ where
let a: &GLWE<&[u8]> = &a.to_ref(); let a: &GLWE<&[u8]> = &a.to_ref();
let ggsw: &GGSWPrepared<&[u8], BE> = &ggsw.to_ref(); let ggsw: &GGSWPrepared<&[u8], BE> = &ggsw.to_ref();
let basek_in: usize = a.base2k().into(); assert_eq!(a.base2k(), ggsw.base2k());
let basek_ggsw: usize = ggsw.base2k().into();
let cols: usize = (ggsw.rank() + 1).into(); let cols: usize = (ggsw.rank() + 1).into();
let dsize: usize = ggsw.dsize().into(); let dsize: usize = ggsw.dsize().into();
let a_size: usize = (a.size() * basek_in).div_ceil(basek_ggsw); let a_size: usize = a.size();
let (mut a_dft, scratch_1) = scratch.take_vec_znx_dft(self, cols, a_size.div_ceil(dsize)); let (mut a_dft, scratch_1) = scratch.take_vec_znx_dft(self, cols, a_size.div_ceil(dsize));
a_dft.data_mut().fill(0); a_dft.data_mut().fill(0);
if basek_in == basek_ggsw {
for di in 0..dsize { for di in 0..dsize {
// (lhs.size() + di) / dsize = (a - (digit - di - 1)).div_ceil(dsize) // (lhs.size() + di) / dsize = (a - (digit - di - 1)).div_ceil(dsize)
a_dft.set_size((a.size() + di) / dsize); a_dft.set_size((a.size() + di) / dsize);
@@ -367,37 +299,6 @@ where
self.vmp_apply_dft_to_dft_add(&mut res_dft, &a_dft, &ggsw.data, di, scratch_1); self.vmp_apply_dft_to_dft_add(&mut res_dft, &a_dft, &ggsw.data, di, scratch_1);
} }
} }
} else {
let (mut a_conv, scratch_3) = scratch_1.take_vec_znx(self.n(), cols, a_size);
for j in 0..cols {
self.vec_znx_normalize(basek_ggsw, &mut a_conv, j, basek_in, &a.data, j, scratch_3);
}
for di in 0..dsize {
// (lhs.size() + di) / dsize = (a - (digit - di - 1)).div_ceil(dsize)
a_dft.set_size((a.size() + di) / dsize);
// Small optimization for dsize > 2
// VMP produce some error e, and since we aggregate vmp * 2^{di * B}, then
// we also aggregate ei * 2^{di * B}, with the largest error being ei * 2^{(dsize-1) * B}.
// As such we can ignore the last dsize-2 limbs safely of the sum of vmp products.
// It is possible to further ignore the last dsize-1 limbs, but this introduce
// ~0.5 to 1 bit of additional noise, and thus not chosen here to ensure that the same
// noise is kept with respect to the ideal functionality.
res_dft.set_size(ggsw.size() - ((dsize - di) as isize - 2).max(0) as usize);
for j in 0..cols {
self.vec_znx_dft_apply(dsize, dsize - 1 - di, &mut a_dft, j, &a.data, j);
}
if di == 0 {
self.vmp_apply_dft_to_dft(&mut res_dft, &a_dft, &ggsw.data, scratch_1);
} else {
self.vmp_apply_dft_to_dft_add(&mut res_dft, &a_dft, &ggsw.data, di, scratch_1);
}
}
}
self.vec_znx_idft_apply_consume(res_dft) self.vec_znx_idft_apply_consume(res_dft)
} }

12
poulpy-core/src/keyswitching/ggsw.rs
View File

@@ -29,7 +29,7 @@ impl<D: DataMut> GGSW<D> {
pub fn keyswitch<M, A, K, T, BE: Backend>(&mut self, module: &M, a: &A, key: &K, tsk: &T, scratch: &mut Scratch<BE>) pub fn keyswitch<M, A, K, T, BE: Backend>(&mut self, module: &M, a: &A, key: &K, tsk: &T, scratch: &mut Scratch<BE>)
where where
A: GGSWToRef, A: GGSWToRef,
K: GGLWEPreparedToRef<BE>, K: GGLWEPreparedToRef<BE> + GGLWEInfos,
T: GGLWEToGGSWKeyPreparedToRef<BE>, T: GGLWEToGGSWKeyPreparedToRef<BE>,
Scratch<BE>: ScratchTakeCore<BE>, Scratch<BE>: ScratchTakeCore<BE>,
M: GGSWKeyswitch<BE>, M: GGSWKeyswitch<BE>,
@@ -39,7 +39,7 @@ impl<D: DataMut> GGSW<D> {
pub fn keyswitch_inplace<M, K, T, BE: Backend>(&mut self, module: &M, key: &K, tsk: &T, scratch: &mut Scratch<BE>) pub fn keyswitch_inplace<M, K, T, BE: Backend>(&mut self, module: &M, key: &K, tsk: &T, scratch: &mut Scratch<BE>)
where where
K: GGLWEPreparedToRef<BE>, K: GGLWEPreparedToRef<BE> + GGLWEInfos,
T: GGLWEToGGSWKeyPreparedToRef<BE>, T: GGLWEToGGSWKeyPreparedToRef<BE>,
Scratch<BE>: ScratchTakeCore<BE>, Scratch<BE>: ScratchTakeCore<BE>,
M: GGSWKeyswitch<BE>, M: GGSWKeyswitch<BE>,
@@ -70,7 +70,7 @@ where
fn ggsw_keyswitch_inplace<R, K, T>(&self, res: &mut R, key: &K, tsk: &T, scratch: &mut Scratch<BE>) fn ggsw_keyswitch_inplace<R, K, T>(&self, res: &mut R, key: &K, tsk: &T, scratch: &mut Scratch<BE>)
where where
R: GGSWToMut, R: GGSWToMut,
K: GGLWEPreparedToRef<BE>, K: GGLWEPreparedToRef<BE> + GGLWEInfos,
T: GGLWEToGGSWKeyPreparedToRef<BE>, T: GGLWEToGGSWKeyPreparedToRef<BE>,
Scratch<BE>: ScratchTakeCore<BE>, Scratch<BE>: ScratchTakeCore<BE>,
{ {
@@ -89,7 +89,7 @@ where
where where
R: GGSWToMut, R: GGSWToMut,
A: GGSWToRef, A: GGSWToRef,
K: GGLWEPreparedToRef<BE>, K: GGLWEPreparedToRef<BE> + GGLWEInfos,
T: GGLWEToGGSWKeyPreparedToRef<BE>, T: GGLWEToGGSWKeyPreparedToRef<BE>,
Scratch<BE>: ScratchTakeCore<BE>, Scratch<BE>: ScratchTakeCore<BE>,
{ {
@@ -125,14 +125,14 @@ where
where where
R: GGSWToMut, R: GGSWToMut,
A: GGSWToRef, A: GGSWToRef,
K: GGLWEPreparedToRef<BE>, K: GGLWEPreparedToRef<BE> + GGLWEInfos,
T: GGLWEToGGSWKeyPreparedToRef<BE>, T: GGLWEToGGSWKeyPreparedToRef<BE>,
Scratch<BE>: ScratchTakeCore<BE>; Scratch<BE>: ScratchTakeCore<BE>;
fn ggsw_keyswitch_inplace<R, K, T>(&self, res: &mut R, key: &K, tsk: &T, scratch: &mut Scratch<BE>) fn ggsw_keyswitch_inplace<R, K, T>(&self, res: &mut R, key: &K, tsk: &T, scratch: &mut Scratch<BE>)
where where
R: GGSWToMut, R: GGSWToMut,
K: GGLWEPreparedToRef<BE>, K: GGLWEPreparedToRef<BE> + GGLWEInfos,
T: GGLWEToGGSWKeyPreparedToRef<BE>, T: GGLWEToGGSWKeyPreparedToRef<BE>,
Scratch<BE>: ScratchTakeCore<BE>; Scratch<BE>: ScratchTakeCore<BE>;
} }

37
poulpy-core/src/keyswitching/glwe.rs
View File

@@ -27,8 +27,8 @@ impl GLWE<Vec<u8>> {
impl<D: DataMut> GLWE<D> { impl<D: DataMut> GLWE<D> {
pub fn keyswitch<A, B, M, BE: Backend>(&mut self, module: &M, a: &A, b: &B, scratch: &mut Scratch<BE>) pub fn keyswitch<A, B, M, BE: Backend>(&mut self, module: &M, a: &A, b: &B, scratch: &mut Scratch<BE>)
where where
A: GLWEToRef, A: GLWEToRef + GLWEInfos,
B: GGLWEPreparedToRef<BE>, B: GGLWEPreparedToRef<BE> + GGLWEInfos,
M: GLWEKeyswitch<BE>, M: GLWEKeyswitch<BE>,
Scratch<BE>: ScratchTakeCore<BE>, Scratch<BE>: ScratchTakeCore<BE>,
{ {
@@ -37,7 +37,7 @@ impl<D: DataMut> GLWE<D> {
pub fn keyswitch_inplace<A, M, BE: Backend>(&mut self, module: &M, a: &A, scratch: &mut Scratch<BE>) pub fn keyswitch_inplace<A, M, BE: Backend>(&mut self, module: &M, a: &A, scratch: &mut Scratch<BE>)
where where
A: GGLWEPreparedToRef<BE>, A: GGLWEPreparedToRef<BE> + GGLWEInfos,
M: GLWEKeyswitch<BE>, M: GLWEKeyswitch<BE>,
Scratch<BE>: ScratchTakeCore<BE>, Scratch<BE>: ScratchTakeCore<BE>,
{ {
@@ -74,14 +74,10 @@ where
fn glwe_keyswitch<R, A, K>(&self, res: &mut R, a: &A, key: &K, scratch: &mut Scratch<BE>) fn glwe_keyswitch<R, A, K>(&self, res: &mut R, a: &A, key: &K, scratch: &mut Scratch<BE>)
where where
R: GLWEToMut, R: GLWEToMut + GLWEInfos,
A: GLWEToRef, A: GLWEToRef + GLWEInfos,
K: GGLWEPreparedToRef<BE>, K: GGLWEPreparedToRef<BE> + GGLWEInfos,
{ {
let res: &mut GLWE<&mut [u8]> = &mut res.to_mut();
let a: &GLWE<&[u8]> = &a.to_ref();
let key: &GGLWEPrepared<&[u8], BE> = &key.to_ref();
assert_eq!( assert_eq!(
a.rank(), a.rank(),
key.rank_in(), key.rank_in(),
@@ -128,10 +124,11 @@ where
self.glwe_keyswitch_internal(res_dft, a, key, scratch_1) self.glwe_keyswitch_internal(res_dft, a, key, scratch_1)
}; };
let res: &mut GLWE<&mut [u8]> = &mut res.to_mut();
for i in 0..(res.rank() + 1).into() { for i in 0..(res.rank() + 1).into() {
self.vec_znx_big_normalize( self.vec_znx_big_normalize(
base2k_res, base2k_res,
&mut res.data, res.data_mut(),
i, i,
base2k_key, base2k_key,
&res_big, &res_big,
@@ -143,12 +140,9 @@ where
fn glwe_keyswitch_inplace<R, K>(&self, res: &mut R, key: &K, scratch: &mut Scratch<BE>) fn glwe_keyswitch_inplace<R, K>(&self, res: &mut R, key: &K, scratch: &mut Scratch<BE>)
where where
R: GLWEToMut, R: GLWEToMut + GLWEInfos,
K: GGLWEPreparedToRef<BE>, K: GGLWEPreparedToRef<BE> + GGLWEInfos,
{ {
let res: &mut GLWE<&mut [u8]> = &mut res.to_mut();
let key: &GGLWEPrepared<&[u8], BE> = &key.to_ref();
assert_eq!( assert_eq!(
res.rank(), res.rank(),
key.rank_in(), key.rank_in(),
@@ -194,6 +188,7 @@ where
self.glwe_keyswitch_internal(res_dft, res, key, scratch_1) self.glwe_keyswitch_internal(res_dft, res, key, scratch_1)
}; };
let res: &mut GLWE<&mut [u8]> = &mut res.to_mut();
for i in 0..(res.rank() + 1).into() { for i in 0..(res.rank() + 1).into() {
self.vec_znx_big_normalize( self.vec_znx_big_normalize(
base2k_res, base2k_res,
@@ -217,14 +212,14 @@ pub trait GLWEKeyswitch<BE: Backend> {
fn glwe_keyswitch<R, A, K>(&self, res: &mut R, a: &A, key: &K, scratch: &mut Scratch<BE>) fn glwe_keyswitch<R, A, K>(&self, res: &mut R, a: &A, key: &K, scratch: &mut Scratch<BE>)
where where
R: GLWEToMut, R: GLWEToMut + GLWEInfos,
A: GLWEToRef, A: GLWEToRef + GLWEInfos,
K: GGLWEPreparedToRef<BE>; K: GGLWEPreparedToRef<BE> + GGLWEInfos;
fn glwe_keyswitch_inplace<R, K>(&self, res: &mut R, key: &K, scratch: &mut Scratch<BE>) fn glwe_keyswitch_inplace<R, K>(&self, res: &mut R, key: &K, scratch: &mut Scratch<BE>)
where where
R: GLWEToMut, R: GLWEToMut + GLWEInfos,
K: GGLWEPreparedToRef<BE>; K: GGLWEPreparedToRef<BE> + GGLWEInfos;
} }
impl<BE: Backend> GLWEKeySwitchInternal<BE> for Module<BE> where impl<BE: Backend> GLWEKeySwitchInternal<BE> for Module<BE> where

2
poulpy-core/src/tests/test_suite/automorphism/glwe_ct.rs
View File

@@ -160,7 +160,7 @@ where
let k_out: usize = 102; let k_out: usize = 102;
let max_dsize: usize = k_out.div_ceil(base2k_key); let max_dsize: usize = k_out.div_ceil(base2k_key);
let p = -5; let p: i64 = -5;
for rank in 1_usize..3 { for rank in 1_usize..3 {
for dsize in 1..max_dsize + 1 { for dsize in 1..max_dsize + 1 {
let k_ksk: usize = k_out + base2k_key * dsize; let k_ksk: usize = k_out + base2k_key * dsize;

55
poulpy-core/src/tests/test_suite/external_product/gglwe_ksk.rs
View File

@@ -27,24 +27,28 @@ where
ScratchOwned<BE>: ScratchOwnedAlloc<BE> + ScratchOwnedBorrow<BE>, ScratchOwned<BE>: ScratchOwnedAlloc<BE> + ScratchOwnedBorrow<BE>,
Scratch<BE>: ScratchAvailable + ScratchTakeCore<BE>, Scratch<BE>: ScratchAvailable + ScratchTakeCore<BE>,
{ {
let base2k: usize = 12; let base2k_in: usize = 17;
let k_in: usize = 60; let base2k_key: usize = 13;
let dsize: usize = k_in.div_ceil(base2k); let base2k_out: usize = base2k_in; // MUST BE SAME
let k_in: usize = 102;
let max_dsize: usize = k_in.div_ceil(base2k_key);
for rank_in in 1_usize..3 { for rank_in in 1_usize..3 {
for rank_out in 1_usize..3 { for rank_out in 1_usize..3 {
for di in 1_usize..dsize + 1 { for dsize in 1_usize..max_dsize + 1 {
let k_ggsw: usize = k_in + base2k * di; let k_ggsw: usize = k_in + base2k_key * dsize;
let k_out: usize = k_in; // Better capture noise. let k_out: usize = k_in; // Better capture noise.
let n: usize = module.n(); let n: usize = module.n();
let dnum: usize = k_in.div_ceil(base2k * di); let dnum_in: usize = k_in / base2k_in;
let dnum: usize = k_in.div_ceil(base2k_key * dsize);
let dsize_in: usize = 1; let dsize_in: usize = 1;
let gglwe_in_infos: GLWESwitchingKeyLayout = GLWESwitchingKeyLayout { let gglwe_in_infos: GLWESwitchingKeyLayout = GLWESwitchingKeyLayout {
n: n.into(), n: n.into(),
base2k: base2k.into(), base2k: base2k_in.into(),
k: k_in.into(), k: k_in.into(),
dnum: dnum.into(), dnum: dnum_in.into(),
dsize: dsize_in.into(), dsize: dsize_in.into(),
rank_in: rank_in.into(), rank_in: rank_in.into(),
rank_out: rank_out.into(), rank_out: rank_out.into(),
@@ -52,9 +56,9 @@ where
let gglwe_out_infos: GLWESwitchingKeyLayout = GLWESwitchingKeyLayout { let gglwe_out_infos: GLWESwitchingKeyLayout = GLWESwitchingKeyLayout {
n: n.into(), n: n.into(),
base2k: base2k.into(), base2k: base2k_out.into(),
k: k_out.into(), k: k_out.into(),
dnum: dnum.into(), dnum: dnum_in.into(),
dsize: dsize_in.into(), dsize: dsize_in.into(),
rank_in: rank_in.into(), rank_in: rank_in.into(),
rank_out: rank_out.into(), rank_out: rank_out.into(),
@@ -62,10 +66,10 @@ where
let ggsw_infos: GGSWLayout = GGSWLayout { let ggsw_infos: GGSWLayout = GGSWLayout {
n: n.into(), n: n.into(),
base2k: base2k.into(), base2k: base2k_key.into(),
k: k_ggsw.into(), k: k_ggsw.into(),
dnum: dnum.into(), dnum: dnum.into(),
dsize: di.into(), dsize: dsize.into(),
rank: rank_out.into(), rank: rank_out.into(),
}; };
@@ -143,7 +147,7 @@ where
let max_noise: f64 = noise_ggsw_product( let max_noise: f64 = noise_ggsw_product(
n as f64, n as f64,
base2k * di, base2k_key * dsize,
var_xs, var_xs,
var_msg, var_msg,
var_a0_err, var_a0_err,
@@ -176,24 +180,27 @@ where
ScratchOwned<BE>: ScratchOwnedAlloc<BE> + ScratchOwnedBorrow<BE>, ScratchOwned<BE>: ScratchOwnedAlloc<BE> + ScratchOwnedBorrow<BE>,
Scratch<BE>: ScratchAvailable + ScratchTakeCore<BE>, Scratch<BE>: ScratchAvailable + ScratchTakeCore<BE>,
{ {
let base2k: usize = 12; let base2k_out: usize = 17;
let k_out: usize = 60; let base2k_key: usize = 13;
let dsize: usize = k_out.div_ceil(base2k); let k_out: usize = 102;
let max_dsize: usize = k_out.div_ceil(base2k_key);
for rank_in in 1_usize..3 { for rank_in in 1_usize..3 {
for rank_out in 1_usize..3 { for rank_out in 1_usize..3 {
for di in 1_usize..dsize + 1 { for dsize in 1_usize..max_dsize + 1 {
let k_ggsw: usize = k_out + base2k * di; let k_ggsw: usize = k_out + base2k_key * dsize;
let n: usize = module.n(); let n: usize = module.n();
let dnum: usize = k_out.div_ceil(base2k * di); let dnum_in: usize = k_out / base2k_out;
let dnum: usize = k_out.div_ceil(base2k_key * dsize);
let dsize_in: usize = 1; let dsize_in: usize = 1;
let gglwe_out_infos: GLWESwitchingKeyLayout = GLWESwitchingKeyLayout { let gglwe_out_infos: GLWESwitchingKeyLayout = GLWESwitchingKeyLayout {
n: n.into(), n: n.into(),
base2k: base2k.into(), base2k: base2k_out.into(),
k: k_out.into(), k: k_out.into(),
dnum: dnum.into(), dnum: dnum_in.into(),
dsize: dsize_in.into(), dsize: dsize_in.into(),
rank_in: rank_in.into(), rank_in: rank_in.into(),
rank_out: rank_out.into(), rank_out: rank_out.into(),
@@ -201,10 +208,10 @@ where
let ggsw_infos: GGSWLayout = GGSWLayout { let ggsw_infos: GGSWLayout = GGSWLayout {
n: n.into(), n: n.into(),
base2k: base2k.into(), base2k: base2k_key.into(),
k: k_ggsw.into(), k: k_ggsw.into(),
dnum: dnum.into(), dnum: dnum.into(),
dsize: di.into(), dsize: dsize.into(),
rank: rank_out.into(), rank: rank_out.into(),
}; };
@@ -281,7 +288,7 @@ where
let max_noise: f64 = noise_ggsw_product( let max_noise: f64 = noise_ggsw_product(
n as f64, n as f64,
base2k * di, base2k_key * dsize,
var_xs, var_xs,
var_msg, var_msg,
var_a0_err, var_a0_err,

51
poulpy-core/src/tests/test_suite/external_product/ggsw_ct.rs
View File

@@ -26,23 +26,26 @@ where
ScratchOwned<BE>: ScratchOwnedAlloc<BE> + ScratchOwnedBorrow<BE>, ScratchOwned<BE>: ScratchOwnedAlloc<BE> + ScratchOwnedBorrow<BE>,
Scratch<BE>: ScratchAvailable + ScratchTakeCore<BE>, Scratch<BE>: ScratchAvailable + ScratchTakeCore<BE>,
{ {
let base2k: usize = 12; let base2k_in: usize = 17;
let k_in: usize = 60; let base2k_key: usize = 13;
let dsize: usize = k_in.div_ceil(base2k); let base2k_out: usize = base2k_in; // MUST BE SAME
let k_in: usize = 102;
let max_dsize: usize = k_in.div_ceil(base2k_key);
for rank in 1_usize..3 { for rank in 1_usize..3 {
for di in 1..dsize + 1 { for dsize in 1..max_dsize + 1 {
let k_apply: usize = k_in + base2k * di; let k_apply: usize = k_in + base2k_key * dsize;
let k_out: usize = k_in; // Better capture noise. let k_out: usize = k_in; // Better capture noise.
let n: usize = module.n(); let n: usize = module.n();
let dnum: usize = k_in.div_ceil(base2k * di); let dnum: usize = k_in.div_ceil(base2k_key * dsize);
let dnum_in: usize = k_in.div_euclid(base2k * di); let dnum_in: usize = k_in / base2k_in;
let dsize_in: usize = 1; let dsize_in: usize = 1;
let ggsw_in_infos: GGSWLayout = GGSWLayout { let ggsw_in_infos: GGSWLayout = GGSWLayout {
n: n.into(), n: n.into(),
base2k: base2k.into(), base2k: base2k_in.into(),
k: k_in.into(), k: k_in.into(),
dnum: dnum_in.into(), dnum: dnum_in.into(),
dsize: dsize_in.into(), dsize: dsize_in.into(),
@@ -51,7 +54,7 @@ where
let ggsw_out_infos: GGSWLayout = GGSWLayout { let ggsw_out_infos: GGSWLayout = GGSWLayout {
n: n.into(), n: n.into(),
base2k: base2k.into(), base2k: base2k_out.into(),
k: k_out.into(), k: k_out.into(),
dnum: dnum_in.into(), dnum: dnum_in.into(),
dsize: dsize_in.into(), dsize: dsize_in.into(),
@@ -60,10 +63,10 @@ where
let ggsw_apply_infos: GGSWLayout = GGSWLayout { let ggsw_apply_infos: GGSWLayout = GGSWLayout {
n: n.into(), n: n.into(),
base2k: base2k.into(), base2k: base2k_key.into(),
k: k_apply.into(), k: k_apply.into(),
dnum: dnum.into(), dnum: dnum.into(),
dsize: di.into(), dsize: dsize.into(),
rank: rank.into(), rank: rank.into(),
}; };
@@ -130,7 +133,7 @@ where
let max_noise = |_col_j: usize| -> f64 { let max_noise = |_col_j: usize| -> f64 {
noise_ggsw_product( noise_ggsw_product(
n as f64, n as f64,
base2k * di, base2k_key * dsize,
0.5, 0.5,
var_msg, var_msg,
var_a0_err, var_a0_err,
@@ -160,21 +163,23 @@ where
ScratchOwned<BE>: ScratchOwnedAlloc<BE> + ScratchOwnedBorrow<BE>, ScratchOwned<BE>: ScratchOwnedAlloc<BE> + ScratchOwnedBorrow<BE>,
Scratch<BE>: ScratchAvailable + ScratchTakeCore<BE>, Scratch<BE>: ScratchAvailable + ScratchTakeCore<BE>,
{ {
let base2k: usize = 12; let base2k_out: usize = 17;
let k_out: usize = 60; let base2k_key: usize = 13;
let dsize: usize = k_out.div_ceil(base2k); let k_out: usize = 102;
let max_dsize: usize = k_out.div_ceil(base2k_key);
for rank in 1_usize..3 { for rank in 1_usize..3 {
for di in 1..dsize + 1 { for dsize in 1..max_dsize + 1 {
let k_apply: usize = k_out + base2k * di; let k_apply: usize = k_out + base2k_key * dsize;
let n: usize = module.n(); let n: usize = module.n();
let dnum: usize = k_out.div_ceil(di * base2k); let dnum: usize = k_out.div_ceil(dsize * base2k_key);
let dnum_in: usize = k_out.div_euclid(base2k * di); let dnum_in: usize = k_out / base2k_out;
let dsize_in: usize = 1; let dsize_in: usize = 1;
let ggsw_out_infos: GGSWLayout = GGSWLayout { let ggsw_out_infos: GGSWLayout = GGSWLayout {
n: n.into(), n: n.into(),
base2k: base2k.into(), base2k: base2k_out.into(),
k: k_out.into(), k: k_out.into(),
dnum: dnum_in.into(), dnum: dnum_in.into(),
dsize: dsize_in.into(), dsize: dsize_in.into(),
@@ -183,10 +188,10 @@ where
let ggsw_apply_infos: GGSWLayout = GGSWLayout { let ggsw_apply_infos: GGSWLayout = GGSWLayout {
n: n.into(), n: n.into(),
base2k: base2k.into(), base2k: base2k_key.into(),
k: k_apply.into(), k: k_apply.into(),
dnum: dnum.into(), dnum: dnum.into(),
dsize: di.into(), dsize: dsize.into(),
rank: rank.into(), rank: rank.into(),
}; };
@@ -253,7 +258,7 @@ where
let max_noise = |_col_j: usize| -> f64 { let max_noise = |_col_j: usize| -> f64 {
noise_ggsw_product( noise_ggsw_product(
n as f64, n as f64,
base2k * di, base2k_key * dsize,
0.5, 0.5,
var_msg, var_msg,
var_a0_err, var_a0_err,

68
poulpy-core/src/tests/test_suite/external_product/glwe_ct.rs
View File

@@ -5,7 +5,7 @@ use poulpy_hal::{
}; };
use crate::{ use crate::{
GGSWEncryptSk, GLWEEncryptSk, GLWEExternalProduct, GLWENoise, ScratchTakeCore, GGSWEncryptSk, GLWEEncryptSk, GLWEExternalProduct, GLWENoise, GLWENormalize, ScratchTakeCore,
encryption::SIGMA, encryption::SIGMA,
layouts::{ layouts::{
GGSW, GGSWLayout, GGSWPreparedFactory, GLWE, GLWELayout, GLWEPlaintext, GLWESecret, GLWESecretPreparedFactory, GGSW, GGSWLayout, GGSWPreparedFactory, GLWE, GLWELayout, GLWEPlaintext, GLWESecret, GLWESecretPreparedFactory,
@@ -24,41 +24,44 @@ where
+ GLWEEncryptSk<BE> + GLWEEncryptSk<BE>
+ GLWENoise<BE> + GLWENoise<BE>
+ VecZnxRotateInplace<BE> + VecZnxRotateInplace<BE>
+ GLWESecretPreparedFactory<BE>, + GLWESecretPreparedFactory<BE>
+ GLWENormalize<BE>,
ScratchOwned<BE>: ScratchOwnedAlloc<BE> + ScratchOwnedBorrow<BE>, ScratchOwned<BE>: ScratchOwnedAlloc<BE> + ScratchOwnedBorrow<BE>,
Scratch<BE>: ScratchAvailable + ScratchTakeCore<BE>, Scratch<BE>: ScratchAvailable + ScratchTakeCore<BE>,
{ {
let base2k: usize = 12; let base2k_in: usize = 17;
let k_in: usize = 45; let base2k_key: usize = 13;
let dsize: usize = k_in.div_ceil(base2k); let base2k_out: usize = 15;
let k_in: usize = 102;
let max_dsize: usize = k_in.div_ceil(base2k_key);
for rank in 1_usize..3 { for rank in 1_usize..3 {
for di in 1..dsize + 1 { for dsize in 1..max_dsize + 1 {
let k_ggsw: usize = k_in + base2k * di; let k_ggsw: usize = k_in + base2k_key * dsize;
let k_out: usize = k_ggsw; // Better capture noise let k_out: usize = k_ggsw; // Better capture noise
let n: usize = module.n(); let n: usize = module.n();
let dnum: usize = k_in.div_ceil(base2k * dsize); let dnum: usize = k_in.div_ceil(k_ggsw * dsize);
let glwe_in_infos: GLWELayout = GLWELayout { let glwe_in_infos: GLWELayout = GLWELayout {
n: n.into(), n: n.into(),
base2k: base2k.into(), base2k: base2k_in.into(),
k: k_in.into(), k: k_in.into(),
rank: rank.into(), rank: rank.into(),
}; };
let glwe_out_infos: GLWELayout = GLWELayout { let glwe_out_infos: GLWELayout = GLWELayout {
n: n.into(), n: n.into(),
base2k: base2k.into(), base2k: base2k_out.into(),
k: k_out.into(), k: k_out.into(),
rank: rank.into(), rank: rank.into(),
}; };
let ggsw_apply_infos: GGSWLayout = GGSWLayout { let ggsw_apply_infos: GGSWLayout = GGSWLayout {
n: n.into(), n: n.into(),
base2k: base2k.into(), base2k: base2k_key.into(),
k: k_ggsw.into(), k: k_ggsw.into(),
dnum: dnum.into(), dnum: dnum.into(),
dsize: di.into(), dsize: dsize.into(),
rank: rank.into(), rank: rank.into(),
}; };
@@ -66,16 +69,17 @@ where
let mut glwe_in: GLWE<Vec<u8>> = GLWE::alloc_from_infos(&glwe_in_infos); let mut glwe_in: GLWE<Vec<u8>> = GLWE::alloc_from_infos(&glwe_in_infos);
let mut glwe_out: GLWE<Vec<u8>> = GLWE::alloc_from_infos(&glwe_out_infos); let mut glwe_out: GLWE<Vec<u8>> = GLWE::alloc_from_infos(&glwe_out_infos);
let mut pt_ggsw: ScalarZnx<Vec<u8>> = ScalarZnx::alloc(n, 1); let mut pt_ggsw: ScalarZnx<Vec<u8>> = ScalarZnx::alloc(n, 1);
let mut pt_want: GLWEPlaintext<Vec<u8>> = GLWEPlaintext::alloc_from_infos(&glwe_in_infos); let mut pt_in: GLWEPlaintext<Vec<u8>> = GLWEPlaintext::alloc_from_infos(&glwe_in_infos);
let mut pt_out: GLWEPlaintext<Vec<u8>> = GLWEPlaintext::alloc_from_infos(&glwe_out_infos);
let mut source_xs: Source = Source::new([0u8; 32]); let mut source_xs: Source = Source::new([0u8; 32]);
let mut source_xe: Source = Source::new([0u8; 32]); let mut source_xe: Source = Source::new([0u8; 32]);
let mut source_xa: Source = Source::new([0u8; 32]); let mut source_xa: Source = Source::new([0u8; 32]);
// Random input plaintext // Random input plaintext
module.vec_znx_fill_uniform(base2k, &mut pt_want.data, 0, &mut source_xa); module.vec_znx_fill_uniform(base2k_in, &mut pt_in.data, 0, &mut source_xa);
pt_want.data.at_mut(0, 0)[1] = 1; pt_in.data.at_mut(0, 0)[1] = 1;
let k: usize = 1; let k: usize = 1;
@@ -104,7 +108,7 @@ where
glwe_in.encrypt_sk( glwe_in.encrypt_sk(
module, module,
&pt_want, &pt_in,
&sk_prepared, &sk_prepared,
&mut source_xa, &mut source_xa,
&mut source_xe, &mut source_xe,
@@ -116,7 +120,9 @@ where
glwe_out.external_product(module, &glwe_in, &ct_ggsw_prepared, scratch.borrow()); glwe_out.external_product(module, &glwe_in, &ct_ggsw_prepared, scratch.borrow());
module.vec_znx_rotate_inplace(k as i64, &mut pt_want.data, 0, scratch.borrow()); module.vec_znx_rotate_inplace(k as i64, &mut pt_in.data, 0, scratch.borrow());
module.glwe_normalize(&mut pt_out, &pt_in, scratch.borrow());
let var_gct_err_lhs: f64 = SIGMA * SIGMA; let var_gct_err_lhs: f64 = SIGMA * SIGMA;
let var_gct_err_rhs: f64 = 0f64; let var_gct_err_rhs: f64 = 0f64;
@@ -127,7 +133,7 @@ where
let max_noise: f64 = noise_ggsw_product( let max_noise: f64 = noise_ggsw_product(
n as f64, n as f64,
base2k * dsize, base2k_key * max_dsize,
0.5, 0.5,
var_msg, var_msg,
var_a0_err, var_a0_err,
@@ -139,7 +145,7 @@ where
k_ggsw, k_ggsw,
); );
glwe_out.assert_noise(module, &sk_prepared, &pt_want, max_noise + 0.5); glwe_out.assert_noise(module, &sk_prepared, &pt_out, max_noise + 0.5);
} }
} }
} }
@@ -158,29 +164,31 @@ where
ScratchOwned<BE>: ScratchOwnedAlloc<BE> + ScratchOwnedBorrow<BE>, ScratchOwned<BE>: ScratchOwnedAlloc<BE> + ScratchOwnedBorrow<BE>,
Scratch<BE>: ScratchAvailable + ScratchTakeCore<BE>, Scratch<BE>: ScratchAvailable + ScratchTakeCore<BE>,
{ {
let base2k: usize = 12; let base2k_out: usize = 17;
let k_out: usize = 60; let base2k_key: usize = 13;
let dsize: usize = k_out.div_ceil(base2k); let k_out: usize = 102;
let max_dsize: usize = k_out.div_ceil(base2k_key);
for rank in 1_usize..3 { for rank in 1_usize..3 {
for di in 1..dsize + 1 { for dsize in 1..max_dsize + 1 {
let k_ggsw: usize = k_out + base2k * di; let k_ggsw: usize = k_out + base2k_key * dsize;
let n: usize = module.n(); let n: usize = module.n();
let dnum: usize = k_out.div_ceil(base2k * dsize); let dnum: usize = k_out.div_ceil(base2k_out * max_dsize);
let glwe_out_infos: GLWELayout = GLWELayout { let glwe_out_infos: GLWELayout = GLWELayout {
n: n.into(), n: n.into(),
base2k: base2k.into(), base2k: base2k_out.into(),
k: k_out.into(), k: k_out.into(),
rank: rank.into(), rank: rank.into(),
}; };
let ggsw_apply_infos: GGSWLayout = GGSWLayout { let ggsw_apply_infos: GGSWLayout = GGSWLayout {
n: n.into(), n: n.into(),
base2k: base2k.into(), base2k: base2k_key.into(),
k: k_ggsw.into(), k: k_ggsw.into(),
dnum: dnum.into(), dnum: dnum.into(),
dsize: di.into(), dsize: dsize.into(),
rank: rank.into(), rank: rank.into(),
}; };
@@ -194,7 +202,7 @@ where
let mut source_xa: Source = Source::new([0u8; 32]); let mut source_xa: Source = Source::new([0u8; 32]);
// Random input plaintext // Random input plaintext
module.vec_znx_fill_uniform(base2k, &mut pt_want.data, 0, &mut source_xa); module.vec_znx_fill_uniform(base2k_out, &mut pt_want.data, 0, &mut source_xa);
pt_want.data.at_mut(0, 0)[1] = 1; pt_want.data.at_mut(0, 0)[1] = 1;
@@ -248,7 +256,7 @@ where
let max_noise: f64 = noise_ggsw_product( let max_noise: f64 = noise_ggsw_product(
n as f64, n as f64,
base2k * dsize, base2k_key * max_dsize,
0.5, 0.5,
var_msg, var_msg,
var_a0_err, var_a0_err,

2
poulpy-hal/src/reference/vec_znx/normalize.rs
View File

@@ -53,7 +53,7 @@ pub fn vec_znx_normalize<R, A, ZNXARI>(
let res_size: usize = res.size(); let res_size: usize = res.size();
let a_size: usize = a.size(); let a_size: usize = a.size();
let carry = &mut carry[..2 * n]; let carry: &mut [i64] = &mut carry[..2 * n];
if res_base2k == a_base2k { if res_base2k == a_base2k {
if a_size > res_size { if a_size > res_size {