fixed gadget product & related example

rlwe/examples/gadget_product.rs

@@ -1,9 +1,13 @@
-use base2k::{Encoding, FFT64, SvpPPolOps};
+use base2k::{FFT64, Infos, Sampling, Scalar, SvpPPolOps, VecZnx, VecZnxBig, VecZnxDft, VecZnxOps};
 use rlwe::{
-    ciphertext::Ciphertext,
-    decryptor::{decrypt_rlwe_thread_safe_tmp_byte, Decryptor},
-    encryptor::{encrypt_grlwe_sk_tmp_bytes, encrypt_rlwe_sk_tmp_bytes, EncryptorSk},
-    evaluator::{gadget_product_thread_safe, gadget_product_inplace_thread_safe, gadget_product_tmp_bytes},
+    ciphertext::{Ciphertext, GadgetCiphertext},
+    decryptor::{Decryptor, decrypt_rlwe_thread_safe, decrypt_rlwe_thread_safe_tmp_byte},
+    elem::Elem,
+    encryptor::{
+        EncryptorSk, encrypt_grlwe_sk_thread_safe, encrypt_grlwe_sk_tmp_bytes,
+        encrypt_rlwe_sk_tmp_bytes,
+    },
+    evaluator::{gadget_product_thread_safe, gadget_product_tmp_bytes},
     key_generator::{gen_switching_key_thread_safe, gen_switching_key_thread_safe_tmp_bytes},
     keys::{SecretKey, SwitchingKey},
     parameters::{Parameters, ParametersLiteral},
@@ -41,19 +45,20 @@ fn main() {
                 params.log_q(),
                 params.limbs_q(),
                 params.log_qp()
-            ) | encrypt_grlwe_sk_tmp_bytes(params.module(), params.log_base2k(), params.limbs_qp(), params.log_qp())
+            )
+            | encrypt_grlwe_sk_tmp_bytes(
+                params.module(),
+                params.log_base2k(),
+                params.limbs_qp(),
+                params.log_qp()
+            )
     ];
 
-    println!("limbsQP: {}", params.limbs_qp());
-
     let mut source: Source = Source::new([3; 32]);
 
-    let mut sk0: SecretKey = SecretKey::new(params.module());
-    let mut sk1: SecretKey = SecretKey::new(params.module());
-
-    sk0.fill_ternary_hw(params.xs(), &mut source);
-    sk1.fill_ternary_hw(params.xs(), &mut source);
+    let mut sk: SecretKey = SecretKey::new(params.module());
 
+    sk.fill_ternary_hw(params.xs(), &mut source);
 
     let mut want = vec![i64::default(); params.n()];
 
