refactor(all): decompress takes shared reference

remove from/into decompression
zama-ai · Mar 28, 2024 · c2c2bda · c2c2bda
1 parent a11d690
commit c2c2bda
Show file tree

Hide file tree

Showing 8 changed files with 34 additions and 42 deletions.
diff --git a/tfhe/src/c_api/high_level_api/integers.rs b/tfhe/src/c_api/high_level_api/integers.rs
@@ -308,7 +308,7 @@ macro_rules! create_integer_wrapper_type {
                 $crate::c_api::utils::catch_panic(|| {
                     let compressed = $crate::c_api::utils::get_ref_checked(sself).unwrap();
 
-                    let decompressed_inner = compressed.0.clone().into();
+                    let decompressed_inner = compressed.0.decompress();
                     *result = Box::into_raw(Box::new($name(decompressed_inner)));
                 })
             }

diff --git a/tfhe/src/c_api/shortint/ciphertext.rs b/tfhe/src/c_api/shortint/ciphertext.rs
@@ -87,7 +87,7 @@ pub unsafe extern "C" fn shortint_decompress_ciphertext(
 
         let compressed_ciphertext = get_ref_checked(compressed_ciphertext).unwrap();
 
-        let ciphertext = compressed_ciphertext.0.clone().into();
+        let ciphertext = compressed_ciphertext.0.decompress();
 
         let heap_allocated_ciphertext = Box::new(ShortintCiphertext(ciphertext));
 

diff --git a/tfhe/src/core_crypto/entities/seeded_lwe_ciphertext.rs b/tfhe/src/core_crypto/entities/seeded_lwe_ciphertext.rs
@@ -156,15 +156,15 @@ impl<Scalar: UnsignedInteger> SeededLweCiphertext<Scalar> {
     /// [`LweCiphertext`].
     ///
     /// See [`SeededLweCiphertext::from_scalar`] for usage.
-    pub fn decompress_into_lwe_ciphertext(self) -> LweCiphertextOwned<Scalar>
+    pub fn decompress_into_lwe_ciphertext(&self) -> LweCiphertextOwned<Scalar>
     where
         Scalar: UnsignedTorus,
     {
         let mut decompressed_ct =
             LweCiphertext::new(Scalar::ZERO, self.lwe_size(), self.ciphertext_modulus());
         decompress_seeded_lwe_ciphertext::<_, _, ActivatedRandomGenerator>(
             &mut decompressed_ct,
-            &self,
+            self,
         );
         decompressed_ct
     }

diff --git a/tfhe/src/high_level_api/integers/signed/compressed.rs b/tfhe/src/high_level_api/integers/signed/compressed.rs
@@ -68,8 +68,8 @@ where
     /// Decompress to a [FheInt]
     ///
     /// See [CompressedFheInt] example.
-    pub fn decompress(self) -> FheInt<Id> {
-        let inner = self.ciphertext.into();
+    pub fn decompress(&self) -> FheInt<Id> {
+        let inner = self.ciphertext.decompress();
         FheInt::new(inner)
     }
 }

diff --git a/tfhe/src/high_level_api/integers/unsigned/compressed.rs b/tfhe/src/high_level_api/integers/unsigned/compressed.rs
@@ -67,8 +67,8 @@ where
     /// Decompress to a [FheUint]
     ///
     /// See [CompressedFheUint] example.
-    pub fn decompress(self) -> FheUint<Id> {
-        let inner: crate::integer::RadixCiphertext = self.ciphertext.into();
+    pub fn decompress(&self) -> FheUint<Id> {
+        let inner: crate::integer::RadixCiphertext = self.ciphertext.decompress();
         let mut ciphertext = FheUint::new(inner);
         ciphertext.move_to_device_of_server_key_if_set();
         ciphertext

diff --git a/tfhe/src/integer/ciphertext/compressed.rs b/tfhe/src/integer/ciphertext/compressed.rs
@@ -21,13 +21,12 @@ impl ParameterSetConformant for CompressedRadixCiphertext {
     }
 }
 
-impl From<CompressedRadixCiphertext> for RadixCiphertext {
-    fn from(compressed: CompressedRadixCiphertext) -> Self {
-        Self::from(
-            compressed
-                .blocks
-                .into_iter()
-                .map(From::from)
+impl CompressedRadixCiphertext {
+    pub fn decompress(&self) -> RadixCiphertext {
+        RadixCiphertext::from(
+            self.blocks
+                .iter()
+                .map(CompressedCiphertext::decompress)
                 .collect::<Vec<_>>(),
         )
     }
@@ -49,13 +48,12 @@ impl ParameterSetConformant for CompressedSignedRadixCiphertext {
     }
 }
 
-impl From<CompressedSignedRadixCiphertext> for SignedRadixCiphertext {
-    fn from(compressed: CompressedSignedRadixCiphertext) -> Self {
-        Self::from(
-            compressed
-                .blocks
-                .into_iter()
-                .map(From::from)
+impl CompressedSignedRadixCiphertext {
+    pub fn decompress(&self) -> SignedRadixCiphertext {
+        SignedRadixCiphertext::from(
+            self.blocks
+                .iter()
+                .map(CompressedCiphertext::decompress)
                 .collect::<Vec<_>>(),
         )
     }
@@ -64,14 +62,14 @@ impl From<CompressedSignedRadixCiphertext> for SignedRadixCiphertext {
 /// Structure containing a **compressed** ciphertext in CRT decomposition.
 pub type CompressedCrtCiphertext = BaseCrtCiphertext<CompressedCiphertext>;
 
-impl From<CompressedCrtCiphertext> for CrtCiphertext {
-    fn from(compressed: CompressedCrtCiphertext) -> Self {
-        let blocks = compressed
+impl CompressedCrtCiphertext {
+    pub fn decompress(&self) -> CrtCiphertext {
+        let blocks = self
             .blocks
-            .into_iter()
-            .map(From::from)
+            .iter()
+            .map(CompressedCiphertext::decompress)
             .collect::<Vec<_>>();
-        let moduli = compressed.moduli;
-        Self::from((blocks, moduli))
+        let moduli = self.moduli.clone();
+        CrtCiphertext::from((blocks, moduli))
     }
 }
diff --git a/tfhe/src/js_on_wasm_api/shortint.rs b/tfhe/src/js_on_wasm_api/shortint.rs
@@ -431,7 +431,7 @@ impl Shortint {
         compressed_ciphertext: &ShortintCompressedCiphertext,
     ) -> ShortintCiphertext {
         set_hook(Box::new(console_error_panic_hook::hook));
-        ShortintCiphertext(compressed_ciphertext.0.clone().into())
+        ShortintCiphertext(compressed_ciphertext.0.decompress())
     }
 
     #[wasm_bindgen]

diff --git a/tfhe/src/shortint/ciphertext/compressed.rs b/tfhe/src/shortint/ciphertext/compressed.rs
@@ -34,7 +34,7 @@ impl ParameterSetConformant for CompressedCiphertext {
 }
 
 impl CompressedCiphertext {
-    pub fn decompress(self) -> Ciphertext {
+    pub fn decompress(&self) -> Ciphertext {
         let Self {
             ct,
             degree,
@@ -46,11 +46,11 @@ impl CompressedCiphertext {
 
         Ciphertext {
             ct: ct.decompress_into_lwe_ciphertext(),
-            degree,
-            message_modulus,
-            carry_modulus,
-            pbs_order,
-            noise_level,
+            degree: *degree,
+            message_modulus: *message_modulus,
+            carry_modulus: *carry_modulus,
+            pbs_order: *pbs_order,
+            noise_level: *noise_level,
         }
     }
 
@@ -103,9 +103,3 @@ impl CompressedCiphertext {
         }
     }
 }
-
-impl From<CompressedCiphertext> for Ciphertext {
-    fn from(value: CompressedCiphertext) -> Self {
-        value.decompress()
-    }
-}