chore(hlapi): remove Wop

tfhe/benches/high_level_api/bench.rs

@@ -108,8 +108,7 @@ bench_type!(FheUint64);
 bench_type!(FheUint128);
 
 fn main() {
-    let config =
-        ConfigBuilder::with_custom_parameters(PARAM_MESSAGE_2_CARRY_2_KS_PBS, None).build();
+    let config = ConfigBuilder::with_custom_parameters(PARAM_MESSAGE_2_CARRY_2_KS_PBS).build();
     let cks = ClientKey::generate(config);
     let compressed_sks = CompressedServerKey::new(&cks);
 

tfhe/docs/fundamentals/compress.md

@@ -66,7 +66,7 @@ use tfhe::{
 };
 
 fn main() {
-    let config = tfhe::ConfigBuilder::with_custom_parameters(PARAM_MESSAGE_2_CARRY_2, None)
+    let config = tfhe::ConfigBuilder::with_custom_parameters(PARAM_MESSAGE_2_CARRY_2)
         .enable_compression(COMP_PARAM_MESSAGE_2_CARRY_2)
         .build();
 
@@ -212,7 +212,6 @@ fn main() {
     let config = ConfigBuilder::default()
         .use_custom_parameters(
             tfhe::shortint::parameters::PARAM_MESSAGE_2_CARRY_2_COMPACT_PK_KS_PBS,
-            None,
         )
         .build();
     let (client_key, _) = generate_keys(config);

tfhe/docs/fundamentals/serialization.md

@@ -113,7 +113,7 @@ fn main() {
     let params_2 = PARAM_MESSAGE_2_CARRY_2_PBS_KS;
 
     let (client_key, server_key) = generate_keys(
-        ConfigBuilder::with_custom_parameters(params_1, None).build()
+        ConfigBuilder::with_custom_parameters(params_1).build()
     );
 
     let conformance_params_1 = FheUint8ConformanceParams::from(params_1);

tfhe/docs/guides/parallelized_pbs.md

@@ -18,7 +18,6 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
     let config = ConfigBuilder::default()
         .use_custom_parameters(
            tfhe::shortint::parameters::PARAM_MULTI_BIT_MESSAGE_2_CARRY_2_GROUP_3_KS_PBS,
-           None,
         )
         .build();
 
@@ -52,7 +51,6 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
     let config = ConfigBuilder::default()
         .use_custom_parameters(
            tfhe::shortint::parameters::PARAM_MULTI_BIT_MESSAGE_2_CARRY_2_GROUP_3_KS_PBS.with_deterministic_execution(),
-           None,
         )
         .build();
 

tfhe/docs/guides/public_key.md

@@ -46,7 +46,6 @@ fn main() {
      let config = ConfigBuilder::default()
         .use_custom_parameters(
             tfhe::shortint::parameters::PARAM_MESSAGE_2_CARRY_2_COMPACT_PK_KS_PBS,
-            None,
         )
         .build();
     let (client_key, _) = generate_keys(config);

tfhe/docs/guides/run_on_gpu.md

@@ -133,7 +133,7 @@ Finally, the client decrypts the results using:
 **TFHE-rs** allows to leverage the high number of threads given by a GPU. To maximize the number of GPU threads, update your configuration accordingly:
 
 ```Rust
-let config = ConfigBuilder::with_custom_parameters(PARAM_GPU_MULTI_BIT_MESSAGE_2_CARRY_2_GROUP_3_KS_PBS, None).build();
+let config = ConfigBuilder::with_custom_parameters(PARAM_GPU_MULTI_BIT_MESSAGE_2_CARRY_2_GROUP_3_KS_PBS).build();
 ```
 
 Here's the complete example:
@@ -145,7 +145,7 @@ use tfhe::shortint::parameters::PARAM_GPU_MULTI_BIT_MESSAGE_2_CARRY_2_GROUP_3_KS
 
 fn main() {
 
-    let config = ConfigBuilder::with_custom_parameters(PARAM_GPU_MULTI_BIT_MESSAGE_2_CARRY_2_GROUP_3_KS_PBS, None).build();
+    let config = ConfigBuilder::with_custom_parameters(PARAM_GPU_MULTI_BIT_MESSAGE_2_CARRY_2_GROUP_3_KS_PBS).build();
 
     let client_key= ClientKey::generate(config);
     let compressed_server_key = CompressedServerKey::new(&client_key);

tfhe/docs/guides/zk-pok.md

@@ -21,7 +21,7 @@ pub fn main() -> Result<(), Box<dyn std::error::Error>> {
 
     let params =
         tfhe::shortint::parameters::PARAM_MESSAGE_2_CARRY_2_KS_PBS_TUNIFORM_2M64;
-    let config = tfhe::ConfigBuilder::with_custom_parameters(params, None);
+    let config = tfhe::ConfigBuilder::with_custom_parameters(params);
 
     let client_key = tfhe::ClientKey::generate(config.clone());
     // This is done in an offline phase and the CRS is shared to all clients and the server
@@ -91,7 +91,7 @@ pub fn main() -> Result<(), Box<dyn std::error::Error>> {
     // And parameters allowing to keyswitch/cast to the computation parameters.
     let casting_params = tfhe::shortint::parameters::key_switching::PARAM_KEYSWITCH_MESSAGE_2_CARRY_2_KS_PBS_TUNIFORM_2M64;
     // Enable the dedicated parameters on the config
-    let config = tfhe::ConfigBuilder::with_custom_parameters(params, None)
+    let config = tfhe::ConfigBuilder::with_custom_parameters(params)
         .use_dedicated_compact_public_key_parameters((cpk_params, casting_params));
 
     // Then use TFHE-rs as usual

tfhe/examples/dist_tuniform.rs

@@ -11,7 +11,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
     my_params.glwe_noise_distribution = DynamicDistribution::new_t_uniform(10);
 
     let config = ConfigBuilder::default()
-        .use_custom_parameters(my_params, None)
+        .use_custom_parameters(my_params)
         .build();
 
     let (keys, server_keys) = generate_keys(config);

tfhe/examples/sha256.rs

@@ -186,14 +186,12 @@ fn main() -> Result<(), std::io::Error> {
     println!("key gen start");
     let config = match args.multibit {
         None => ConfigBuilder::default(),
-        Some(2) => ConfigBuilder::with_custom_parameters(
-            PARAM_MULTI_BIT_MESSAGE_2_CARRY_2_GROUP_2_KS_PBS,
-            None,
-        ),
-        Some(3) => ConfigBuilder::with_custom_parameters(
-            PARAM_MULTI_BIT_MESSAGE_2_CARRY_2_GROUP_3_KS_PBS,
-            None,
-        ),
+        Some(2) => {
+            ConfigBuilder::with_custom_parameters(PARAM_MULTI_BIT_MESSAGE_2_CARRY_2_GROUP_2_KS_PBS)
+        }
+        Some(3) => {
+            ConfigBuilder::with_custom_parameters(PARAM_MULTI_BIT_MESSAGE_2_CARRY_2_GROUP_3_KS_PBS)
+        }
         Some(v) => {
             panic!("Invalid multibit setting {v}");
         }

tfhe/examples/utilities/hlapi_compact_pk_ct_sizes.rs

@@ -41,7 +41,7 @@ pub fn cpk_and_cctl_sizes(results_file: &Path) {
     {
         let params = PARAM_MESSAGE_2_CARRY_2_COMPACT_PK_KS_PBS;
         let config = ConfigBuilder::default()
-            .use_custom_parameters(params, None)
+            .use_custom_parameters(params)
             .build();
         let (client_key, _) = generate_keys(config);
         let test_name = format!("hlapi_sizes_{}_cpk", params.name());
@@ -99,7 +99,7 @@ pub fn cpk_and_cctl_sizes(results_file: &Path) {
     {
         let params = PARAM_MESSAGE_2_CARRY_2_COMPACT_PK_PBS_KS;
         let config = ConfigBuilder::default()
-            .use_custom_parameters(params, None)
+            .use_custom_parameters(params)
             .build();
         let (client_key, _) = generate_keys(config);
         let test_name = format!("hlapi_sizes_{}_cpk", params.name());
@@ -158,7 +158,7 @@ pub fn cpk_and_cctl_sizes(results_file: &Path) {
     {
         let params = PARAM_MESSAGE_2_CARRY_2_COMPACT_PK_KS_PBS;
         let config = ConfigBuilder::default()
-            .use_custom_parameters(params, None)
+            .use_custom_parameters(params)
             .build();
         let (client_key, _) = generate_keys(config);
 
@@ -206,7 +206,7 @@ pub fn cpk_and_cctl_sizes(results_file: &Path) {
     {
         let params = PARAM_MESSAGE_2_CARRY_2_COMPACT_PK_PBS_KS;
         let config = ConfigBuilder::default()
-            .use_custom_parameters(params, None)
+            .use_custom_parameters(params)
             .build();
         let (client_key, _) = generate_keys(config);
 

tfhe/src/c_api/high_level_api/config.rs

@@ -69,9 +69,7 @@ pub unsafe extern "C" fn config_builder_use_custom_parameters(
         let params: crate::shortint::ClassicPBSParameters =
             shortint_block_parameters.try_into().unwrap();
 
-        let inner = Box::from_raw(*builder)
-            .0
-            .use_custom_parameters(params, None);
+        let inner = Box::from_raw(*builder).0.use_custom_parameters(params);
         *builder = Box::into_raw(Box::new(ConfigBuilder(inner)));
     })
 }

tfhe/src/high_level_api/backward_compatibility/keys.rs

@@ -76,7 +76,6 @@ impl Upgrade<IntegerClientKey> for IntegerClientKeyV0 {
     fn upgrade(self) -> Result<IntegerClientKey, Self::Error> {
         Ok(IntegerClientKey {
             key: self.key,
-            wopbs_block_parameters: self.wopbs_block_parameters,
             dedicated_compact_private_key: None,
             compression_key: None,
         })
@@ -102,7 +101,6 @@ impl Upgrade<IntegerServerKey> for IntegerServerKeyV0 {
     fn upgrade(self) -> Result<IntegerServerKey, Self::Error> {
         Ok(IntegerServerKey {
             key: self.key,
-            wopbs_key: self.wopbs_key,
             cpk_key_switching_key_material: None,
             compression_key: None,
             decompression_key: None,

tfhe/src/high_level_api/booleans/tests.rs

@@ -676,7 +676,7 @@ mod cpu {
     fn test_safe_deserialize_conformant_fhe_bool() {
         let block_params = PARAM_MESSAGE_2_CARRY_2_KS_PBS;
         let (client_key, server_key) =
-            generate_keys(ConfigBuilder::with_custom_parameters(block_params, None));
+            generate_keys(ConfigBuilder::with_custom_parameters(block_params));
         set_server_key(server_key.clone());
 
         let clear_a = random::<bool>();
@@ -698,7 +698,7 @@ mod cpu {
     fn test_safe_deserialize_conformant_compressed_fhe_bool() {
         let block_params = PARAM_MESSAGE_2_CARRY_2_KS_PBS;
         let (client_key, server_key) =
-            generate_keys(ConfigBuilder::with_custom_parameters(block_params, None));
+            generate_keys(ConfigBuilder::with_custom_parameters(block_params));
         set_server_key(server_key.clone());
         let clear_a = random::<bool>();
         let a = CompressedFheBool::encrypt(clear_a, &client_key);

tfhe/src/high_level_api/compact_list.rs

@@ -382,7 +382,6 @@ mod tests {
 
         let config = crate::ConfigBuilder::with_custom_parameters(
             PARAM_MESSAGE_2_CARRY_2_KS_PBS_TUNIFORM_2M64,
-            None,
         )
         .build();
 
@@ -446,7 +445,6 @@ mod tests {
 
         let config = crate::ConfigBuilder::with_custom_parameters(
             PARAM_MESSAGE_2_CARRY_2_KS_PBS_TUNIFORM_2M64,
-            None,
         )
         .use_dedicated_compact_public_key_parameters((
             PARAM_PKE_MESSAGE_2_CARRY_2_KS_PBS_TUNIFORM_2M64,

tfhe/src/high_level_api/compressed_ciphertext_list.rs

@@ -167,7 +167,6 @@ mod tests {
     fn test_compressed_ct_list() {
         let config = crate::ConfigBuilder::with_custom_parameters(
             PARAM_MESSAGE_2_CARRY_2_KS_PBS_TUNIFORM_2M64,
-            None,
         )
         .enable_compression(COMP_PARAM_MESSAGE_2_CARRY_2_KS_PBS_TUNIFORM_2M64)
         .build();

tfhe/src/high_level_api/config.rs

@@ -36,12 +36,6 @@ impl Default for ConfigBuilder {
 }
 
 impl ConfigBuilder {
-    #[doc(hidden)]
-    pub fn enable_function_evaluation(mut self) -> Self {
-        self.config.inner.enable_wopbs();
-        self
-    }
-
     pub fn enable_compression(mut self, compression_parameters: CompressionParameters) -> Self {
         self.config.inner.enable_compression(compression_parameters);
 
@@ -70,16 +64,13 @@ impl ConfigBuilder {
         }
     }
 
-    pub fn with_custom_parameters<P>(
-        block_parameters: P,
-        wopbs_block_parameters: Option<crate::shortint::WopbsParameters>,
-    ) -> Self
+    pub fn with_custom_parameters<P>(block_parameters: P) -> Self
     where
         P: Into<crate::shortint::PBSParameters>,
     {
         Self {
             config: Config {
-                inner: IntegerConfig::new(block_parameters.into(), wopbs_block_parameters, None),
+                inner: IntegerConfig::new(block_parameters.into(), None),
             },
         }
     }
@@ -96,16 +87,11 @@ impl ConfigBuilder {
         self
     }
 
-    pub fn use_custom_parameters<P>(
-        mut self,
-        block_parameters: P,
-        wopbs_block_parameters: Option<crate::shortint::WopbsParameters>,
-    ) -> Self
+    pub fn use_custom_parameters<P>(mut self, block_parameters: P) -> Self
     where
         P: Into<crate::shortint::PBSParameters>,
     {
-        self.config.inner =
-            IntegerConfig::new(block_parameters.into(), wopbs_block_parameters, None);
+        self.config.inner = IntegerConfig::new(block_parameters.into(), None);
         self
     }
 

tfhe/src/high_level_api/integers/signed/tests.rs

@@ -279,7 +279,6 @@ fn test_multi_bit_rotate() {
     let config = ConfigBuilder::default()
         .use_custom_parameters(
             crate::shortint::parameters::PARAM_MULTI_BIT_MESSAGE_2_CARRY_2_GROUP_3_KS_PBS,
-            None,
         )
         .build();
     fhe_int64_rotate(config);
@@ -368,7 +367,6 @@ fn test_multi_div_rem() {
     let config = ConfigBuilder::default()
         .use_custom_parameters(
             crate::shortint::parameters::PARAM_MULTI_BIT_MESSAGE_2_CARRY_2_GROUP_3_KS_PBS,
-            None,
         )
         .build();
     fhe_int32_div_rem(config);
@@ -546,7 +544,6 @@ fn test_compact_public_key_big() {
     let config = ConfigBuilder::default()
         .use_custom_parameters(
             crate::shortint::parameters::classic::compact_pk::PARAM_MESSAGE_2_CARRY_2_COMPACT_PK_KS_PBS,
-            None,
         )
         .build();
     let (client_key, _) = generate_keys(config);
@@ -567,7 +564,6 @@ fn test_compact_public_key_small() {
     let config = ConfigBuilder::default()
         .use_custom_parameters(
             crate::shortint::parameters::classic::compact_pk::PARAM_MESSAGE_2_CARRY_2_COMPACT_PK_PBS_KS,
-            None,
         )
         .build();
     let (client_key, _) = generate_keys(config);
@@ -646,7 +642,7 @@ fn test_leading_trailing_zeros_ones() {
 fn test_safe_deserialize_conformant_fhe_int32() {
     let block_params = PARAM_MESSAGE_2_CARRY_2_KS_PBS;
     let (client_key, server_key) =
-        generate_keys(ConfigBuilder::with_custom_parameters(block_params, None));
+        generate_keys(ConfigBuilder::with_custom_parameters(block_params));
     set_server_key(server_key.clone());
 
     let clear_a = random::<i32>();
@@ -668,7 +664,7 @@ fn test_safe_deserialize_conformant_fhe_int32() {
 fn test_safe_deserialize_conformant_compressed_fhe_int32() {
     let block_params = PARAM_MESSAGE_2_CARRY_2_KS_PBS;
     let (client_key, server_key) =
-        generate_keys(ConfigBuilder::with_custom_parameters(block_params, None));
+        generate_keys(ConfigBuilder::with_custom_parameters(block_params));
     set_server_key(server_key.clone());
 
     let clear_a = random::<i32>();

tfhe/src/high_level_api/integers/unsigned/mod.rs

@@ -15,7 +15,6 @@ pub(in crate::high_level_api) use inner::RadixCiphertextVersionOwned;
 mod base;
 mod compressed;
 mod static_;
-mod wopbs;
 
 mod encrypt;
 mod inner;