@@ -61,82 +66,82 @@ fn main() {
 
     let log_base2k = params.log_base2k();
 
-    let log_k: usize = params.log_q() - 2*log_base2k;
-    
-    let mut ct: Ciphertext = params.new_ciphertext(params.log_qp());
+    let log_k: usize = params.log_q() - 2 * log_base2k;
 
     let mut source_xe: Source = Source::new([4; 32]);
     let mut source_xa: Source = Source::new([5; 32]);
 
-    let mut sk0_svp_ppol: base2k::SvpPPol = params.module().new_svp_ppol();
-    params.module().svp_prepare(&mut sk0_svp_ppol, &sk0.0);
+    let mut sk_svp_ppol: base2k::SvpPPol = params.module().new_svp_ppol();
+    params.module().svp_prepare(&mut sk_svp_ppol, &sk.0);
 
-    let mut sk1_svp_ppol: base2k::SvpPPol = params.module().new_svp_ppol();
-    params.module().svp_prepare(&mut sk1_svp_ppol, &sk1.0);
-
-    let mut pt_out: Plaintext = Plaintext::new(params.module(), params.log_base2k(), params.log_qp(), ct.log_scale());
-
-    //pt_out.0.value[0].encode_vec_i64(log_base2k, log_k, &want, 32);
-    //pt_out.0.value[0].normalize(log_base2k, &mut tmp_bytes);
-        
-    params.encrypt_rlwe_sk_thread_safe(
-        &mut ct,
-        Some(&pt_out),
-        &sk0_svp_ppol,
-        &mut source_xa,
-        &mut source_xe,
-        &mut tmp_bytes,
-    );
-
-    params.decrypt_rlwe_thread_safe(&mut pt_out, &ct, &sk0_svp_ppol, &mut tmp_bytes);
-
-    println!("DECRYPT");
-    pt_out.0.value[0].print_limbs(pt_out.limbs(), 16);
-
-
-    let mut swk: SwitchingKey = SwitchingKey::new(
+    let mut gadget_ct: GadgetCiphertext = GadgetCiphertext::new(
         params.module(),
-        params.log_base2k(),
-        params.limbs_qp(),
+        log_base2k,
+        params.limbs_q(),
         params.log_qp(),
     );
 
-    gen_switching_key_thread_safe(
+    let mut m: Scalar = Scalar::new(params.n());
+    m.fill_ternary_prob(0.5, &mut source_xa);
+
+    encrypt_grlwe_sk_thread_safe(
         params.module(),
-        &mut swk,
-        &sk0,
-        &sk1_svp_ppol,
+        &mut gadget_ct,
+        &m,
+        &sk_svp_ppol,
         &mut source_xa,
         &mut source_xe,
         params.xe(),
         &mut tmp_bytes,
     );
 
-    println!("{}", swk.cols());
+    let mut res: Elem = Elem::new(params.module(), log_base2k, params.log_q(), 1, 0);
+    let mut a: VecZnx = VecZnx::new(params.module().n(), params.limbs_q());
+    a.fill_uniform(params.log_base2k(), a.limbs(), &mut source_xa);
+    gadget_product_thread_safe(params.module(), &mut res, &a, &gadget_ct, &mut tmp_bytes);
 
-    let mut ct_out: Ciphertext = Ciphertext::new(params.module(), params.log_base2k(), params.log_q()+17, 1, ct.log_scale());
+    println!("a.limbs()={}", a.limbs());
+    println!("gadget_ct.rows()={}", gadget_ct.rows());
+    println!("gadget_ct.cols()={}", gadget_ct.cols());
+    println!("res.limbs()={}", res.limbs());
+    println!();
 
-    gadget_product_thread_safe(params.module(), &mut ct_out, &ct, &swk.0, &mut tmp_bytes);
+    println!("a:");
+    a.print_limbs(a.limbs(), 16);
+    println!();
 
-    pt_out.zero();
+    println!("m:");
+    println!("{:?}", &m.0[..16]);
+    println!();
 
-    params.decrypt_rlwe_thread_safe(&mut pt_out, &ct_out, &sk1_svp_ppol, &mut tmp_bytes);
+    let mut a_res: Elem = Elem::new(params.module(), params.log_base2k(), params.log_q(), 0, 0);
 
-    pt_out.0.value[0].print_limbs(pt_out.limbs(), 16);
+    decrypt_rlwe_thread_safe(
+        params.module(),
+        &mut a_res,
+        &res,
+        &sk_svp_ppol,
+        &mut tmp_bytes,
+    );
 
-    let mut have = vec![i64::default(); params.n()];
+    let mut m_svp_ppol = params.module().new_svp_ppol();
+    params.module().svp_prepare(&mut m_svp_ppol, &m);
 
-    //println!("pt_out: {}", log_k);
-    //pt_out.0.value[0].decode_vec_i64(pt_out.log_base2k(), log_k, &mut have);
+    let mut a_dft: VecZnxDft = params.module().new_vec_znx_dft(a.limbs());
+    let mut a_big: VecZnxBig = a_dft.as_vec_znx_big();
 
-    //println!("want: {:?}", &want[..16]);
-    //println!("have: {:?}", &have[..16]);
- 
+    params
+        .module()
+        .svp_apply_dft(&mut a_dft, &m_svp_ppol, &a, a.limbs());
+    params
+        .module()
+        .vec_znx_idft_tmp_a(&mut a_big, &mut a_dft, a.limbs());
+    params
+        .module()
+        .vec_znx_big_normalize(params.log_base2k(), &mut a, &a_big, &mut tmp_bytes);
+
+    params.module().vec_znx_sub_inplace(&mut a, &a_res.value[0]);
+
+    println!("a*m - dec(a * GRLWE(m))");
+    a.print_limbs(a.limbs(), 16);
 }
-
-
-pub fn cast_mut_u64_to_mut_u8_slice(data: &mut [u64]) -> &mut [u8] {
-    let ptr: *mut u8 = data.as_mut_ptr() as *mut u8;
-    let len: usize = data.len() * std::mem::size_of::<u64>();
-    unsafe { std::slice::from_raw_parts_mut(ptr, len) }
-}