clippy + cleanup

2026-02-10 05:06:44 +01:00 · 2025-12-01 22:07:03 -05:00
parent 48407ccefc
commit 4a6c96dfc8
4 changed files with 43 additions and 82 deletions
--- a/poulpy-schemes/benches/bdd_arithmetic.rs
+++ b/poulpy-schemes/benches/bdd_arithmetic.rs
@@ -2,7 +2,7 @@ use std::hint::black_box;

 use criterion::{BenchmarkId, Criterion, criterion_group, criterion_main};
 use poulpy_core::{
-    GGSWNoise, GLWEDecrypt, GLWEEncryptSk, GLWEExternalProduct, LWEEncryptSk, ScratchTakeCore,
+    GLWEDecrypt, GLWEEncryptSk, LWEEncryptSk, ScratchTakeCore,
    layouts::{
        Base2K, Degree, Dnum, Dsize, GGLWEToGGSWKeyLayout, GGSWLayout, GGSWPreparedFactory, GLWEAutomorphismKeyLayout,
        GLWELayout, GLWESecret, GLWESecretPrepared, GLWESecretPreparedFactory, GLWESwitchingKeyLayout, GLWEToLWEKeyLayout,
@@ -17,7 +17,7 @@ pub use poulpy_cpu_avx::FFT64Avx as BackendImpl;
 pub use poulpy_cpu_ref::FFT64Ref as BackendImpl;

 use poulpy_hal::{
-    api::{ModuleN, ModuleNew, ScratchOwnedAlloc, ScratchOwnedBorrow, VecZnxRotateInplace},
+    api::{ModuleN, ModuleNew, ScratchOwnedAlloc, ScratchOwnedBorrow},
    layouts::{Backend, Module, Scratch, ScratchOwned},
    source::Source,
 };
@@ -30,8 +30,7 @@ use poulpy_schemes::bin_fhe::{
        BlindRotationAlgo, BlindRotationKey, BlindRotationKeyFactory, BlindRotationKeyInfos, BlindRotationKeyLayout, CGGI,
    },
    circuit_bootstrapping::{
-        CircuitBootstrappingKey, CircuitBootstrappingKeyEncryptSk, CircuitBootstrappingKeyLayout,
-        CircuitBootstrappingKeyPrepared, CircuitBootstrappingKeyPreparedFactory, CirtuitBootstrappingExecute,
+        CircuitBootstrappingKey, CircuitBootstrappingKeyEncryptSk, CircuitBootstrappingKeyLayout, CircuitBootstrappingKeyPrepared,
    },
 };

@@ -58,16 +57,10 @@ where
    Module<BE>: ModuleNew<BE>
        + ModuleN
        + GLWESecretPreparedFactory<BE>
-        + GLWEExternalProduct<BE>
        + GLWEDecrypt<BE>
-        + LWEEncryptSk<BE>
        + CircuitBootstrappingKeyEncryptSk<BRA, BE>
-        + CircuitBootstrappingKeyPreparedFactory<BRA, BE>
-        + CirtuitBootstrappingExecute<BRA, BE>
        + GGSWPreparedFactory<BE>
-        + GGSWNoise<BE>
        + GLWEEncryptSk<BE>
-        + VecZnxRotateInplace<BE>
        + BDDKeyEncryptSk<BRA, BE>
        + BDDKeyPreparedFactory<BRA, BE>
        + FheUintPrepare<BRA, BE>
@@ -169,7 +162,7 @@ where
        a_enc_prepared,
        b_enc_prepared,
        bdd_key_prepared,
-        glwe_layout: params.glwe_layout.clone(),
+        glwe_layout: params.glwe_layout,
    }
 }

