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

Fixed packing & added test for full & sparse packing

Browse Source
This commit is contained in:
Jean-Philippe Bossuat
2025-01-10 16:22:31 +01:00
parent feeea6e80a
commit a6c1aa1c09
4 changed files with 111 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
math/src/poly.rs
View File

@@ -38,12 +38,12 @@ where
self.0.resize(n, O::default());
}
pub fn set_all(&mut self, v: &O) {
pub fn fill(&mut self, v: &O) {
self.0.fill(*v)
}
pub fn zero(&mut self) {
self.set_all(&O::default())
self.fill(&O::default())
}
pub fn copy_from(&mut self, other: &Poly<O>) {
@@ -134,12 +134,12 @@ where
&mut self.0[level]
}
pub fn set_all(&mut self, v: &O) {
(0..self.level() + 1).for_each(|i| self.at_mut(i).set_all(v))
pub fn fill(&mut self, v: &O) {
(0..self.level() + 1).for_each(|i| self.at_mut(i).fill(v))
}
pub fn zero(&mut self) {
self.set_all(&O::default())
self.fill(&O::default())
}
pub fn copy(&mut self, other: &PolyRNS<O>) {

34
math/src/ring/impl_u64/packing.rs
View File

@@ -1,10 +1,9 @@
use crate::modulus::barrett::Barrett;
use crate::modulus::{WordOps, ONCE};
use crate::modulus::ONCE;
use crate::poly::Poly;
use crate::ring::Ring;
use std::cmp::min;
use std::collections::HashSet;
use std::mem::transmute;
impl Ring<u64> {
// Generates a vector storing {X^{2^0}, X^{2^1}, .., X^{2^log_n}}.
@@ -64,14 +63,17 @@ impl Ring<u64> {
let set: HashSet<_> = indices.into_iter().collect();
let max_pow2_gap_divisor: usize = 1 << gap.trailing_zeros();
if !ZEROGARBAGE {
if gap > 0 {
log_end -= max_pow2_gap_divisor;
log_end -= gap.trailing_zeros() as usize;
}
}
assert!(
log_start < log_end,
"invalid input polys: gap between non None value is smaller than 2^log_gap"
);
let n_inv: Barrett<u64> = self
.modulus
.barrett
@@ -102,31 +104,35 @@ impl Ring<u64> {
if let Some(poly_lo) = polys_lo[j].as_mut() {
self.a_sub_b_into_c::<1, ONCE>(poly_lo, poly_hi, &mut tmpa);
self.a_add_b_into_b::<ONCE>(poly_hi, poly_lo);
} else {
std::mem::swap(&mut polys_lo[j], &mut polys_hi[j]);
}
}
if let Some(poly_lo) = polys_lo[j].as_mut() {
let gal_el: usize = self.galois_element(1 << (i - 1), i == 0, log_nth_root);
let gal_el: usize = self.galois_element((1 << i) >> 1, i == 0, log_nth_root);
if !polys_hi[j].is_none() {
self.automorphism::<true>(&tmpa, gal_el, 2 << self.log_n(), &mut tmpb);
self.a_add_b_into_b::<ONCE>(&tmpb, poly_lo);
} else {
self.automorphism::<true>(poly_lo, gal_el, nth_root, &mut tmpa);
self.a_add_b_into_b::<ONCE>(&tmpa, poly_lo);
}
self.a_add_b_into_b::<ONCE>(&tmpa, poly_lo);
} else if let Some(poly_hi) = polys_hi[j].as_mut() {
let gal_el: usize = self.galois_element(1 << (i - 1), i == 0, log_nth_root);
let gal_el: usize = self.galois_element((1 << i) >> 1, i == 0, log_nth_root);
self.automorphism::<true>(poly_hi, gal_el, nth_root, &mut tmpa);
self.a_sub_b_into_a::<1, ONCE>(&tmpa, poly_hi)
self.a_sub_b_into_a::<1, ONCE>(&tmpa, poly_hi);
std::mem::swap(&mut polys_lo[j], &mut polys_hi[j]);
}
}
polys.truncate(t);
}
if !NTT {
if let Some(poly) = polys[0].as_mut() {
self.intt_inplace::<false>(poly);
}
}
}
}
@@ -135,7 +141,7 @@ fn max_gap(vec: &[usize]) -> usize {
let mut gap: usize = usize::MAX;
for i in 1..vec.len() {
let (l, r) = (vec[i - 1], vec[i]);
assert!(l > r, "invalid input vec: not sorted");
assert!(r > l, "invalid input vec: not sorted");
gap = min(gap, r - l);
if gap == 1 {
break;

4
math/src/ring/impl_u64/ring.rs
View File

@@ -51,12 +51,12 @@ impl Ring<u64> {
gal_el = gal_el.wrapping_mul(gen_1_pow);
}
gen_1_pow *= gen_1_pow;
gen_1_pow = gen_1_pow.wrapping_mul(gen_1_pow);
e >>= 1;
}
let nth_root = 1 << log_nth_root;
gal_el &= (nth_root - 1);
gal_el &= nth_root - 1;
if gen_2 {
return nth_root - gal_el;

84
math/tests/automorphism.rs
View File

@@ -1,5 +1,6 @@
use itertools::izip;
use math::poly::Poly;
use math::ring::impl_u64::ring;
use math::ring::Ring;
#[test]
@@ -51,3 +52,86 @@ fn test_automorphism_u64<const NTT: bool>(ring: &Ring<u64>, nth_root: usize) {
izip!(p0.0, p1.0).for_each(|(a, b)| assert_eq!(a, b));
}
#[test]
fn packing_u64() {
let n: usize = 1 << 5;
let q_base: u64 = 65537u64;
let q_power: usize = 1usize;
let ring: Ring<u64> = Ring::new(n, q_base, q_power);
sub_test("test_packing_u64::<NTT:false>", || {
test_packing_full_u64::<false>(&ring)
});
sub_test("test_packing_u64::<NTT:true>", || {
test_packing_full_u64::<true>(&ring)
});
sub_test("test_packing_sparse_u64::<NTT:false>", || {
test_packing_sparse_u64::<false>(&ring)
});
sub_test("test_packing_sparse_u64::<NTT:true>", || {
test_packing_sparse_u64::<true>(&ring)
});
}
fn test_packing_full_u64<const NTT: bool>(ring: &Ring<u64>) {
let n: usize = ring.n();
let mut result: Vec<Option<Poly<u64>>> = vec![None; n];
for i in 0..n {
let mut poly: Poly<u64> = ring.new_poly();
poly.fill(&(1 + i as u64));
if NTT {
ring.ntt_inplace::<false>(&mut poly);
}
result[i] = Some(poly);
}
ring.pack::<true, NTT>(&mut result, ring.log_n());
if let Some(poly) = result[0].as_mut() {
if NTT {
ring.intt_inplace::<false>(poly);
}
poly.0
.iter()
.enumerate()
.for_each(|(i, x)| assert_eq!(*x, 1 + i as u64));
}
}
fn test_packing_sparse_u64<const NTT: bool>(ring: &Ring<u64>) {
let n: usize = ring.n();
let mut result: Vec<Option<Poly<u64>>> = vec![None; n];
let gap: usize = 3;
for i in (0..n).step_by(gap) {
let mut poly: Poly<u64> = ring.new_poly();
poly.fill(&(1 + i as u64));
if NTT {
ring.ntt_inplace::<false>(&mut poly);
}
result[i] = Some(poly);
}
ring.pack::<true, NTT>(&mut result, ring.log_n());
if let Some(poly) = result[0].as_mut() {
if NTT {
ring.intt_inplace::<false>(poly);
}
poly.0.iter().enumerate().for_each(|(i, x)| {
if i % gap == 0 {
assert_eq!(*x, 1 + i as u64)
} else {
assert_eq!(*x, 0u64)
}
});
}
}