feat(integer): improve {overflowing_}scalar_add/sub

zama-ai · Aug 9, 2024 · b9b5d6f · b9b5d6f
1 parent 5340859
commit b9b5d6f
Show file tree

Hide file tree

Showing 10 changed files with 1,258 additions and 648 deletions.
diff --git a/tfhe/src/high_level_api/integers/signed/overflowing_ops.rs b/tfhe/src/high_level_api/integers/signed/overflowing_ops.rs
@@ -102,7 +102,7 @@ where
 impl<Id, Clear> OverflowingAdd<Clear> for &FheInt<Id>
 where
     Id: FheIntId,
-    Clear: SignedNumeric + DecomposableInto<u64>,
+    Clear: SignedNumeric + DecomposableInto<u64> + DecomposableInto<u8>,
 {
     type Output = FheInt<Id>;
 
@@ -155,7 +155,7 @@ where
 impl<Id, Clear> OverflowingAdd<Clear> for FheInt<Id>
 where
     Id: FheIntId,
-    Clear: SignedNumeric + DecomposableInto<u64>,
+    Clear: SignedNumeric + DecomposableInto<u64> + DecomposableInto<u8>,
 {
     type Output = Self;
 
@@ -192,7 +192,7 @@ where
 impl<Id, Clear> OverflowingAdd<&FheInt<Id>> for Clear
 where
     Id: FheIntId,
-    Clear: SignedNumeric + DecomposableInto<u64>,
+    Clear: SignedNumeric + DecomposableInto<u64> + DecomposableInto<u8>,
 {
     type Output = FheInt<Id>;
 
@@ -318,7 +318,10 @@ where
 impl<Id, Clear> OverflowingSub<Clear> for &FheInt<Id>
 where
     Id: FheIntId,
-    Clear: SignedNumeric + DecomposableInto<u64>,
+    Clear: SignedNumeric
+        + DecomposableInto<u8>
+        + std::ops::Not<Output = Clear>
+        + DecomposableInto<u64>,
 {
     type Output = FheInt<Id>;
 
@@ -369,7 +372,10 @@ where
 impl<Id, Clear> OverflowingSub<Clear> for FheInt<Id>
 where
     Id: FheIntId,
-    Clear: SignedNumeric + DecomposableInto<u64>,
+    Clear: SignedNumeric
+        + DecomposableInto<u8>
+        + std::ops::Not<Output = Clear>
+        + DecomposableInto<u64>,
 {
     type Output = Self;
 

diff --git a/tfhe/src/high_level_api/integers/unsigned/overflowing_ops.rs b/tfhe/src/high_level_api/integers/unsigned/overflowing_ops.rs
@@ -323,7 +323,7 @@ where
 impl<Id, Clear> OverflowingSub<Clear> for &FheUint<Id>
 where
     Id: FheUintId,
-    Clear: UnsignedNumeric + DecomposableInto<u8>,
+    Clear: UnsignedNumeric + DecomposableInto<u8> + std::ops::Not<Output = Clear>,
 {
     type Output = FheUint<Id>;
 
@@ -371,7 +371,7 @@ where
 impl<Id, Clear> OverflowingSub<Clear> for FheUint<Id>
 where
     Id: FheUintId,
-    Clear: UnsignedNumeric + DecomposableInto<u8>,
+    Clear: UnsignedNumeric + DecomposableInto<u8> + std::ops::Not<Output = Clear>,
 {
     type Output = Self;