poulpy · arnaucube's git mirror

bug fixes

Jean-Philippe Bossuat jeanphilippe.bossuat@gmail.com

Mon, 26 May 2025 13:55:21 +0200

commit

4c3a56810818903f65adee5eafb1613052e21f1c

parent

cb284a4c4c50736c2e1d62912689f94c12b708a3

7 files changed, 54 insertions(+), 43 deletions(-)

jump to

Cargo.lock

Cargo.toml

backend/src/encoding.rs

core/src/automorphism.rs

core/src/gglwe_ciphertext.rs

core/src/glwe_ciphertext.rs

core/src/glwe_ops.rs

M Cargo.lock → Cargo.lock

@@ -145,25 +145,22 @@ ]
 
 [[package]]
 name = "criterion"
-version = "0.5.1"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2b12d017a929603d80db1831cd3a24082f8137ce19c69e6447f54f5fc8d692f"
+checksum = "3bf7af66b0989381bd0be551bd7cc91912a655a58c6918420c9527b1fd8b4679"
 dependencies = [
  "anes",
  "cast",
  "ciborium",
  "clap",
  "criterion-plot",
- "is-terminal",
- "itertools 0.10.5",
+ "itertools 0.13.0",
  "num-traits",
- "once_cell",
  "oorandom",
  "plotters",
  "rayon",
  "regex",
  "serde",
- "serde_derive",
  "serde_json",
  "tinytemplate",
  "walkdir",
@@ -255,27 +252,19 @@ "crunchy",
 ]
 
 [[package]]
-name = "hermit-abi"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc"
-
-[[package]]
-name = "is-terminal"
-version = "0.4.13"
+name = "itertools"
+version = "0.10.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "261f68e344040fbd0edea105bef17c66edf46f984ddb1115b775ce31be948f4b"
+checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473"
 dependencies = [
- "hermit-abi",
- "libc",
- "windows-sys 0.52.0",
+ "either",
 ]
 
 [[package]]
 name = "itertools"
-version = "0.10.5"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473"
+checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186"
 dependencies = [
  "either",
 ]

M Cargo.toml → Cargo.toml

@@ -9,4 +9,4 @@ rand_chacha = "0.9.0"
 rand_core = "0.9.3"
 rand_distr = "0.5.1"
 itertools = "0.14.0"
-criterion = "0.5.1"
+criterion = "0.6.0"

M backend/src/encoding.rs → backend/src/encoding.rs

@@ -263,14 +263,14 @@ assert!(i < a.n());
         assert!(col_i < a.cols())
     }
 
-    let cols: usize = (k + basek - 1) / basek;
+    let size: usize = (k + basek - 1) / basek;
     let data: &[i64] = a.raw();
     let mut res: i64 = data[i];
     let rem: usize = basek - (k % basek);
     let slice_size: usize = a.n() * a.size();