@@ -220,16 +213,11 @@ fn bench_operation<BE: Backend, BRA: BlindRotationAlgo, F>(
    Module<BE>: ModuleNew<BE>
        + ModuleN
        + GLWESecretPreparedFactory<BE>
-        + GLWEExternalProduct<BE>
        + GLWEDecrypt<BE>
        + LWEEncryptSk<BE>
        + CircuitBootstrappingKeyEncryptSk<BRA, BE>
-        + CircuitBootstrappingKeyPreparedFactory<BRA, BE>
-        + CirtuitBootstrappingExecute<BRA, BE>
        + GGSWPreparedFactory<BE>
-        + GGSWNoise<BE>
        + GLWEEncryptSk<BE>
-        + VecZnxRotateInplace<BE>
        + BDDKeyEncryptSk<BRA, BE>
        + BDDKeyPreparedFactory<BRA, BE>
        + FheUintPrepare<BRA, BE>
@@ -257,16 +245,11 @@ where
    Module<BE>: ModuleNew<BE>
        + ModuleN
        + GLWESecretPreparedFactory<BE>
-        + GLWEExternalProduct<BE>
        + GLWEDecrypt<BE>
        + LWEEncryptSk<BE>
        + CircuitBootstrappingKeyEncryptSk<BRA, BE>
-        + CircuitBootstrappingKeyPreparedFactory<BRA, BE>
-        + CirtuitBootstrappingExecute<BRA, BE>
        + GGSWPreparedFactory<BE>
-        + GGSWNoise<BE>
        + GLWEEncryptSk<BE>
-        + VecZnxRotateInplace<BE>
        + BDDKeyEncryptSk<BRA, BE>
        + BDDKeyPreparedFactory<BRA, BE>
        + FheUintPrepare<BRA, BE>
@@ -286,7 +269,7 @@ where
    const RANK: u32 = 2;

    let params: Params = Params {
-        name: String::from(format!("n_glwe={N_GLWE}")),
+        name: format!("n_glwe={N_GLWE}"),
        block_size: BINARY_BLOCK_SIZE as usize,
        glwe_layout: GLWELayout {
            n: Degree(N_GLWE),
--- a/poulpy-schemes/benches/bdd_prepare.rs
+++ b/poulpy-schemes/benches/bdd_prepare.rs
@@ -2,7 +2,7 @@ use std::hint::black_box;

 use criterion::{BenchmarkId, Criterion, criterion_group, criterion_main};
 use poulpy_core::{
-    GGSWNoise, GLWEDecrypt, GLWEEncryptSk, GLWEExternalProduct, LWEEncryptSk, ScratchTakeCore,
+    GLWEDecrypt, GLWEEncryptSk, ScratchTakeCore,
    layouts::{
        Base2K, Degree, Dnum, Dsize, GGLWEToGGSWKeyLayout, GGSWLayout, GGSWPreparedFactory, GLWEAutomorphismKeyLayout,
        GLWELayout, GLWESecret, GLWESecretPrepared, GLWESecretPreparedFactory, GLWESwitchingKeyLayout, GLWEToLWEKeyLayout,
@@ -17,22 +17,18 @@ pub use poulpy_cpu_avx::FFT64Avx as BackendImpl;
 pub use poulpy_cpu_ref::FFT64Ref as BackendImpl;

 use poulpy_hal::{
-    api::{ModuleN, ModuleNew, ScratchOwnedAlloc, ScratchOwnedBorrow, VecZnxRotateInplace},
+    api::{ModuleN, ModuleNew, ScratchOwnedAlloc, ScratchOwnedBorrow},
    layouts::{Backend, Module, Scratch, ScratchOwned},
    source::Source,
 };
 use poulpy_schemes::bin_fhe::{
    bdd_arithmetic::{
-        BDDKey, BDDKeyEncryptSk, BDDKeyLayout, BDDKeyPrepared, BDDKeyPreparedFactory, ExecuteBDDCircuit2WTo1W, FheUint,
-        FheUintPrepare, FheUintPrepared,
+        BDDKey, BDDKeyEncryptSk, BDDKeyLayout, BDDKeyPrepared, BDDKeyPreparedFactory, FheUint, FheUintPrepare, FheUintPrepared,
    },
    blind_rotation::{
        BlindRotationAlgo, BlindRotationKey, BlindRotationKeyFactory, BlindRotationKeyInfos, BlindRotationKeyLayout, CGGI,
    },
-    circuit_bootstrapping::{
-        CircuitBootstrappingKeyEncryptSk, CircuitBootstrappingKeyLayout, CircuitBootstrappingKeyPreparedFactory,
-        CirtuitBootstrappingExecute,
-    },
+    circuit_bootstrapping::{CircuitBootstrappingKeyEncryptSk, CircuitBootstrappingKeyLayout},
 };

 pub fn benc_bdd_prepare<BE: Backend, BRA: BlindRotationAlgo>(c: &mut Criterion, label: &str)
@@ -40,20 +36,13 @@ where
    Module<BE>: ModuleNew<BE>
        + ModuleN
        + GLWESecretPreparedFactory<BE>
-        + GLWEExternalProduct<BE>
        + GLWEDecrypt<BE>
-        + LWEEncryptSk<BE>
        + CircuitBootstrappingKeyEncryptSk<BRA, BE>
-        + CircuitBootstrappingKeyPreparedFactory<BRA, BE>
-        + CirtuitBootstrappingExecute<BRA, BE>
        + GGSWPreparedFactory<BE>
-        + GGSWNoise<BE>
        + GLWEEncryptSk<BE>
-        + VecZnxRotateInplace<BE>
        + BDDKeyEncryptSk<BRA, BE>
        + BDDKeyPreparedFactory<BRA, BE>
-        + FheUintPrepare<BRA, BE>
-        + ExecuteBDDCircuit2WTo1W<BE>,
+        + FheUintPrepare<BRA, BE>,
    BlindRotationKey<Vec<u8>, BRA>: BlindRotationKeyFactory<BRA>, // TODO find a way to remove this bound or move it to CBT KEY
    ScratchOwned<BE>: ScratchOwnedAlloc<BE> + ScratchOwnedBorrow<BE>,
    Scratch<BE>: ScratchTakeCore<BE>,
@@ -75,20 +64,13 @@ where
        Module<BE>: ModuleNew<BE>
            + ModuleN
            + GLWESecretPreparedFactory<BE>
-            + GLWEExternalProduct<BE>
            + GLWEDecrypt<BE>
-            + LWEEncryptSk<BE>
            + CircuitBootstrappingKeyEncryptSk<BRA, BE>
-            + CircuitBootstrappingKeyPreparedFactory<BRA, BE>
-            + CirtuitBootstrappingExecute<BRA, BE>
            + GGSWPreparedFactory<BE>
-            + GGSWNoise<BE>
            + GLWEEncryptSk<BE>
-            + VecZnxRotateInplace<BE>
            + BDDKeyEncryptSk<BRA, BE>
            + BDDKeyPreparedFactory<BRA, BE>
-            + FheUintPrepare<BRA, BE>
-            + ExecuteBDDCircuit2WTo1W<BE>,
+            + FheUintPrepare<BRA, BE>,
        BlindRotationKey<Vec<u8>, BRA>: BlindRotationKeyFactory<BRA>, /* TODO find a way to remove this bound or move it to CBT KEY */
        ScratchOwned<BE>: ScratchOwnedAlloc<BE> + ScratchOwnedBorrow<BE>,
        Scratch<BE>: ScratchTakeCore<BE>,
@@ -157,7 +139,7 @@ where
    const RANK: u32 = 2;

    let params: Params = Params {
-        name: String::from(format!("n_glwe={N_GLWE}")),
+        name: format!("n_glwe={N_GLWE}"),
        block_size: BINARY_BLOCK_SIZE as usize,
        glwe_layout: GLWELayout {
            n: Degree(N_GLWE),
--- a/poulpy-schemes/examples/bdd_arithmetic.rs
+++ b/poulpy-schemes/examples/bdd_arithmetic.rs
@@ -1,7 +1,7 @@
 use std::collections::HashMap;

 use poulpy_core::{
-    GLWEDecrypt, GLWEEncryptSk, GLWEExternalProduct, LWEEncryptSk, ScratchTakeCore,
+    GLWEDecrypt, GLWEEncryptSk, ScratchTakeCore,
    layouts::{
        Base2K, Degree, Dnum, Dsize, GGLWEToGGSWKeyLayout, GGSWLayout, GGSWPreparedFactory, GLWEAutomorphismKeyLayout,
        GLWELayout, GLWESecret, GLWESecretPrepared, GLWESecretPreparedFactory, GLWESwitchingKeyLayout, GLWEToLWEKeyLayout,
@@ -9,7 +9,7 @@ use poulpy_core::{
    },
 };
 use poulpy_hal::{
-    api::{ModuleN, ModuleNew, ScratchOwnedAlloc, ScratchOwnedBorrow, VecZnxRotateInplace},
+    api::{ModuleN, ModuleNew, ScratchOwnedAlloc, ScratchOwnedBorrow},
    layouts::{Backend, Module, Scratch, ScratchOwned},
    source::Source,
 };
@@ -41,18 +41,17 @@ use poulpy_cpu_ref::FFT64Ref;
 //
 // - Result Decryption
 //
+// There also is an example use of the GLWE Blind Selection operation,
+// which can choose between any number of encrypted fheuint inputs

 fn example_bdd_arithmetic<BE: Backend, BRA: BlindRotationAlgo>()
 where
    Module<BE>: ModuleNew<BE>
        + ModuleN
        + GLWESecretPreparedFactory<BE>
-        + GLWEExternalProduct<BE>
        + GLWEDecrypt<BE>
-        + LWEEncryptSk<BE>
        + GGSWPreparedFactory<BE>
        + GLWEEncryptSk<BE>
-        + VecZnxRotateInplace<BE>
        + BDDKeyEncryptSk<BRA, BE>
        + BDDKeyPreparedFactory<BRA, BE>
        + FheUintPrepare<BRA, BE>
--- a/poulpy-schemes/examples/max_array.rs
+++ b/poulpy-schemes/examples/max_array.rs
@@ -76,8 +76,9 @@ where
        dsize: Dsize(1),
    };

-    // Used to generate CBT Keys
-    let cbt_layout = CircuitBootstrappingKeyLayout {
+    // Used to generate BDD Keys, for the arithmetic operations
+    let bdd_layout = BDDKeyLayout {
+        cbt_layout: CircuitBootstrappingKeyLayout {
            brk_layout: BlindRotationKeyLayout {
                n_glwe: Degree(N_GLWE),
                n_lwe: Degree(N_LWE),
@@ -102,11 +103,7 @@ where
                dsize: Dsize(1),
                rank: Rank(RANK),
            },
-    };
-
-    // Used to generate BDD Keys, for the arithmetic operations
-    let bdd_layout = BDDKeyLayout {
-        cbt_layout: cbt_layout,
+        },
        ks_glwe_layout: Some(GLWESwitchingKeyLayout {
            n: Degree(N_GLWE),
            base2k: Base2K(BASE2K),
@@ -212,7 +209,7 @@ where

        let mut input_i_enc_prepared: FheUintPrepared<Vec<u8>, u32, BE> =
            FheUintPrepared::alloc_from_infos(&module, &ggsw_layout);
-        input_i_enc_prepared.prepare(&module, &input_i, &bdd_key_prepared, scratch.borrow());
+        input_i_enc_prepared.prepare(&module, input_i, &bdd_key_prepared, scratch.borrow());

        // b = (input_i < max)
        compare_enc.sltu(