diff --git a/poulpy-backend/src/cpu_fft64_avx/reim/conversion.rs b/poulpy-backend/src/cpu_fft64_avx/reim/conversion.rs index fbab715..5f16099 100644 --- a/poulpy-backend/src/cpu_fft64_avx/reim/conversion.rs +++ b/poulpy-backend/src/cpu_fft64_avx/reim/conversion.rs @@ -214,7 +214,6 @@ pub fn reim_to_znx_i64_inplace_bnd63_avx2_fma(res: &mut [f64], divisor: f64) { reim_to_znx_i64_inplace_ref(&mut res[span << 2..], divisor) } } - println!(); } /// # Correctness diff --git a/poulpy-core/src/noise/ggsw_ct.rs b/poulpy-core/src/noise/ggsw_ct.rs index ab8c2c4..b1b51e4 100644 --- a/poulpy-core/src/noise/ggsw_ct.rs +++ b/poulpy-core/src/noise/ggsw_ct.rs @@ -70,7 +70,6 @@ impl GGSWCiphertext { let std_pt: f64 = pt_have.data.std(basek, 0).log2(); let noise: f64 = max_noise(col_j); - println!("{} {}", std_pt, noise); assert!(std_pt <= noise, "{} > {}", std_pt, noise); pt.data.zero(); diff --git a/poulpy-core/src/tests/test_suite/automorphism/gglwe_atk.rs b/poulpy-core/src/tests/test_suite/automorphism/gglwe_atk.rs index 6349445..906fc89 100644 --- a/poulpy-core/src/tests/test_suite/automorphism/gglwe_atk.rs +++ b/poulpy-core/src/tests/test_suite/automorphism/gglwe_atk.rs @@ -256,10 +256,7 @@ where let p1: i64 = -5; (1..3).for_each(|rank| { (1..digits + 1).for_each(|di| { - println!( - "test_gglwe_automorphism_key_automorphism_inplace: {} rank: {}", - di, rank - ); + let k_apply: usize = (digits + di) * basek; let n: usize = module.n(); diff --git a/poulpy-core/src/tests/test_suite/automorphism/glwe_ct.rs b/poulpy-core/src/tests/test_suite/automorphism/glwe_ct.rs index 7726fd5..4eda5ff 100644 --- a/poulpy-core/src/tests/test_suite/automorphism/glwe_ct.rs +++ b/poulpy-core/src/tests/test_suite/automorphism/glwe_ct.rs @@ -201,10 +201,6 @@ where (1..4).for_each(|rank| { (1..digits + 1).for_each(|di| { let k_ksk: usize = k_ct + basek * di; - println!( - "test_glwe_automorphism_inplace digits: {} rank: {}", - di, rank - ); let n: usize = module.n(); let rows: usize = k_ct.div_ceil(basek * digits); diff --git a/poulpy-core/src/tests/test_suite/external_product/ggsw_ct.rs b/poulpy-core/src/tests/test_suite/external_product/ggsw_ct.rs index 5fa02f5..ceb95f9 100644 --- a/poulpy-core/src/tests/test_suite/external_product/ggsw_ct.rs +++ b/poulpy-core/src/tests/test_suite/external_product/ggsw_ct.rs @@ -76,7 +76,7 @@ where (1..3).for_each(|rank| { (1..digits + 1).for_each(|di| { let k_ggsw: usize = k_in + basek * di; - println!("test external_product digits: {} ranks: {}", di, rank); + let k_out: usize = k_in; // Better capture noise. let n: usize = module.n(); diff --git a/poulpy-core/src/tests/test_suite/packing.rs b/poulpy-core/src/tests/test_suite/packing.rs index 09b5591..f1cbe15 100644 --- a/poulpy-core/src/tests/test_suite/packing.rs +++ b/poulpy-core/src/tests/test_suite/packing.rs @@ -182,7 +182,7 @@ where pt.sub_inplace_ab(module, &pt_want); let noise_have: f64 = pt.std().log2(); - // println!("noise_have: {}", noise_have); + assert!( noise_have < -((k_ct - basek) as f64), "noise: {}", diff --git a/poulpy-hal/src/reference/fft64/reim4/arithmetic_ref.rs b/poulpy-hal/src/reference/fft64/reim4/arithmetic_ref.rs index 49817f3..26c774f 100644 --- a/poulpy-hal/src/reference/fft64/reim4/arithmetic_ref.rs +++ b/poulpy-hal/src/reference/fft64/reim4/arithmetic_ref.rs @@ -112,9 +112,6 @@ pub fn reim4_vec_mat1col_product_ref( assert!(v.len() >= nrows * 8, "v must be at least nrows * 8 doubles"); } - println!("u_ref: {:?}", &u[..nrows * 8]); - println!("v_ref: {:?}", &v[..nrows * 8]); - let mut acc: [f64; 8] = [0f64; 8]; let mut j = 0; for _ in 0..nrows { @@ -123,8 +120,6 @@ pub fn reim4_vec_mat1col_product_ref( } dst[0..8].copy_from_slice(&acc); - println!("dst_ref: {:?}", &dst[..8]); - println!(); } #[inline(always)] diff --git a/poulpy-hal/src/test_suite/svp.rs b/poulpy-hal/src/test_suite/svp.rs index 7f7fbac..fdaad56 100644 --- a/poulpy-hal/src/test_suite/svp.rs +++ b/poulpy-hal/src/test_suite/svp.rs @@ -206,9 +206,6 @@ where let res_big_ref: crate::layouts::VecZnxBig, BR> = module_ref.vec_znx_idft_apply_consume(res_dft_ref); let res_big_test: crate::layouts::VecZnxBig, BT> = module_test.vec_znx_idft_apply_consume(res_dft_test); - println!("res_big_ref: {}", res_big_ref); - println!("res_big_test: {}", res_big_test); - let mut res_ref: VecZnx> = VecZnx::alloc(n, cols, res_size); let mut res_test: VecZnx> = VecZnx::alloc(n, cols, res_size); @@ -462,8 +459,7 @@ pub fn test_svp_apply_dft_to_dft_inplace( ); } - println!("res_ref: {}", res_ref); - println!("res_test: {}", res_test); + assert_eq!(res_ref, res_test); } diff --git a/poulpy-schemes/examples/circuit_bootstrapping.rs b/poulpy-schemes/examples/circuit_bootstrapping.rs index 1852bfe..868e008 100644 --- a/poulpy-schemes/examples/circuit_bootstrapping.rs +++ b/poulpy-schemes/examples/circuit_bootstrapping.rs @@ -13,7 +13,7 @@ use poulpy_hal::{ source::Source, }; -use poulpy_backend::cpu_spqlios::FFT64Spqlios; +use poulpy_backend::{FFT64Avx}; use poulpy_schemes::tfhe::{ blind_rotation::CGGI, @@ -27,7 +27,7 @@ fn main() { let n_glwe: usize = 1024; // Module provides access to the backend arithmetic - let module: Module = Module::::new(n_glwe as u64); + let module: Module = Module::::new(n_glwe as u64); // Base 2 loga let basek: usize = 13; @@ -75,7 +75,7 @@ fn main() { let k_tsk: usize = (rows_tsk + 1) * basek; // Scratch space (4MB) - let mut scratch: ScratchOwned = ScratchOwned::alloc(1 << 22); + let mut scratch: ScratchOwned = ScratchOwned::alloc(1 << 22); // Secret key sampling source let mut source_xs: Source = Source::new([1u8; 32]); @@ -97,7 +97,7 @@ fn main() { // sk_glwe.fill_zero(); // GLWE secret prepared (opaque backend dependant write only struct) - let sk_glwe_prepared: GLWESecretPrepared, FFT64Spqlios> = sk_glwe.prepare_alloc(&module, scratch.borrow()); + let sk_glwe_prepared: GLWESecretPrepared, FFT64Avx> = sk_glwe.prepare_alloc(&module, scratch.borrow()); // Plaintext value to circuit bootstrap let data: i64 = 1 % (1 << k_lwe_pt); @@ -142,7 +142,7 @@ fn main() { let mut res: GGSWCiphertext> = GGSWCiphertext::alloc(n_glwe, basek, k_ggsw_res, rows_ggsw_res, 1, rank); // Circuit bootstrapping key prepared (opaque backend dependant write only struct) - let cbt_prepared: CircuitBootstrappingKeyPrepared, CGGI, FFT64Spqlios> = + let cbt_prepared: CircuitBootstrappingKeyPrepared, CGGI, FFT64Avx> = cbt_key.prepare_alloc(&module, scratch.borrow()); // Apply circuit bootstrapping: LWE(data * 2^{- (k_lwe_pt + 2)}) -> GGSW(data) @@ -194,7 +194,7 @@ fn main() { ); // Prepare GGSW output of circuit bootstrapping (opaque backend dependant write only struct) - let res_prepared: GGSWCiphertextPrepared, FFT64Spqlios> = res.prepare_alloc(&module, scratch.borrow()); + let res_prepared: GGSWCiphertextPrepared, FFT64Avx> = res.prepare_alloc(&module, scratch.borrow()); // Apply GLWE x GGSW ct_glwe.external_product_inplace(&module, &res_prepared, scratch.borrow());