chore(gpu): use wrapping byte add, update rust msrv

zama-ai · Jun 27, 2024 · 773adcc · 773adcc
1 parent ee1c904
commit 773adcc
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 27 deletions.
diff --git a/tfhe/Cargo.toml b/tfhe/Cargo.toml
@@ -17,7 +17,7 @@ exclude = [
     "/js_on_wasm_tests/",
     "/web_wasm_parallel_tests/",
 ]
-rust-version = "1.73"
+rust-version = "1.75"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

diff --git a/tfhe/src/core_crypto/gpu/entities/lwe_ciphertext_list.rs b/tfhe/src/core_crypto/gpu/entities/lwe_ciphertext_list.rs
@@ -120,7 +120,7 @@ impl<T: UnsignedInteger> CudaLweCiphertextList<T> {
                 streams.ptr[0],
                 streams.gpu_indexes[0],
             );
-            ptr = ptr.cast::<u8>().add(size).cast();
+            ptr = ptr.wrapping_byte_add(size);
             for list in cuda_ciphertexts_list_vec {
                 cuda_memcpy_async_gpu_to_gpu(
                     ptr,
@@ -129,7 +129,7 @@ impl<T: UnsignedInteger> CudaLweCiphertextList<T> {
                     streams.ptr[0],
                     streams.gpu_indexes[0],
                 );
-                ptr = ptr.cast::<u8>().add(size).cast();
+                ptr = ptr.wrapping_byte_add(size);
             }
         }
 

diff --git a/tfhe/src/core_crypto/gpu/slice.rs b/tfhe/src/core_crypto/gpu/slice.rs
@@ -158,12 +158,8 @@ where
             None
         } else {
             // Shift ptr
-            let shifted_ptr: *mut c_void = unsafe {
-                self.ptrs[gpu_index as usize]
-                    .cast::<u8>()
-                    .add(start * std::mem::size_of::<T>())
-                    .cast()
-            };
+            let shifted_ptr: *mut c_void =
+                self.ptrs[gpu_index as usize].wrapping_byte_add(start * std::mem::size_of::<T>());
 
             // Compute the length
             let new_len = end - start + 1;
@@ -212,12 +208,8 @@ where
             let new_len_1 = mid;
             let new_len_2 = self.lengths[gpu_index as usize] - mid;
             // Shift ptr
-            let shifted_ptr: *mut c_void = unsafe {
-                self.ptrs[gpu_index as usize]
-                    .cast::<u8>()
-                    .add(mid * std::mem::size_of::<T>())
-                    .cast()
-            };
+            let shifted_ptr: *mut c_void =
+                self.ptrs[gpu_index as usize].wrapping_byte_add(mid * std::mem::size_of::<T>());
 
             // Create the slice
             (

diff --git a/tfhe/src/core_crypto/gpu/vec.rs b/tfhe/src/core_crypto/gpu/vec.rs
@@ -370,12 +370,8 @@ impl<T: Numeric> CudaVec<T> {
             None
         } else {
             // Shift ptr
-            let shifted_ptr: *mut c_void = unsafe {
-                self.ptr[gpu_index as usize]
-                    .cast::<u8>()
-                    .add(start * std::mem::size_of::<T>())
-                    .cast()
-            };
+            let shifted_ptr: *mut c_void =
+                self.ptr[gpu_index as usize].wrapping_byte_add(start * std::mem::size_of::<T>());
 
             // Compute the length
             let new_len = end - start + 1;
@@ -397,12 +393,8 @@ impl<T: Numeric> CudaVec<T> {
             None
         } else {
             // Shift ptr
-            let shifted_ptr: *mut c_void = unsafe {
-                self.ptr[gpu_index as usize]
-                    .cast::<u8>()
-                    .add(start * std::mem::size_of::<T>())
-                    .cast()
-            };
+            let shifted_ptr: *mut c_void =
+                self.ptr[gpu_index as usize].wrapping_byte_add(start * std::mem::size_of::<T>());
 
             // Compute the length
             let new_len = end - start + 1;