-    (1..cols).for_each(|i| {
-        let x = data[i * slice_size];
-        if i == cols - 1 && rem != basek {
+    (1..size).for_each(|i| {
+        let x: i64 = data[i * slice_size];
+        if i == size - 1 && rem != basek {
             let k_rem: usize = basek - rem;
             res = (res << k_rem) + (x >> rem);
         } else {

M core/src/automorphism.rs → core/src/automorphism.rs

@@ -1,7 +1,7 @@
 use backend::{
-    Backend, FFT64, MatZnxDft, MatZnxDftOps, MatZnxDftToMut, MatZnxDftToRef, Module, ScalarZnx, ScalarZnxDftOps, ScalarZnxOps,
-    ScalarZnxToRef, Scratch, VecZnx, VecZnxBigAlloc, VecZnxDftAlloc, VecZnxDftOps, VecZnxDftToMut, VecZnxDftToRef, VecZnxOps,
-    ZnxZero,
+    Backend, FFT64, MatZnxDft, MatZnxDftOps, MatZnxDftToMut, MatZnxDftToRef, Module, ScalarZnx, ScalarZnxDftAlloc,
+    ScalarZnxDftOps, ScalarZnxOps, ScalarZnxToRef, Scratch, VecZnx, VecZnxBigAlloc, VecZnxDftAlloc, VecZnxDftOps, VecZnxDftToMut,
+    VecZnxDftToRef, VecZnxOps, ZnxZero,
 };
 use sampling::source::Source;
 
@@ -107,7 +107,7 @@ }
 
 impl AutomorphismKey<Vec<u8>, FFT64> {
     pub fn generate_from_sk_scratch_space(module: &Module<FFT64>, rank: usize, size: usize) -> usize {
-        GGLWECiphertext::generate_from_sk_scratch_space(module, rank, size)
+        GGLWECiphertext::generate_from_sk_scratch_space(module, rank, size) + module.bytes_of_scalar_znx_dft(rank)
     }
 
     pub fn generate_from_pk_scratch_space(module: &Module<FFT64>, rank: usize, pk_size: usize) -> usize {
@@ -188,6 +188,15 @@ assert_eq!(self.n(), module.n());
             assert_eq!(sk.n(), module.n());
             assert_eq!(self.rank_out(), self.rank_in());
             assert_eq!(sk.rank(), self.rank());
+            assert!(
+                scratch.available() >= AutomorphismKey::generate_from_sk_scratch_space(module, self.rank(), self.size()),
+                "scratch.available(): {} < AutomorphismKey::generate_from_sk_scratch_space(module, self.rank()={}, \
+                 self.size()={}): {}",
+                scratch.available(),
+                self.rank(),
+                self.size(),
+                AutomorphismKey::generate_from_sk_scratch_space(module, self.rank(), self.size())
+            )
         }
 
         let (sk_out_dft_data, scratch_1) = scratch.tmp_scalar_znx_dft(module, sk.rank());

M core/src/gglwe_ciphertext.rs → core/src/gglwe_ciphertext.rs

@@ -1,7 +1,7 @@
 use backend::{
     Backend, FFT64, MatZnxDft, MatZnxDftAlloc, MatZnxDftOps, MatZnxDftToMut, MatZnxDftToRef, Module, ScalarZnx, ScalarZnxDft,
-    ScalarZnxDftToRef, ScalarZnxToRef, Scratch, VecZnxAlloc, VecZnxDftAlloc, VecZnxDftToMut, VecZnxDftToRef, VecZnxOps, ZnxInfos,
-    ZnxZero,
+    ScalarZnxDftToRef, ScalarZnxToRef, Scratch, VecZnxAlloc, VecZnxBigScratch, VecZnxDftAlloc, VecZnxDftToMut, VecZnxDftToRef,
+    VecZnxOps, ZnxInfos, ZnxZero,
 };
 use sampling::source::Source;
 
@@ -115,6 +115,15 @@ assert_eq!(self.rank_out(), sk_dft.rank());
             assert_eq!(self.n(), module.n());
             assert_eq!(sk_dft.n(), module.n());
             assert_eq!(pt.n(), module.n());
+            assert!(
+                scratch.available() >= GGLWECiphertext::generate_from_sk_scratch_space(module, self.rank(), self.size()),
+                "scratch.available: {} < GGLWECiphertext::generate_from_sk_scratch_space(module, self.rank()={}, \
+                 self.size()={}): {}",
+                scratch.available(),
+                self.rank(),
+                self.size(),
+                GGLWECiphertext::generate_from_sk_scratch_space(module, self.rank(), self.size())
+            )
         }
 
         let rows: usize = self.rows();

M core/src/glwe_ciphertext.rs → core/src/glwe_ciphertext.rs

@@ -97,9 +97,7 @@ }
 
 impl GLWECiphertext<Vec<u8>> {
     pub fn encrypt_sk_scratch_space(module: &Module<FFT64>, ct_size: usize) -> usize {
-        module.vec_znx_big_normalize_tmp_bytes()
-            + module.bytes_of_vec_znx_dft(1, ct_size)
-            + module.bytes_of_vec_znx_big(1, ct_size)
+        module.vec_znx_big_normalize_tmp_bytes() + module.bytes_of_vec_znx_dft(1, ct_size) + module.bytes_of_vec_znx(1, ct_size)
     }
     pub fn encrypt_pk_scratch_space(module: &Module<FFT64>, pk_size: usize) -> usize {
         ((module.bytes_of_vec_znx_dft(1, pk_size) + module.bytes_of_vec_znx_big(1, pk_size)) | module.bytes_of_scalar_znx(1))
@@ -534,11 +532,11 @@ if apply_auto != 0 {
                 module.vec_znx_big_automorphism_inplace(apply_auto, &mut res_big, i);
             }
 
-            match OP{
-                1=> module.vec_znx_big_add_small_inplace(&mut res_big, i, lhs, i),
-                2=> module.vec_znx_big_sub_small_a_inplace(&mut res_big, i, lhs, i),
-                3=> module.vec_znx_big_sub_small_b_inplace(&mut res_big, i, lhs, i),
-                _=>{},
+            match OP {
+                1 => module.vec_znx_big_add_small_inplace(&mut res_big, i, lhs, i),
+                2 => module.vec_znx_big_sub_small_a_inplace(&mut res_big, i, lhs, i),
+                3 => module.vec_znx_big_sub_small_b_inplace(&mut res_big, i, lhs, i),
+                _ => {}
             }
             module.vec_znx_big_normalize(basek, self, i, &res_big, i, scratch1);
         });
@@ -636,6 +634,12 @@ if let Some((pt, col)) = pt {
                 assert_eq!(pt.n(), module.n());
                 assert!(col < self.rank() + 1);
             }
+            assert!(
+                scratch.available() >= GLWECiphertext::encrypt_sk_scratch_space(module, self.size()),
+                "scratch.available(): {} < GLWECiphertext::encrypt_sk_scratch_space: {}",
+                scratch.available(),
+                GLWECiphertext::encrypt_sk_scratch_space(module, self.size())
+            )
         }
 
         let basek: usize = self.basek();

M core/src/glwe_ops.rs → core/src/glwe_ops.rs

@@ -175,7 +175,7 @@ self.set_basek(a.basek());
         self.set_k(a.k());
     }
 
-    pub fn rotate_inplace(&mut self, module: &Module<FFT64>, k: i64){
+    pub fn rotate_inplace(&mut self, module: &Module<FFT64>, k: i64) {
         #[cfg(debug_assertions)]
         {
             assert_eq!(self.n(), module.n());
@@ -240,8 +240,8 @@ });
     }
 }
 
-impl GLWECiphertext<Vec<u8>>{
-    pub fn rsh_scratch_space(module: &Module<FFT64>) -> usize{
+impl GLWECiphertext<Vec<u8>> {
+    pub fn rsh_scratch_space(module: &Module<FFT64>) -> usize {
         VecZnx::rsh_scratch_space(module.n())
     }
-}+}