From 779e02acc40a05681b4ebe914c462bd663f4c865 Mon Sep 17 00:00:00 2001 From: Pro7ech Date: Tue, 14 Oct 2025 23:39:16 +0200 Subject: [PATCH] wip --- poulpy-backend/src/cpu_fft64_avx/scratch.rs | 181 +--------------- poulpy-backend/src/cpu_fft64_ref/scratch.rs | 181 +--------------- .../src/cpu_spqlios/fft64/scratch.rs | 181 +--------------- poulpy-core/src/automorphism/gglwe_atk.rs | 10 +- poulpy-core/src/automorphism/ggsw_ct.rs | 30 +-- poulpy-core/src/automorphism/glwe_ct.rs | 22 +- poulpy-core/src/conversion/glwe_to_lwe.rs | 10 +- poulpy-core/src/conversion/lwe_to_glwe.rs | 10 +- poulpy-core/src/decryption/glwe_ct.rs | 6 +- .../src/encryption/compressed/gglwe_atk.rs | 7 +- .../src/encryption/compressed/gglwe_ct.rs | 10 +- .../src/encryption/compressed/gglwe_ksk.rs | 9 +- .../src/encryption/compressed/gglwe_tsk.rs | 7 +- .../src/encryption/compressed/ggsw_ct.rs | 8 +- .../src/encryption/compressed/glwe_ct.rs | 4 +- poulpy-core/src/encryption/gglwe_atk.rs | 12 +- poulpy-core/src/encryption/gglwe_ct.rs | 9 +- poulpy-core/src/encryption/gglwe_ksk.rs | 10 +- poulpy-core/src/encryption/gglwe_tsk.rs | 19 +- poulpy-core/src/encryption/ggsw_ct.rs | 10 +- poulpy-core/src/encryption/glwe_ct.rs | 20 +- poulpy-core/src/encryption/glwe_pk.rs | 4 +- poulpy-core/src/encryption/glwe_to_lwe_ksk.rs | 12 +- poulpy-core/src/encryption/lwe_ksk.rs | 12 +- poulpy-core/src/encryption/lwe_to_glwe_ksk.rs | 12 +- poulpy-core/src/external_product/gglwe_atk.rs | 10 +- poulpy-core/src/external_product/gglwe_ksk.rs | 10 +- poulpy-core/src/external_product/ggsw_ct.rs | 10 +- poulpy-core/src/external_product/glwe_ct.rs | 155 +++++++------ poulpy-core/src/external_product/mod.rs | 6 +- poulpy-core/src/glwe_packing.rs | 22 +- poulpy-core/src/glwe_trace.rs | 12 +- poulpy-core/src/keyswitching/gglwe_ct.rs | 18 +- poulpy-core/src/keyswitching/ggsw_ct.rs | 50 ++--- poulpy-core/src/keyswitching/glwe_ct.rs | 26 +-- poulpy-core/src/keyswitching/lwe_ct.rs | 8 +- .../src/layouts/compressed/gglwe_atk.rs | 2 +- .../src/layouts/compressed/gglwe_tsk.rs | 20 +- poulpy-core/src/layouts/gglwe_ksk.rs | 2 + poulpy-core/src/layouts/prepared/gglwe_atk.rs | 6 +- poulpy-core/src/layouts/prepared/gglwe_ct.rs | 8 +- poulpy-core/src/layouts/prepared/gglwe_ksk.rs | 8 +- poulpy-core/src/layouts/prepared/ggsw_ct.rs | 8 +- poulpy-core/src/layouts/prepared/glwe_pk.rs | 8 +- poulpy-core/src/layouts/prepared/glwe_sk.rs | 8 +- .../src/layouts/prepared/glwe_to_lwe_ksk.rs | 28 +-- poulpy-core/src/layouts/prepared/lwe_ksk.rs | 22 +- .../src/layouts/prepared/lwe_to_glwe_ksk.rs | 28 +-- poulpy-core/src/noise/gglwe_ct.rs | 8 +- poulpy-core/src/noise/ggsw_ct.rs | 14 +- poulpy-core/src/noise/glwe_ct.rs | 8 +- poulpy-core/src/scratch.rs | 205 +----------------- .../test_suite/automorphism/gglwe_atk.rs | 22 +- .../tests/test_suite/automorphism/ggsw_ct.rs | 18 +- .../tests/test_suite/automorphism/glwe_ct.rs | 18 +- .../src/tests/test_suite/conversion.rs | 18 +- .../tests/test_suite/encryption/gglwe_atk.rs | 18 +- .../tests/test_suite/encryption/gglwe_ct.rs | 16 +- .../tests/test_suite/encryption/ggsw_ct.rs | 14 +- .../tests/test_suite/encryption/glwe_ct.rs | 31 ++- .../tests/test_suite/encryption/glwe_tsk.rs | 16 +- .../test_suite/external_product/gglwe_ksk.rs | 16 +- .../test_suite/external_product/ggsw_ct.rs | 22 +- .../test_suite/external_product/glwe_ct.rs | 16 +- .../tests/test_suite/keyswitch/gglwe_ct.rs | 22 +- .../src/tests/test_suite/keyswitch/ggsw_ct.rs | 18 +- .../src/tests/test_suite/keyswitch/glwe_ct.rs | 21 +- .../src/tests/test_suite/keyswitch/lwe_ct.rs | 12 +- poulpy-core/src/tests/test_suite/packing.rs | 12 +- poulpy-core/src/tests/test_suite/trace.rs | 18 +- poulpy-hal/src/api/scratch.rs | 147 +++++++++---- poulpy-hal/src/api/svp_ppol.rs | 4 +- poulpy-hal/src/api/vec_znx_big.rs | 4 +- poulpy-hal/src/api/vec_znx_dft.rs | 4 +- poulpy-hal/src/api/vmp_pmat.rs | 4 +- poulpy-hal/src/delegates/scratch.rs | 114 +--------- poulpy-hal/src/delegates/svp_ppol.rs | 6 +- poulpy-hal/src/delegates/vec_znx_big.rs | 6 +- poulpy-hal/src/delegates/vec_znx_dft.rs | 10 +- poulpy-hal/src/delegates/vmp_pmat.rs | 6 +- poulpy-hal/src/oep/scratch.rs | 110 +--------- .../benches/circuit_bootstrapping.rs | 24 +- .../tfhe/bdd_arithmetic/ciphertexts/block.rs | 20 +- .../ciphertexts/block_prepared.rs | 10 +- .../tfhe/bdd_arithmetic/ciphertexts/word.rs | 14 +- .../src/tfhe/bdd_arithmetic/eval.rs | 4 +- poulpy-schemes/src/tfhe/bdd_arithmetic/key.rs | 18 +- .../src/tfhe/bdd_arithmetic/test.rs | 18 +- .../src/tfhe/blind_rotation/cggi_algo.rs | 44 ++-- .../src/tfhe/blind_rotation/cggi_key.rs | 13 +- .../tests/generic_blind_rotation.rs | 12 +- .../src/tfhe/circuit_bootstrapping/circuit.rs | 16 +- .../src/tfhe/circuit_bootstrapping/key.rs | 8 +- .../tests/circuit_bootstrapping.rs | 22 +- 94 files changed, 784 insertions(+), 1688 deletions(-) diff --git a/poulpy-backend/src/cpu_fft64_avx/scratch.rs b/poulpy-backend/src/cpu_fft64_avx/scratch.rs index 2cdf85e..f6595f9 100644 --- a/poulpy-backend/src/cpu_fft64_avx/scratch.rs +++ b/poulpy-backend/src/cpu_fft64_avx/scratch.rs @@ -3,13 +3,8 @@ use std::marker::PhantomData; use poulpy_hal::{ DEFAULTALIGN, alloc_aligned, api::ScratchFromBytes, - layouts::{Backend, MatZnx, ScalarZnx, Scratch, ScratchOwned, SvpPPol, VecZnx, VecZnxBig, VecZnxDft, VmpPMat}, - oep::{ - ScratchAvailableImpl, ScratchFromBytesImpl, ScratchOwnedAllocImpl, ScratchOwnedBorrowImpl, SvpPPolAllocBytesImpl, - TakeMatZnxImpl, TakeScalarZnxImpl, TakeSliceImpl, TakeSvpPPolImpl, TakeVecZnxBigImpl, TakeVecZnxDftImpl, - TakeVecZnxDftSliceImpl, TakeVecZnxImpl, TakeVecZnxSliceImpl, TakeVmpPMatImpl, VecZnxBigAllocBytesImpl, - VecZnxDftAllocBytesImpl, VmpPMatAllocBytesImpl, - }, + layouts::{Backend, Scratch, ScratchOwned}, + oep::{ScratchAvailableImpl, ScratchFromBytesImpl, ScratchOwnedAllocImpl, ScratchOwnedBorrowImpl, TakeSliceImpl}, }; use crate::cpu_fft64_avx::FFT64Avx; @@ -64,178 +59,6 @@ where } } -unsafe impl TakeScalarZnxImpl for FFT64Avx -where - B: ScratchFromBytesImpl, -{ - fn take_scalar_znx_impl(scratch: &mut Scratch, n: usize, cols: usize) -> (ScalarZnx<&mut [u8]>, &mut Scratch) { - let (take_slice, rem_slice) = take_slice_aligned(&mut scratch.data, ScalarZnx::bytes_of(n, cols)); - ( - ScalarZnx::from_data(take_slice, n, cols), - Scratch::from_bytes(rem_slice), - ) - } -} - -unsafe impl TakeSvpPPolImpl for FFT64Avx -where - B: SvpPPolAllocBytesImpl + ScratchFromBytesImpl, -{ - fn take_svp_ppol_impl(scratch: &mut Scratch, n: usize, cols: usize) -> (SvpPPol<&mut [u8], B>, &mut Scratch) { - let (take_slice, rem_slice) = take_slice_aligned(&mut scratch.data, B::svp_ppol_bytes_of_impl(n, cols)); - ( - SvpPPol::from_data(take_slice, n, cols), - Scratch::from_bytes(rem_slice), - ) - } -} - -unsafe impl TakeVecZnxImpl for FFT64Avx -where - B: ScratchFromBytesImpl, -{ - fn take_vec_znx_impl(scratch: &mut Scratch, n: usize, cols: usize, size: usize) -> (VecZnx<&mut [u8]>, &mut Scratch) { - let (take_slice, rem_slice) = take_slice_aligned(&mut scratch.data, VecZnx::bytes_of(n, cols, size)); - ( - VecZnx::from_data(take_slice, n, cols, size), - Scratch::from_bytes(rem_slice), - ) - } -} - -unsafe impl TakeVecZnxBigImpl for FFT64Avx -where - B: VecZnxBigAllocBytesImpl + ScratchFromBytesImpl, -{ - fn take_vec_znx_big_impl( - scratch: &mut Scratch, - n: usize, - cols: usize, - size: usize, - ) -> (VecZnxBig<&mut [u8], B>, &mut Scratch) { - let (take_slice, rem_slice) = take_slice_aligned( - &mut scratch.data, - B::vec_znx_big_bytes_of_impl(n, cols, size), - ); - ( - VecZnxBig::from_data(take_slice, n, cols, size), - Scratch::from_bytes(rem_slice), - ) - } -} - -unsafe impl TakeVecZnxDftImpl for FFT64Avx -where - B: VecZnxDftAllocBytesImpl + ScratchFromBytesImpl, -{ - fn take_vec_znx_dft_impl( - scratch: &mut Scratch, - n: usize, - cols: usize, - size: usize, - ) -> (VecZnxDft<&mut [u8], B>, &mut Scratch) { - let (take_slice, rem_slice) = take_slice_aligned( - &mut scratch.data, - B::vec_znx_dft_bytes_of_impl(n, cols, size), - ); - - ( - VecZnxDft::from_data(take_slice, n, cols, size), - Scratch::from_bytes(rem_slice), - ) - } -} - -unsafe impl TakeVecZnxDftSliceImpl for FFT64Avx -where - B: VecZnxDftAllocBytesImpl + ScratchFromBytesImpl + TakeVecZnxDftImpl, -{ - fn take_vec_znx_dft_slice_impl( - scratch: &mut Scratch, - len: usize, - n: usize, - cols: usize, - size: usize, - ) -> (Vec>, &mut Scratch) { - let mut scratch: &mut Scratch = scratch; - let mut slice: Vec> = Vec::with_capacity(len); - for _ in 0..len { - let (znx, new_scratch) = B::take_vec_znx_dft_impl(scratch, n, cols, size); - scratch = new_scratch; - slice.push(znx); - } - (slice, scratch) - } -} - -unsafe impl TakeVecZnxSliceImpl for FFT64Avx -where - B: ScratchFromBytesImpl + TakeVecZnxImpl, -{ - fn take_vec_znx_slice_impl( - scratch: &mut Scratch, - len: usize, - n: usize, - cols: usize, - size: usize, - ) -> (Vec>, &mut Scratch) { - let mut scratch: &mut Scratch = scratch; - let mut slice: Vec> = Vec::with_capacity(len); - for _ in 0..len { - let (znx, new_scratch) = B::take_vec_znx_impl(scratch, n, cols, size); - scratch = new_scratch; - slice.push(znx); - } - (slice, scratch) - } -} - -unsafe impl TakeVmpPMatImpl for FFT64Avx -where - B: VmpPMatAllocBytesImpl + ScratchFromBytesImpl, -{ - fn take_vmp_pmat_impl( - scratch: &mut Scratch, - n: usize, - rows: usize, - cols_in: usize, - cols_out: usize, - size: usize, - ) -> (VmpPMat<&mut [u8], B>, &mut Scratch) { - let (take_slice, rem_slice) = take_slice_aligned( - &mut scratch.data, - B::vmp_pmat_bytes_of_impl(n, rows, cols_in, cols_out, size), - ); - ( - VmpPMat::from_data(take_slice, n, rows, cols_in, cols_out, size), - Scratch::from_bytes(rem_slice), - ) - } -} - -unsafe impl TakeMatZnxImpl for FFT64Avx -where - B: ScratchFromBytesImpl, -{ - fn take_mat_znx_impl( - scratch: &mut Scratch, - n: usize, - rows: usize, - cols_in: usize, - cols_out: usize, - size: usize, - ) -> (MatZnx<&mut [u8]>, &mut Scratch) { - let (take_slice, rem_slice) = take_slice_aligned( - &mut scratch.data, - MatZnx::bytes_of(n, rows, cols_in, cols_out, size), - ); - ( - MatZnx::from_data(take_slice, n, rows, cols_in, cols_out, size), - Scratch::from_bytes(rem_slice), - ) - } -} - fn take_slice_aligned(data: &mut [u8], take_len: usize) -> (&mut [u8], &mut [u8]) { let ptr: *mut u8 = data.as_mut_ptr(); let self_len: usize = data.len(); diff --git a/poulpy-backend/src/cpu_fft64_ref/scratch.rs b/poulpy-backend/src/cpu_fft64_ref/scratch.rs index ad617ce..1593370 100644 --- a/poulpy-backend/src/cpu_fft64_ref/scratch.rs +++ b/poulpy-backend/src/cpu_fft64_ref/scratch.rs @@ -3,13 +3,8 @@ use std::marker::PhantomData; use poulpy_hal::{ DEFAULTALIGN, alloc_aligned, api::ScratchFromBytes, - layouts::{Backend, MatZnx, ScalarZnx, Scratch, ScratchOwned, SvpPPol, VecZnx, VecZnxBig, VecZnxDft, VmpPMat}, - oep::{ - ScratchAvailableImpl, ScratchFromBytesImpl, ScratchOwnedAllocImpl, ScratchOwnedBorrowImpl, SvpPPolAllocBytesImpl, - TakeMatZnxImpl, TakeScalarZnxImpl, TakeSliceImpl, TakeSvpPPolImpl, TakeVecZnxBigImpl, TakeVecZnxDftImpl, - TakeVecZnxDftSliceImpl, TakeVecZnxImpl, TakeVecZnxSliceImpl, TakeVmpPMatImpl, VecZnxBigAllocBytesImpl, - VecZnxDftAllocBytesImpl, VmpPMatAllocBytesImpl, - }, + layouts::{Backend, Scratch, ScratchOwned}, + oep::{ScratchAvailableImpl, ScratchFromBytesImpl, ScratchOwnedAllocImpl, ScratchOwnedBorrowImpl, TakeSliceImpl}, }; use crate::cpu_fft64_ref::FFT64Ref; @@ -64,178 +59,6 @@ where } } -unsafe impl TakeScalarZnxImpl for FFT64Ref -where - B: ScratchFromBytesImpl, -{ - fn take_scalar_znx_impl(scratch: &mut Scratch, n: usize, cols: usize) -> (ScalarZnx<&mut [u8]>, &mut Scratch) { - let (take_slice, rem_slice) = take_slice_aligned(&mut scratch.data, ScalarZnx::bytes_of(n, cols)); - ( - ScalarZnx::from_data(take_slice, n, cols), - Scratch::from_bytes(rem_slice), - ) - } -} - -unsafe impl TakeSvpPPolImpl for FFT64Ref -where - B: SvpPPolAllocBytesImpl + ScratchFromBytesImpl, -{ - fn take_svp_ppol_impl(scratch: &mut Scratch, n: usize, cols: usize) -> (SvpPPol<&mut [u8], B>, &mut Scratch) { - let (take_slice, rem_slice) = take_slice_aligned(&mut scratch.data, B::svp_ppol_bytes_of_impl(n, cols)); - ( - SvpPPol::from_data(take_slice, n, cols), - Scratch::from_bytes(rem_slice), - ) - } -} - -unsafe impl TakeVecZnxImpl for FFT64Ref -where - B: ScratchFromBytesImpl, -{ - fn take_vec_znx_impl(scratch: &mut Scratch, n: usize, cols: usize, size: usize) -> (VecZnx<&mut [u8]>, &mut Scratch) { - let (take_slice, rem_slice) = take_slice_aligned(&mut scratch.data, VecZnx::bytes_of(n, cols, size)); - ( - VecZnx::from_data(take_slice, n, cols, size), - Scratch::from_bytes(rem_slice), - ) - } -} - -unsafe impl TakeVecZnxBigImpl for FFT64Ref -where - B: VecZnxBigAllocBytesImpl + ScratchFromBytesImpl, -{ - fn take_vec_znx_big_impl( - scratch: &mut Scratch, - n: usize, - cols: usize, - size: usize, - ) -> (VecZnxBig<&mut [u8], B>, &mut Scratch) { - let (take_slice, rem_slice) = take_slice_aligned( - &mut scratch.data, - B::vec_znx_big_bytes_of_impl(n, cols, size), - ); - ( - VecZnxBig::from_data(take_slice, n, cols, size), - Scratch::from_bytes(rem_slice), - ) - } -} - -unsafe impl TakeVecZnxDftImpl for FFT64Ref -where - B: VecZnxDftAllocBytesImpl + ScratchFromBytesImpl, -{ - fn take_vec_znx_dft_impl( - scratch: &mut Scratch, - n: usize, - cols: usize, - size: usize, - ) -> (VecZnxDft<&mut [u8], B>, &mut Scratch) { - let (take_slice, rem_slice) = take_slice_aligned( - &mut scratch.data, - B::vec_znx_dft_bytes_of_impl(n, cols, size), - ); - - ( - VecZnxDft::from_data(take_slice, n, cols, size), - Scratch::from_bytes(rem_slice), - ) - } -} - -unsafe impl TakeVecZnxDftSliceImpl for FFT64Ref -where - B: VecZnxDftAllocBytesImpl + ScratchFromBytesImpl + TakeVecZnxDftImpl, -{ - fn take_vec_znx_dft_slice_impl( - scratch: &mut Scratch, - len: usize, - n: usize, - cols: usize, - size: usize, - ) -> (Vec>, &mut Scratch) { - let mut scratch: &mut Scratch = scratch; - let mut slice: Vec> = Vec::with_capacity(len); - for _ in 0..len { - let (znx, new_scratch) = B::take_vec_znx_dft_impl(scratch, n, cols, size); - scratch = new_scratch; - slice.push(znx); - } - (slice, scratch) - } -} - -unsafe impl TakeVecZnxSliceImpl for FFT64Ref -where - B: ScratchFromBytesImpl + TakeVecZnxImpl, -{ - fn take_vec_znx_slice_impl( - scratch: &mut Scratch, - len: usize, - n: usize, - cols: usize, - size: usize, - ) -> (Vec>, &mut Scratch) { - let mut scratch: &mut Scratch = scratch; - let mut slice: Vec> = Vec::with_capacity(len); - for _ in 0..len { - let (znx, new_scratch) = B::take_vec_znx_impl(scratch, n, cols, size); - scratch = new_scratch; - slice.push(znx); - } - (slice, scratch) - } -} - -unsafe impl TakeVmpPMatImpl for FFT64Ref -where - B: VmpPMatAllocBytesImpl + ScratchFromBytesImpl, -{ - fn take_vmp_pmat_impl( - scratch: &mut Scratch, - n: usize, - rows: usize, - cols_in: usize, - cols_out: usize, - size: usize, - ) -> (VmpPMat<&mut [u8], B>, &mut Scratch) { - let (take_slice, rem_slice) = take_slice_aligned( - &mut scratch.data, - B::vmp_pmat_bytes_of_impl(n, rows, cols_in, cols_out, size), - ); - ( - VmpPMat::from_data(take_slice, n, rows, cols_in, cols_out, size), - Scratch::from_bytes(rem_slice), - ) - } -} - -unsafe impl TakeMatZnxImpl for FFT64Ref -where - B: ScratchFromBytesImpl, -{ - fn take_mat_znx_impl( - scratch: &mut Scratch, - n: usize, - rows: usize, - cols_in: usize, - cols_out: usize, - size: usize, - ) -> (MatZnx<&mut [u8]>, &mut Scratch) { - let (take_slice, rem_slice) = take_slice_aligned( - &mut scratch.data, - MatZnx::bytes_of(n, rows, cols_in, cols_out, size), - ); - ( - MatZnx::from_data(take_slice, n, rows, cols_in, cols_out, size), - Scratch::from_bytes(rem_slice), - ) - } -} - fn take_slice_aligned(data: &mut [u8], take_len: usize) -> (&mut [u8], &mut [u8]) { let ptr: *mut u8 = data.as_mut_ptr(); let self_len: usize = data.len(); diff --git a/poulpy-backend/src/cpu_spqlios/fft64/scratch.rs b/poulpy-backend/src/cpu_spqlios/fft64/scratch.rs index 2b56218..d32b9f4 100644 --- a/poulpy-backend/src/cpu_spqlios/fft64/scratch.rs +++ b/poulpy-backend/src/cpu_spqlios/fft64/scratch.rs @@ -3,13 +3,8 @@ use std::marker::PhantomData; use poulpy_hal::{ DEFAULTALIGN, alloc_aligned, api::ScratchFromBytes, - layouts::{Backend, MatZnx, ScalarZnx, Scratch, ScratchOwned, SvpPPol, VecZnx, VecZnxBig, VecZnxDft, VmpPMat}, - oep::{ - ScratchAvailableImpl, ScratchFromBytesImpl, ScratchOwnedAllocImpl, ScratchOwnedBorrowImpl, SvpPPolAllocBytesImpl, - TakeMatZnxImpl, TakeScalarZnxImpl, TakeSliceImpl, TakeSvpPPolImpl, TakeVecZnxBigImpl, TakeVecZnxDftImpl, - TakeVecZnxDftSliceImpl, TakeVecZnxImpl, TakeVecZnxSliceImpl, TakeVmpPMatImpl, VecZnxBigAllocBytesImpl, - VecZnxDftAllocBytesImpl, VmpPMatAllocBytesImpl, - }, + layouts::{Backend, Scratch, ScratchOwned}, + oep::{ScratchAvailableImpl, ScratchFromBytesImpl, ScratchOwnedAllocImpl, ScratchOwnedBorrowImpl, TakeSliceImpl}, }; use crate::cpu_spqlios::FFT64Spqlios; @@ -64,178 +59,6 @@ where } } -unsafe impl TakeScalarZnxImpl for FFT64Spqlios -where - B: ScratchFromBytesImpl, -{ - fn take_scalar_znx_impl(scratch: &mut Scratch, n: usize, cols: usize) -> (ScalarZnx<&mut [u8]>, &mut Scratch) { - let (take_slice, rem_slice) = take_slice_aligned(&mut scratch.data, ScalarZnx::bytes_of(n, cols)); - ( - ScalarZnx::from_data(take_slice, n, cols), - Scratch::from_bytes(rem_slice), - ) - } -} - -unsafe impl TakeSvpPPolImpl for FFT64Spqlios -where - B: SvpPPolAllocBytesImpl + ScratchFromBytesImpl, -{ - fn take_svp_ppol_impl(scratch: &mut Scratch, n: usize, cols: usize) -> (SvpPPol<&mut [u8], B>, &mut Scratch) { - let (take_slice, rem_slice) = take_slice_aligned(&mut scratch.data, B::svp_ppol_bytes_of_impl(n, cols)); - ( - SvpPPol::from_data(take_slice, n, cols), - Scratch::from_bytes(rem_slice), - ) - } -} - -unsafe impl TakeVecZnxImpl for FFT64Spqlios -where - B: ScratchFromBytesImpl, -{ - fn take_vec_znx_impl(scratch: &mut Scratch, n: usize, cols: usize, size: usize) -> (VecZnx<&mut [u8]>, &mut Scratch) { - let (take_slice, rem_slice) = take_slice_aligned(&mut scratch.data, VecZnx::bytes_of(n, cols, size)); - ( - VecZnx::from_data(take_slice, n, cols, size), - Scratch::from_bytes(rem_slice), - ) - } -} - -unsafe impl TakeVecZnxBigImpl for FFT64Spqlios -where - B: VecZnxBigAllocBytesImpl + ScratchFromBytesImpl, -{ - fn take_vec_znx_big_impl( - scratch: &mut Scratch, - n: usize, - cols: usize, - size: usize, - ) -> (VecZnxBig<&mut [u8], B>, &mut Scratch) { - let (take_slice, rem_slice) = take_slice_aligned( - &mut scratch.data, - B::vec_znx_big_bytes_of_impl(n, cols, size), - ); - ( - VecZnxBig::from_data(take_slice, n, cols, size), - Scratch::from_bytes(rem_slice), - ) - } -} - -unsafe impl TakeVecZnxDftImpl for FFT64Spqlios -where - B: VecZnxDftAllocBytesImpl + ScratchFromBytesImpl, -{ - fn take_vec_znx_dft_impl( - scratch: &mut Scratch, - n: usize, - cols: usize, - size: usize, - ) -> (VecZnxDft<&mut [u8], B>, &mut Scratch) { - let (take_slice, rem_slice) = take_slice_aligned( - &mut scratch.data, - B::vec_znx_dft_bytes_of_impl(n, cols, size), - ); - - ( - VecZnxDft::from_data(take_slice, n, cols, size), - Scratch::from_bytes(rem_slice), - ) - } -} - -unsafe impl TakeVecZnxDftSliceImpl for FFT64Spqlios -where - B: VecZnxDftAllocBytesImpl + ScratchFromBytesImpl + TakeVecZnxDftImpl, -{ - fn take_vec_znx_dft_slice_impl( - scratch: &mut Scratch, - len: usize, - n: usize, - cols: usize, - size: usize, - ) -> (Vec>, &mut Scratch) { - let mut scratch: &mut Scratch = scratch; - let mut slice: Vec> = Vec::with_capacity(len); - for _ in 0..len { - let (znx, new_scratch) = B::take_vec_znx_dft_impl(scratch, n, cols, size); - scratch = new_scratch; - slice.push(znx); - } - (slice, scratch) - } -} - -unsafe impl TakeVecZnxSliceImpl for FFT64Spqlios -where - B: ScratchFromBytesImpl + TakeVecZnxImpl, -{ - fn take_vec_znx_slice_impl( - scratch: &mut Scratch, - len: usize, - n: usize, - cols: usize, - size: usize, - ) -> (Vec>, &mut Scratch) { - let mut scratch: &mut Scratch = scratch; - let mut slice: Vec> = Vec::with_capacity(len); - for _ in 0..len { - let (znx, new_scratch) = B::take_vec_znx_impl(scratch, n, cols, size); - scratch = new_scratch; - slice.push(znx); - } - (slice, scratch) - } -} - -unsafe impl TakeVmpPMatImpl for FFT64Spqlios -where - B: VmpPMatAllocBytesImpl + ScratchFromBytesImpl, -{ - fn take_vmp_pmat_impl( - scratch: &mut Scratch, - n: usize, - rows: usize, - cols_in: usize, - cols_out: usize, - size: usize, - ) -> (VmpPMat<&mut [u8], B>, &mut Scratch) { - let (take_slice, rem_slice) = take_slice_aligned( - &mut scratch.data, - B::vmp_pmat_bytes_of_impl(n, rows, cols_in, cols_out, size), - ); - ( - VmpPMat::from_data(take_slice, n, rows, cols_in, cols_out, size), - Scratch::from_bytes(rem_slice), - ) - } -} - -unsafe impl TakeMatZnxImpl for FFT64Spqlios -where - B: ScratchFromBytesImpl, -{ - fn take_mat_znx_impl( - scratch: &mut Scratch, - n: usize, - rows: usize, - cols_in: usize, - cols_out: usize, - size: usize, - ) -> (MatZnx<&mut [u8]>, &mut Scratch) { - let (take_slice, rem_slice) = take_slice_aligned( - &mut scratch.data, - MatZnx::bytes_of(n, rows, cols_in, cols_out, size), - ); - ( - MatZnx::from_data(take_slice, n, rows, cols_in, cols_out, size), - Scratch::from_bytes(rem_slice), - ) - } -} - fn take_slice_aligned(data: &mut [u8], take_len: usize) -> (&mut [u8], &mut [u8]) { let ptr: *mut u8 = data.as_mut_ptr(); let self_len: usize = data.len(); diff --git a/poulpy-core/src/automorphism/gglwe_atk.rs b/poulpy-core/src/automorphism/gglwe_atk.rs index 233f250..fc49c52 100644 --- a/poulpy-core/src/automorphism/gglwe_atk.rs +++ b/poulpy-core/src/automorphism/gglwe_atk.rs @@ -1,7 +1,7 @@ use poulpy_hal::{ api::{ ScratchAvailable, TakeVecZnx, TakeVecZnxDft, VecZnxAutomorphism, VecZnxAutomorphismInplace, VecZnxBigAddSmallInplace, - VecZnxBigNormalize, VecZnxBigNormalizeTmpBytes, VecZnxDftAllocBytes, VecZnxDftApply, VecZnxIdftApplyConsume, + VecZnxBigNormalize, VecZnxBigNormalizeTmpBytes, VecZnxDftApply, VecZnxDftBytesOf, VecZnxIdftApplyConsume, VecZnxNormalize, VecZnxNormalizeTmpBytes, VmpApplyDftToDft, VmpApplyDftToDftAdd, VmpApplyDftToDftTmpBytes, }, layouts::{Backend, DataMut, DataRef, Module, Scratch, ZnxZero}, @@ -20,7 +20,7 @@ impl AutomorphismKey> { OUT: GGLWEInfos, IN: GGLWEInfos, KEY: GGLWEInfos, - Module: VecZnxDftAllocBytes + VmpApplyDftToDftTmpBytes + VecZnxBigNormalizeTmpBytes + VecZnxNormalizeTmpBytes, + Module: VecZnxDftBytesOf + VmpApplyDftToDftTmpBytes + VecZnxBigNormalizeTmpBytes + VecZnxNormalizeTmpBytes, { GLWE::keyswitch_scratch_space( module, @@ -34,7 +34,7 @@ impl AutomorphismKey> { where OUT: GGLWEInfos, KEY: GGLWEInfos, - Module: VecZnxDftAllocBytes + VmpApplyDftToDftTmpBytes + VecZnxBigNormalizeTmpBytes + VecZnxNormalizeTmpBytes, + Module: VecZnxDftBytesOf + VmpApplyDftToDftTmpBytes + VecZnxBigNormalizeTmpBytes + VecZnxNormalizeTmpBytes, { AutomorphismKey::automorphism_scratch_space(module, out_infos, out_infos, key_infos) } @@ -48,7 +48,7 @@ impl AutomorphismKey { rhs: &AutomorphismKeyPrepared, scratch: &mut Scratch, ) where - Module: VecZnxDftAllocBytes + Module: VecZnxDftBytesOf + VmpApplyDftToDftTmpBytes + VecZnxBigNormalizeTmpBytes + VmpApplyDftToDft @@ -136,7 +136,7 @@ impl AutomorphismKey { rhs: &AutomorphismKeyPrepared, scratch: &mut Scratch, ) where - Module: VecZnxDftAllocBytes + Module: VecZnxDftBytesOf + VmpApplyDftToDftTmpBytes + VecZnxBigNormalizeTmpBytes + VmpApplyDftToDft diff --git a/poulpy-core/src/automorphism/ggsw_ct.rs b/poulpy-core/src/automorphism/ggsw_ct.rs index f1a84ad..41acde9 100644 --- a/poulpy-core/src/automorphism/ggsw_ct.rs +++ b/poulpy-core/src/automorphism/ggsw_ct.rs @@ -1,9 +1,9 @@ use poulpy_hal::{ api::{ ScratchAvailable, TakeVecZnx, TakeVecZnxBig, TakeVecZnxDft, VecZnxAutomorphismInplace, VecZnxBigAddSmallInplace, - VecZnxBigAllocBytes, VecZnxBigNormalize, VecZnxBigNormalizeTmpBytes, VecZnxDftAddInplace, VecZnxDftAllocBytes, - VecZnxDftApply, VecZnxDftCopy, VecZnxIdftApplyConsume, VecZnxIdftApplyTmpA, VecZnxNormalize, VecZnxNormalizeTmpBytes, - VmpApplyDftToDft, VmpApplyDftToDftAdd, VmpApplyDftToDftTmpBytes, + VecZnxBigBytesOf, VecZnxBigNormalize, VecZnxBigNormalizeTmpBytes, VecZnxDftAddInplace, VecZnxDftApply, VecZnxDftBytesOf, + VecZnxDftCopy, VecZnxIdftApplyConsume, VecZnxIdftApplyTmpA, VecZnxNormalize, VecZnxNormalizeTmpBytes, VmpApplyDftToDft, + VmpApplyDftToDftAdd, VmpApplyDftToDftTmpBytes, }, layouts::{Backend, DataMut, DataRef, Module, Scratch}, }; @@ -26,14 +26,11 @@ impl GGSW> { IN: GGSWInfos, KEY: GGLWEInfos, TSK: GGLWEInfos, - Module: VecZnxDftAllocBytes - + VmpApplyDftToDftTmpBytes - + VecZnxBigAllocBytes - + VecZnxNormalizeTmpBytes - + VecZnxBigNormalizeTmpBytes, + Module: + VecZnxDftBytesOf + VmpApplyDftToDftTmpBytes + VecZnxBigBytesOf + VecZnxNormalizeTmpBytes + VecZnxBigNormalizeTmpBytes, { let out_size: usize = out_infos.size(); - let ci_dft: usize = module.vec_znx_dft_bytes_of((key_infos.rank_out() + 1).into(), out_size); + let ci_dft: usize = module.bytes_of_vec_znx_dft((key_infos.rank_out() + 1).into(), out_size); let ks_internal: usize = GLWE::keyswitch_scratch_space( module, &out_infos.glwe_layout(), @@ -54,11 +51,8 @@ impl GGSW> { OUT: GGSWInfos, KEY: GGLWEInfos, TSK: GGLWEInfos, - Module: VecZnxDftAllocBytes - + VmpApplyDftToDftTmpBytes - + VecZnxBigAllocBytes - + VecZnxNormalizeTmpBytes - + VecZnxBigNormalizeTmpBytes, + Module: + VecZnxDftBytesOf + VmpApplyDftToDftTmpBytes + VecZnxBigBytesOf + VecZnxNormalizeTmpBytes + VecZnxBigNormalizeTmpBytes, { GGSW::automorphism_scratch_space(module, out_infos, out_infos, key_infos, tsk_infos) } @@ -73,7 +67,7 @@ impl GGSW { tensor_key: &TensorKeyPrepared, scratch: &mut Scratch, ) where - Module: VecZnxDftAllocBytes + Module: VecZnxDftBytesOf + VmpApplyDftToDftTmpBytes + VecZnxBigNormalizeTmpBytes + VmpApplyDftToDft @@ -83,7 +77,7 @@ impl GGSW { + VecZnxBigAddSmallInplace + VecZnxBigNormalize + VecZnxAutomorphismInplace - + VecZnxBigAllocBytes + + VecZnxBigBytesOf + VecZnxNormalizeTmpBytes + VecZnxDftCopy + VecZnxDftAddInplace @@ -141,7 +135,7 @@ impl GGSW { tensor_key: &TensorKeyPrepared, scratch: &mut Scratch, ) where - Module: VecZnxDftAllocBytes + Module: VecZnxDftBytesOf + VmpApplyDftToDftTmpBytes + VecZnxBigNormalizeTmpBytes + VmpApplyDftToDft @@ -151,7 +145,7 @@ impl GGSW { + VecZnxBigAddSmallInplace + VecZnxBigNormalize + VecZnxAutomorphismInplace - + VecZnxBigAllocBytes + + VecZnxBigBytesOf + VecZnxNormalizeTmpBytes + VecZnxDftCopy + VecZnxDftAddInplace diff --git a/poulpy-core/src/automorphism/glwe_ct.rs b/poulpy-core/src/automorphism/glwe_ct.rs index 800248a..8cdaa91 100644 --- a/poulpy-core/src/automorphism/glwe_ct.rs +++ b/poulpy-core/src/automorphism/glwe_ct.rs @@ -2,7 +2,7 @@ use poulpy_hal::{ api::{ ScratchAvailable, TakeVecZnx, TakeVecZnxDft, VecZnxAutomorphismInplace, VecZnxBigAddSmallInplace, VecZnxBigAutomorphismInplace, VecZnxBigNormalize, VecZnxBigNormalizeTmpBytes, VecZnxBigSubSmallInplace, - VecZnxBigSubSmallNegateInplace, VecZnxDftAllocBytes, VecZnxDftApply, VecZnxIdftApplyConsume, VecZnxNormalize, + VecZnxBigSubSmallNegateInplace, VecZnxDftApply, VecZnxDftBytesOf, VecZnxIdftApplyConsume, VecZnxNormalize, VecZnxNormalizeTmpBytes, VmpApplyDftToDft, VmpApplyDftToDftAdd, VmpApplyDftToDftTmpBytes, }, layouts::{Backend, DataMut, DataRef, Module, Scratch, VecZnxBig}, @@ -21,7 +21,7 @@ impl GLWE> { OUT: GLWEInfos, IN: GLWEInfos, KEY: GGLWEInfos, - Module: VecZnxDftAllocBytes + VmpApplyDftToDftTmpBytes + VecZnxBigNormalizeTmpBytes + VecZnxNormalizeTmpBytes, + Module: VecZnxDftBytesOf + VmpApplyDftToDftTmpBytes + VecZnxBigNormalizeTmpBytes + VecZnxNormalizeTmpBytes, { Self::keyswitch_scratch_space(module, out_infos, in_infos, key_infos) } @@ -30,7 +30,7 @@ impl GLWE> { where OUT: GLWEInfos, KEY: GGLWEInfos, - Module: VecZnxDftAllocBytes + VmpApplyDftToDftTmpBytes + VecZnxBigNormalizeTmpBytes + VecZnxNormalizeTmpBytes, + Module: VecZnxDftBytesOf + VmpApplyDftToDftTmpBytes + VecZnxBigNormalizeTmpBytes + VecZnxNormalizeTmpBytes, { Self::keyswitch_inplace_scratch_space(module, out_infos, key_infos) } @@ -44,7 +44,7 @@ impl GLWE { rhs: &AutomorphismKeyPrepared, scratch: &mut Scratch, ) where - Module: VecZnxDftAllocBytes + Module: VecZnxDftBytesOf + VmpApplyDftToDftTmpBytes + VecZnxBigNormalizeTmpBytes + VmpApplyDftToDft @@ -70,7 +70,7 @@ impl GLWE { rhs: &AutomorphismKeyPrepared, scratch: &mut Scratch, ) where - Module: VecZnxDftAllocBytes + Module: VecZnxDftBytesOf + VmpApplyDftToDftTmpBytes + VecZnxBigNormalizeTmpBytes + VmpApplyDftToDft @@ -97,7 +97,7 @@ impl GLWE { rhs: &AutomorphismKeyPrepared, scratch: &mut Scratch, ) where - Module: VecZnxDftAllocBytes + Module: VecZnxDftBytesOf + VmpApplyDftToDftTmpBytes + VecZnxBigNormalizeTmpBytes + VmpApplyDftToDft @@ -138,7 +138,7 @@ impl GLWE { rhs: &AutomorphismKeyPrepared, scratch: &mut Scratch, ) where - Module: VecZnxDftAllocBytes + Module: VecZnxDftBytesOf + VmpApplyDftToDftTmpBytes + VecZnxBigNormalizeTmpBytes + VmpApplyDftToDft @@ -180,7 +180,7 @@ impl GLWE { rhs: &AutomorphismKeyPrepared, scratch: &mut Scratch, ) where - Module: VecZnxDftAllocBytes + Module: VecZnxDftBytesOf + VmpApplyDftToDftTmpBytes + VecZnxBigNormalizeTmpBytes + VmpApplyDftToDft @@ -222,7 +222,7 @@ impl GLWE { rhs: &AutomorphismKeyPrepared, scratch: &mut Scratch, ) where - Module: VecZnxDftAllocBytes + Module: VecZnxDftBytesOf + VmpApplyDftToDftTmpBytes + VecZnxBigNormalizeTmpBytes + VmpApplyDftToDft @@ -265,7 +265,7 @@ impl GLWE { rhs: &AutomorphismKeyPrepared, scratch: &mut Scratch, ) where - Module: VecZnxDftAllocBytes + Module: VecZnxDftBytesOf + VmpApplyDftToDftTmpBytes + VecZnxBigNormalizeTmpBytes + VmpApplyDftToDft @@ -307,7 +307,7 @@ impl GLWE { rhs: &AutomorphismKeyPrepared, scratch: &mut Scratch, ) where - Module: VecZnxDftAllocBytes + Module: VecZnxDftBytesOf + VmpApplyDftToDftTmpBytes + VecZnxBigNormalizeTmpBytes + VmpApplyDftToDft diff --git a/poulpy-core/src/conversion/glwe_to_lwe.rs b/poulpy-core/src/conversion/glwe_to_lwe.rs index d3e32ae..ef18123 100644 --- a/poulpy-core/src/conversion/glwe_to_lwe.rs +++ b/poulpy-core/src/conversion/glwe_to_lwe.rs @@ -1,14 +1,14 @@ use poulpy_hal::{ api::{ ScratchAvailable, TakeVecZnx, TakeVecZnxDft, VecZnxBigAddSmallInplace, VecZnxBigNormalize, VecZnxBigNormalizeTmpBytes, - VecZnxDftAllocBytes, VecZnxDftApply, VecZnxIdftApplyConsume, VecZnxNormalize, VecZnxNormalizeTmpBytes, VmpApplyDftToDft, + VecZnxDftApply, VecZnxDftBytesOf, VecZnxIdftApplyConsume, VecZnxNormalize, VecZnxNormalizeTmpBytes, VmpApplyDftToDft, VmpApplyDftToDftAdd, VmpApplyDftToDftTmpBytes, }, layouts::{Backend, DataMut, DataRef, Module, Scratch, ZnxView, ZnxViewMut, ZnxZero}, }; use crate::{ - TakeGLWECt, + TakeGLWE, layouts::{GGLWEInfos, GLWE, GLWEInfos, GLWELayout, LWE, LWEInfos, Rank, prepared::GLWEToLWESwitchingKeyPrepared}, }; @@ -23,7 +23,7 @@ impl LWE> { OUT: LWEInfos, IN: GLWEInfos, KEY: GGLWEInfos, - Module: VecZnxDftAllocBytes + VmpApplyDftToDftTmpBytes + VecZnxBigNormalizeTmpBytes + VecZnxNormalizeTmpBytes, + Module: VecZnxDftBytesOf + VmpApplyDftToDftTmpBytes + VecZnxBigNormalizeTmpBytes + VecZnxNormalizeTmpBytes, { let glwe_layout: GLWELayout = GLWELayout { n: module.n().into(), @@ -69,7 +69,7 @@ impl LWE { ) where DGlwe: DataRef, DKs: DataRef, - Module: VecZnxDftAllocBytes + Module: VecZnxDftBytesOf + VmpApplyDftToDftTmpBytes + VecZnxBigNormalizeTmpBytes + VmpApplyDftToDft @@ -80,7 +80,7 @@ impl LWE { + VecZnxBigNormalize + VecZnxNormalize + VecZnxNormalizeTmpBytes, - Scratch: ScratchAvailable + TakeVecZnxDft + TakeGLWECt + TakeVecZnx, + Scratch: ScratchAvailable + TakeVecZnxDft + TakeGLWE + TakeVecZnx, { #[cfg(debug_assertions)] { diff --git a/poulpy-core/src/conversion/lwe_to_glwe.rs b/poulpy-core/src/conversion/lwe_to_glwe.rs index bb5480e..de40d8f 100644 --- a/poulpy-core/src/conversion/lwe_to_glwe.rs +++ b/poulpy-core/src/conversion/lwe_to_glwe.rs @@ -1,14 +1,14 @@ use poulpy_hal::{ api::{ ScratchAvailable, TakeVecZnx, TakeVecZnxDft, VecZnxBigAddSmallInplace, VecZnxBigNormalize, VecZnxBigNormalizeTmpBytes, - VecZnxDftAllocBytes, VecZnxDftApply, VecZnxIdftApplyConsume, VecZnxNormalize, VecZnxNormalizeTmpBytes, VmpApplyDftToDft, + VecZnxDftApply, VecZnxDftBytesOf, VecZnxIdftApplyConsume, VecZnxNormalize, VecZnxNormalizeTmpBytes, VmpApplyDftToDft, VmpApplyDftToDftAdd, VmpApplyDftToDftTmpBytes, }, layouts::{Backend, DataMut, DataRef, Module, Scratch, VecZnx, ZnxView, ZnxViewMut, ZnxZero}, }; use crate::{ - TakeGLWECt, + TakeGLWE, layouts::{GGLWEInfos, GLWE, GLWEInfos, GLWELayout, LWE, LWEInfos, prepared::LWEToGLWESwitchingKeyPrepared}, }; @@ -23,7 +23,7 @@ impl GLWE> { OUT: GLWEInfos, IN: LWEInfos, KEY: GGLWEInfos, - Module: VecZnxDftAllocBytes + VmpApplyDftToDftTmpBytes + VecZnxBigNormalizeTmpBytes + VecZnxNormalizeTmpBytes, + Module: VecZnxDftBytesOf + VmpApplyDftToDftTmpBytes + VecZnxBigNormalizeTmpBytes + VecZnxNormalizeTmpBytes, { let ct: usize = GLWE::bytes_of( module.n().into(), @@ -51,7 +51,7 @@ impl GLWE { ) where DLwe: DataRef, DKsk: DataRef, - Module: VecZnxDftAllocBytes + Module: VecZnxDftBytesOf + VmpApplyDftToDftTmpBytes + VecZnxBigNormalizeTmpBytes + VmpApplyDftToDft @@ -62,7 +62,7 @@ impl GLWE { + VecZnxBigNormalize + VecZnxNormalize + VecZnxNormalizeTmpBytes, - Scratch: ScratchAvailable + TakeVecZnxDft + TakeGLWECt + TakeVecZnx, + Scratch: ScratchAvailable + TakeVecZnxDft + TakeGLWE + TakeVecZnx, { #[cfg(debug_assertions)] { diff --git a/poulpy-core/src/decryption/glwe_ct.rs b/poulpy-core/src/decryption/glwe_ct.rs index 92b8c29..89c6591 100644 --- a/poulpy-core/src/decryption/glwe_ct.rs +++ b/poulpy-core/src/decryption/glwe_ct.rs @@ -1,7 +1,7 @@ use poulpy_hal::{ api::{ SvpApplyDftToDftInplace, TakeVecZnxBig, TakeVecZnxDft, VecZnxBigAddInplace, VecZnxBigAddSmallInplace, VecZnxBigNormalize, - VecZnxDftAllocBytes, VecZnxDftApply, VecZnxIdftApplyConsume, VecZnxNormalizeTmpBytes, + VecZnxDftApply, VecZnxDftBytesOf, VecZnxIdftApplyConsume, VecZnxNormalizeTmpBytes, }, layouts::{Backend, DataMut, DataRef, DataViewMut, Module, Scratch}, }; @@ -12,10 +12,10 @@ impl GLWE> { pub fn decrypt_scratch_space(module: &Module, infos: &A) -> usize where A: GLWEInfos, - Module: VecZnxDftAllocBytes + VecZnxNormalizeTmpBytes + VecZnxDftAllocBytes, + Module: VecZnxDftBytesOf + VecZnxNormalizeTmpBytes + VecZnxDftBytesOf, { let size: usize = infos.size(); - (module.vec_znx_normalize_tmp_bytes() | module.vec_znx_dft_bytes_of(1, size)) + module.vec_znx_dft_bytes_of(1, size) + (module.vec_znx_normalize_tmp_bytes() | module.bytes_of_vec_znx_dft(1, size)) + module.bytes_of_vec_znx_dft(1, size) } } diff --git a/poulpy-core/src/encryption/compressed/gglwe_atk.rs b/poulpy-core/src/encryption/compressed/gglwe_atk.rs index 7e717c6..9091e74 100644 --- a/poulpy-core/src/encryption/compressed/gglwe_atk.rs +++ b/poulpy-core/src/encryption/compressed/gglwe_atk.rs @@ -1,5 +1,5 @@ use poulpy_hal::{ - api::{ScratchAvailable, SvpPPolAllocBytes, VecZnxAutomorphism, VecZnxDftAllocBytes, VecZnxNormalizeTmpBytes}, + api::{ScratchAvailable, SvpPPolBytesOf, VecZnxAutomorphism, VecZnxDftBytesOf, VecZnxNormalizeTmpBytes}, layouts::{Backend, DataMut, DataRef, Module, Scratch}, source::Source, }; @@ -17,7 +17,7 @@ impl AutomorphismKeyCompressed> { pub fn encrypt_sk_scratch_space(module: &Module, infos: &A) -> usize where A: GGLWEInfos, - Module: VecZnxNormalizeTmpBytes + VecZnxDftAllocBytes + VecZnxNormalizeTmpBytes + SvpPPolAllocBytes, + Module: VecZnxNormalizeTmpBytes + VecZnxDftBytesOf + VecZnxNormalizeTmpBytes + SvpPPolBytesOf, { assert_eq!(module.n() as u32, infos.n()); GLWESwitchingKeyCompressed::encrypt_sk_scratch_space(module, infos) + GLWESecret::bytes_of(infos.n(), infos.rank_out()) @@ -40,8 +40,7 @@ pub trait GGLWEAutomorphismKeyCompressedEncryptSk { impl GGLWEAutomorphismKeyCompressedEncryptSk for Module where - Module: - GGLWEKeyCompressedEncryptSk + VecZnxNormalizeTmpBytes + VecZnxDftAllocBytes + SvpPPolAllocBytes + VecZnxAutomorphism, + Module: GGLWEKeyCompressedEncryptSk + VecZnxNormalizeTmpBytes + VecZnxDftBytesOf + SvpPPolBytesOf + VecZnxAutomorphism, Scratch: TakeGLWESecret + ScratchAvailable, { fn gglwe_automorphism_key_compressed_encrypt_sk( diff --git a/poulpy-core/src/encryption/compressed/gglwe_ct.rs b/poulpy-core/src/encryption/compressed/gglwe_ct.rs index f5a136f..bd0f3b3 100644 --- a/poulpy-core/src/encryption/compressed/gglwe_ct.rs +++ b/poulpy-core/src/encryption/compressed/gglwe_ct.rs @@ -1,6 +1,6 @@ use poulpy_hal::{ api::{ - ScratchAvailable, VecZnxAddScalarInplace, VecZnxDftAllocBytes, VecZnxNormalizeInplace, VecZnxNormalizeTmpBytes, + ScratchAvailable, VecZnxAddScalarInplace, VecZnxDftBytesOf, VecZnxNormalizeInplace, VecZnxNormalizeTmpBytes, ZnNormalizeInplace, }, layouts::{Backend, DataMut, DataRef, Module, ScalarZnx, ScalarZnxToRef, Scratch, ZnxZero}, @@ -8,7 +8,7 @@ use poulpy_hal::{ }; use crate::{ - TakeGLWEPt, + TakeGLWEPlaintext, encryption::{SIGMA, glwe_ct::GLWEEncryptSkInternal}, layouts::{ GGLWE, GGLWEInfos, LWEInfos, @@ -38,7 +38,7 @@ impl GGLWECompressed> { pub fn encrypt_sk_scratch_space(module: &Module, infos: &A) -> usize where A: GGLWEInfos, - Module: VecZnxNormalizeTmpBytes + VecZnxDftAllocBytes + VecZnxNormalizeTmpBytes, + Module: VecZnxNormalizeTmpBytes + VecZnxDftBytesOf + VecZnxNormalizeTmpBytes, { GGLWE::encrypt_sk_scratch_space(module, infos) } @@ -64,10 +64,10 @@ where Module: GLWEEncryptSkInternal + VecZnxNormalizeInplace + VecZnxNormalizeTmpBytes - + VecZnxDftAllocBytes + + VecZnxDftBytesOf + VecZnxAddScalarInplace + ZnNormalizeInplace, - Scratch: TakeGLWEPt + ScratchAvailable, + Scratch: TakeGLWEPlaintext + ScratchAvailable, { fn gglwe_compressed_encrypt_sk( &self, diff --git a/poulpy-core/src/encryption/compressed/gglwe_ksk.rs b/poulpy-core/src/encryption/compressed/gglwe_ksk.rs index 260c02e..800a37e 100644 --- a/poulpy-core/src/encryption/compressed/gglwe_ksk.rs +++ b/poulpy-core/src/encryption/compressed/gglwe_ksk.rs @@ -1,7 +1,6 @@ use poulpy_hal::{ api::{ - ScratchAvailable, SvpPPolAllocBytes, SvpPrepare, TakeScalarZnx, VecZnxDftAllocBytes, VecZnxNormalizeTmpBytes, - VecZnxSwitchRing, + ScratchAvailable, SvpPPolBytesOf, SvpPrepare, TakeScalarZnx, VecZnxDftBytesOf, VecZnxNormalizeTmpBytes, VecZnxSwitchRing, }, layouts::{Backend, DataMut, DataRef, Module, ScalarZnx, Scratch}, source::Source, @@ -21,7 +20,7 @@ impl GLWESwitchingKeyCompressed> { pub fn encrypt_sk_scratch_space(module: &Module, infos: &A) -> usize where A: GGLWEInfos, - Module: VecZnxNormalizeTmpBytes + VecZnxDftAllocBytes + VecZnxNormalizeTmpBytes + SvpPPolAllocBytes, + Module: VecZnxNormalizeTmpBytes + VecZnxDftBytesOf + VecZnxNormalizeTmpBytes + SvpPPolBytesOf, { (GGLWE::encrypt_sk_scratch_space(module, infos) | ScalarZnx::bytes_of(module.n(), 1)) + ScalarZnx::bytes_of(module.n(), infos.rank_in().into()) @@ -64,9 +63,9 @@ pub trait GGLWEKeyCompressedEncryptSk { impl GGLWEKeyCompressedEncryptSk for Module where Module: GGLWECompressedEncryptSk - + SvpPPolAllocBytes + + SvpPPolBytesOf + VecZnxNormalizeTmpBytes - + VecZnxDftAllocBytes + + VecZnxDftBytesOf + VecZnxSwitchRing + SvpPrepare, Scratch: ScratchAvailable + TakeScalarZnx + TakeGLWESecretPrepared, diff --git a/poulpy-core/src/encryption/compressed/gglwe_tsk.rs b/poulpy-core/src/encryption/compressed/gglwe_tsk.rs index 65012d6..0c88f67 100644 --- a/poulpy-core/src/encryption/compressed/gglwe_tsk.rs +++ b/poulpy-core/src/encryption/compressed/gglwe_tsk.rs @@ -1,7 +1,7 @@ use poulpy_hal::{ api::{ - SvpApplyDftToDft, SvpPPolAllocBytes, SvpPrepare, TakeVecZnxBig, TakeVecZnxDft, VecZnxBigAllocBytes, VecZnxBigNormalize, - VecZnxDftAllocBytes, VecZnxDftApply, VecZnxIdftApplyTmpA, VecZnxNormalizeTmpBytes, + SvpApplyDftToDft, SvpPPolBytesOf, SvpPrepare, TakeVecZnxBig, TakeVecZnxDft, VecZnxBigBytesOf, VecZnxBigNormalize, + VecZnxDftApply, VecZnxDftBytesOf, VecZnxIdftApplyTmpA, VecZnxNormalizeTmpBytes, }, layouts::{Backend, DataMut, DataRef, Module, Scratch}, source::Source, @@ -20,8 +20,7 @@ impl TensorKeyCompressed> { pub fn encrypt_sk_scratch_space(module: &Module, infos: &A) -> usize where A: GGLWEInfos, - Module: - SvpPPolAllocBytes + VecZnxNormalizeTmpBytes + VecZnxDftAllocBytes + VecZnxNormalizeTmpBytes + VecZnxBigAllocBytes, + Module: SvpPPolBytesOf + VecZnxNormalizeTmpBytes + VecZnxDftBytesOf + VecZnxNormalizeTmpBytes + VecZnxBigBytesOf, { TensorKey::encrypt_sk_scratch_space(module, infos) } diff --git a/poulpy-core/src/encryption/compressed/ggsw_ct.rs b/poulpy-core/src/encryption/compressed/ggsw_ct.rs index 56f22ad..31efd53 100644 --- a/poulpy-core/src/encryption/compressed/ggsw_ct.rs +++ b/poulpy-core/src/encryption/compressed/ggsw_ct.rs @@ -1,11 +1,11 @@ use poulpy_hal::{ - api::{VecZnxAddScalarInplace, VecZnxDftAllocBytes, VecZnxNormalizeInplace, VecZnxNormalizeTmpBytes}, + api::{VecZnxAddScalarInplace, VecZnxDftBytesOf, VecZnxNormalizeInplace, VecZnxNormalizeTmpBytes}, layouts::{Backend, DataMut, DataRef, Module, ScalarZnx, ScalarZnxToRef, Scratch, ZnxZero}, source::Source, }; use crate::{ - TakeGLWEPt, + TakeGLWEPlaintext, encryption::{SIGMA, glwe_ct::GLWEEncryptSkInternal}, layouts::{ GGSW, GGSWInfos, GLWEInfos, LWEInfos, @@ -18,7 +18,7 @@ impl GGSWCompressed> { pub fn encrypt_sk_scratch_space(module: &Module, infos: &A) -> usize where A: GGSWInfos, - Module: VecZnxNormalizeTmpBytes + VecZnxDftAllocBytes, + Module: VecZnxNormalizeTmpBytes + VecZnxDftBytesOf, { GGSW::encrypt_sk_scratch_space(module, infos) } @@ -42,7 +42,7 @@ pub trait GGSWCompressedEncryptSk { impl GGSWCompressedEncryptSk for Module where Module: GLWEEncryptSkInternal + VecZnxAddScalarInplace + VecZnxNormalizeInplace, - Scratch: TakeGLWEPt, + Scratch: TakeGLWEPlaintext, { fn ggsw_compressed_encrypt_sk( &self, diff --git a/poulpy-core/src/encryption/compressed/glwe_ct.rs b/poulpy-core/src/encryption/compressed/glwe_ct.rs index 6fadd31..1c8efe6 100644 --- a/poulpy-core/src/encryption/compressed/glwe_ct.rs +++ b/poulpy-core/src/encryption/compressed/glwe_ct.rs @@ -1,5 +1,5 @@ use poulpy_hal::{ - api::{VecZnxDftAllocBytes, VecZnxNormalizeTmpBytes}, + api::{VecZnxDftBytesOf, VecZnxNormalizeTmpBytes}, layouts::{Backend, DataMut, DataRef, Module, Scratch}, source::Source, }; @@ -17,7 +17,7 @@ impl GLWECompressed> { pub fn encrypt_sk_scratch_space(module: &Module, infos: &A) -> usize where A: GLWEInfos, - Module: VecZnxNormalizeTmpBytes + VecZnxDftAllocBytes, + Module: VecZnxNormalizeTmpBytes + VecZnxDftBytesOf, { GLWE::encrypt_sk_scratch_space(module, infos) } diff --git a/poulpy-core/src/encryption/gglwe_atk.rs b/poulpy-core/src/encryption/gglwe_atk.rs index 18caa37..2fa90d4 100644 --- a/poulpy-core/src/encryption/gglwe_atk.rs +++ b/poulpy-core/src/encryption/gglwe_atk.rs @@ -1,8 +1,8 @@ use poulpy_hal::{ api::{ - ScratchAvailable, SvpApplyDftToDftInplace, SvpPPolAllocBytes, SvpPrepare, TakeScalarZnx, TakeVecZnx, TakeVecZnxDft, - VecZnxAddInplace, VecZnxAddNormal, VecZnxAddScalarInplace, VecZnxAutomorphism, VecZnxBigNormalize, VecZnxDftAllocBytes, - VecZnxDftApply, VecZnxFillUniform, VecZnxIdftApplyConsume, VecZnxNormalize, VecZnxNormalizeInplace, + ScratchAvailable, SvpApplyDftToDftInplace, SvpPPolBytesOf, SvpPrepare, TakeScalarZnx, TakeVecZnx, TakeVecZnxDft, + VecZnxAddInplace, VecZnxAddNormal, VecZnxAddScalarInplace, VecZnxAutomorphism, VecZnxBigNormalize, VecZnxDftApply, + VecZnxDftBytesOf, VecZnxFillUniform, VecZnxIdftApplyConsume, VecZnxNormalize, VecZnxNormalizeInplace, VecZnxNormalizeTmpBytes, VecZnxSub, VecZnxSubInplace, VecZnxSwitchRing, }, layouts::{Backend, DataMut, Module, Scratch}, @@ -20,7 +20,7 @@ impl AutomorphismKey> { pub fn encrypt_sk_scratch_space(module: &Module, infos: &A) -> usize where A: GGLWEInfos, - Module: SvpPPolAllocBytes + VecZnxNormalizeTmpBytes + VecZnxDftAllocBytes + VecZnxNormalizeTmpBytes, + Module: SvpPPolBytesOf + VecZnxNormalizeTmpBytes + VecZnxDftBytesOf + VecZnxNormalizeTmpBytes, { assert_eq!( infos.rank_in(), @@ -80,7 +80,7 @@ where impl GGLWEAutomorphismKeyEncryptSk for Module where Module: VecZnxAddScalarInplace - + VecZnxDftAllocBytes + + VecZnxDftBytesOf + VecZnxBigNormalize + VecZnxDftApply + SvpApplyDftToDftInplace @@ -95,7 +95,7 @@ where + VecZnxSub + SvpPrepare + VecZnxSwitchRing - + SvpPPolAllocBytes + + SvpPPolBytesOf + VecZnxAutomorphism, Scratch: TakeVecZnxDft + ScratchAvailable + TakeVecZnx + TakeScalarZnx + TakeGLWESecretPrepared, { diff --git a/poulpy-core/src/encryption/gglwe_ct.rs b/poulpy-core/src/encryption/gglwe_ct.rs index 9beed56..a4bff60 100644 --- a/poulpy-core/src/encryption/gglwe_ct.rs +++ b/poulpy-core/src/encryption/gglwe_ct.rs @@ -1,6 +1,6 @@ use poulpy_hal::{ api::{ - ScratchAvailable, TakeVecZnx, TakeVecZnxDft, VecZnxAddScalarInplace, VecZnxDftAllocBytes, VecZnxNormalizeInplace, + ScratchAvailable, TakeVecZnx, TakeVecZnxDft, VecZnxAddScalarInplace, VecZnxDftBytesOf, VecZnxNormalizeInplace, VecZnxNormalizeTmpBytes, }, layouts::{Backend, DataMut, DataRef, Module, ScalarZnx, ScalarZnxToRef, Scratch, ZnxZero}, @@ -8,7 +8,7 @@ use poulpy_hal::{ }; use crate::{ - TakeGLWEPt, + TakeGLWEPlaintext, encryption::glwe_ct::GLWEEncryptSk, layouts::{ GGLWE, GGLWEInfos, GGLWEToMut, GLWE, GLWEPlaintext, LWEInfos, @@ -20,7 +20,7 @@ impl GGLWE> { pub fn encrypt_sk_scratch_space(module: &Module, infos: &A) -> usize where A: GGLWEInfos, - Module: VecZnxNormalizeTmpBytes + VecZnxDftAllocBytes + VecZnxNormalizeTmpBytes, + Module: VecZnxNormalizeTmpBytes + VecZnxDftBytesOf + VecZnxNormalizeTmpBytes, { GLWE::encrypt_sk_scratch_space(module, &infos.glwe_layout()) + (GLWEPlaintext::bytes_of(&infos.glwe_layout()) | module.vec_znx_normalize_tmp_bytes()) @@ -51,8 +51,7 @@ pub trait GGLWEEncryptSk { impl GGLWEEncryptSk for Module where - Module: - GLWEEncryptSk + VecZnxNormalizeTmpBytes + VecZnxDftAllocBytes + VecZnxAddScalarInplace + VecZnxNormalizeInplace, + Module: GLWEEncryptSk + VecZnxNormalizeTmpBytes + VecZnxDftBytesOf + VecZnxAddScalarInplace + VecZnxNormalizeInplace, Scratch: TakeVecZnxDft + ScratchAvailable + TakeVecZnx, { fn gglwe_encrypt_sk( diff --git a/poulpy-core/src/encryption/gglwe_ksk.rs b/poulpy-core/src/encryption/gglwe_ksk.rs index b0caa54..64d9e9e 100644 --- a/poulpy-core/src/encryption/gglwe_ksk.rs +++ b/poulpy-core/src/encryption/gglwe_ksk.rs @@ -1,7 +1,7 @@ use poulpy_hal::{ api::{ - ScratchAvailable, SvpApplyDftToDftInplace, SvpPPolAllocBytes, SvpPrepare, TakeScalarZnx, TakeVecZnx, TakeVecZnxDft, - VecZnxAddInplace, VecZnxAddNormal, VecZnxAddScalarInplace, VecZnxBigNormalize, VecZnxDftAllocBytes, VecZnxDftApply, + ScratchAvailable, SvpApplyDftToDftInplace, SvpPPolBytesOf, SvpPrepare, TakeScalarZnx, TakeVecZnx, TakeVecZnxDft, + VecZnxAddInplace, VecZnxAddNormal, VecZnxAddScalarInplace, VecZnxBigNormalize, VecZnxDftApply, VecZnxDftBytesOf, VecZnxFillUniform, VecZnxIdftApplyConsume, VecZnxNormalize, VecZnxNormalizeInplace, VecZnxNormalizeTmpBytes, VecZnxSub, VecZnxSubInplace, VecZnxSwitchRing, }, @@ -18,7 +18,7 @@ impl GLWESwitchingKey> { pub fn encrypt_sk_scratch_space(module: &Module, infos: &A) -> usize where A: GGLWEInfos, - Module: SvpPPolAllocBytes + VecZnxNormalizeTmpBytes + VecZnxDftAllocBytes + VecZnxNormalizeTmpBytes, + Module: SvpPPolBytesOf + VecZnxNormalizeTmpBytes + VecZnxDftBytesOf + VecZnxNormalizeTmpBytes, { (GGLWE::encrypt_sk_scratch_space(module, infos) | ScalarZnx::bytes_of(module.n(), 1)) + ScalarZnx::bytes_of(module.n(), infos.rank_in().into()) @@ -45,7 +45,7 @@ impl GLWESwitchingKey { scratch: &mut Scratch, ) where Module: VecZnxAddScalarInplace - + VecZnxDftAllocBytes + + VecZnxDftBytesOf + VecZnxBigNormalize + VecZnxDftApply + SvpApplyDftToDftInplace @@ -60,7 +60,7 @@ impl GLWESwitchingKey { + VecZnxSub + SvpPrepare + VecZnxSwitchRing - + SvpPPolAllocBytes, + + SvpPPolBytesOf, Scratch: TakeVecZnxDft + ScratchAvailable + TakeVecZnx + TakeScalarZnx + TakeGLWESecretPrepared, { #[cfg(debug_assertions)] diff --git a/poulpy-core/src/encryption/gglwe_tsk.rs b/poulpy-core/src/encryption/gglwe_tsk.rs index 4de505a..c2762a0 100644 --- a/poulpy-core/src/encryption/gglwe_tsk.rs +++ b/poulpy-core/src/encryption/gglwe_tsk.rs @@ -1,8 +1,8 @@ use poulpy_hal::{ api::{ - ScratchAvailable, SvpApplyDftToDft, SvpApplyDftToDftInplace, SvpPPolAllocBytes, SvpPrepare, TakeScalarZnx, TakeVecZnx, - TakeVecZnxBig, TakeVecZnxDft, VecZnxAddInplace, VecZnxAddNormal, VecZnxAddScalarInplace, VecZnxBigAllocBytes, - VecZnxBigNormalize, VecZnxDftAllocBytes, VecZnxDftApply, VecZnxFillUniform, VecZnxIdftApplyConsume, VecZnxIdftApplyTmpA, + ScratchAvailable, SvpApplyDftToDft, SvpApplyDftToDftInplace, SvpPPolBytesOf, SvpPrepare, TakeScalarZnx, TakeVecZnx, + TakeVecZnxBig, TakeVecZnxDft, VecZnxAddInplace, VecZnxAddNormal, VecZnxAddScalarInplace, VecZnxBigBytesOf, + VecZnxBigNormalize, VecZnxDftApply, VecZnxDftBytesOf, VecZnxFillUniform, VecZnxIdftApplyConsume, VecZnxIdftApplyTmpA, VecZnxNormalize, VecZnxNormalizeInplace, VecZnxNormalizeTmpBytes, VecZnxSub, VecZnxSubInplace, VecZnxSwitchRing, }, layouts::{Backend, DataMut, DataRef, Module, Scratch}, @@ -20,13 +20,12 @@ impl TensorKey> { pub fn encrypt_sk_scratch_space(module: &Module, infos: &A) -> usize where A: GGLWEInfos, - Module: - SvpPPolAllocBytes + VecZnxNormalizeTmpBytes + VecZnxDftAllocBytes + VecZnxNormalizeTmpBytes + VecZnxBigAllocBytes, + Module: SvpPPolBytesOf + VecZnxNormalizeTmpBytes + VecZnxDftBytesOf + VecZnxNormalizeTmpBytes + VecZnxBigBytesOf, { GLWESecretPrepared::bytes_of(module, infos.rank_out()) - + module.vec_znx_dft_bytes_of(infos.rank_out().into(), 1) - + module.vec_znx_big_bytes_of(1, 1) - + module.vec_znx_dft_bytes_of(1, 1) + + module.bytes_of_vec_znx_dft(infos.rank_out().into(), 1) + + module.bytes_of_vec_znx_big(1, 1) + + module.bytes_of_vec_znx_dft(1, 1) + GLWESecret::bytes_of(Degree(module.n() as u32), Rank(1)) + GLWESwitchingKey::encrypt_sk_scratch_space(module, infos) } @@ -44,7 +43,7 @@ impl TensorKey { Module: SvpApplyDftToDft + VecZnxIdftApplyTmpA + VecZnxAddScalarInplace - + VecZnxDftAllocBytes + + VecZnxDftBytesOf + VecZnxBigNormalize + VecZnxDftApply + SvpApplyDftToDftInplace @@ -59,7 +58,7 @@ impl TensorKey { + VecZnxSub + SvpPrepare + VecZnxSwitchRing - + SvpPPolAllocBytes, + + SvpPPolBytesOf, Scratch: TakeVecZnxDft + ScratchAvailable + TakeVecZnx + TakeScalarZnx + TakeGLWESecretPrepared + TakeVecZnxBig, { diff --git a/poulpy-core/src/encryption/ggsw_ct.rs b/poulpy-core/src/encryption/ggsw_ct.rs index ea200d4..6def5d3 100644 --- a/poulpy-core/src/encryption/ggsw_ct.rs +++ b/poulpy-core/src/encryption/ggsw_ct.rs @@ -1,11 +1,11 @@ use poulpy_hal::{ - api::{VecZnxAddScalarInplace, VecZnxDftAllocBytes, VecZnxNormalizeInplace, VecZnxNormalizeTmpBytes}, + api::{VecZnxAddScalarInplace, VecZnxDftBytesOf, VecZnxNormalizeInplace, VecZnxNormalizeTmpBytes}, layouts::{Backend, DataMut, DataRef, Module, ScalarZnx, ScalarZnxToRef, Scratch, VecZnx, ZnxZero}, source::Source, }; use crate::{ - SIGMA, TakeGLWEPt, + SIGMA, TakeGLWEPlaintext, encryption::glwe_ct::GLWEEncryptSkInternal, layouts::{ GGSW, GGSWInfos, GGSWToMut, GLWE, GLWEInfos, LWEInfos, @@ -17,13 +17,13 @@ impl GGSW> { pub fn encrypt_sk_scratch_space(module: &Module, infos: &A) -> usize where A: GGSWInfos, - Module: VecZnxNormalizeTmpBytes + VecZnxDftAllocBytes, + Module: VecZnxNormalizeTmpBytes + VecZnxDftBytesOf, { let size = infos.size(); GLWE::encrypt_sk_scratch_space(module, &infos.glwe_layout()) + VecZnx::bytes_of(module.n(), (infos.rank() + 1).into(), size) + VecZnx::bytes_of(module.n(), 1, size) - + module.vec_znx_dft_bytes_of((infos.rank() + 1).into(), size) + + module.bytes_of_vec_znx_dft((infos.rank() + 1).into(), size) } } @@ -45,7 +45,7 @@ pub trait GGSWEncryptSk { impl GGSWEncryptSk for Module where Module: GLWEEncryptSkInternal + VecZnxAddScalarInplace + VecZnxNormalizeInplace, - Scratch: TakeGLWEPt, + Scratch: TakeGLWEPlaintext, { fn ggsw_encrypt_sk( &self, diff --git a/poulpy-core/src/encryption/glwe_ct.rs b/poulpy-core/src/encryption/glwe_ct.rs index 9fe8411..afd0881 100644 --- a/poulpy-core/src/encryption/glwe_ct.rs +++ b/poulpy-core/src/encryption/glwe_ct.rs @@ -1,8 +1,8 @@ use poulpy_hal::{ api::{ - ScratchAvailable, SvpApplyDftToDft, SvpApplyDftToDftInplace, SvpPPolAllocBytes, SvpPrepare, TakeScalarZnx, TakeSvpPPol, + ScratchAvailable, SvpApplyDftToDft, SvpApplyDftToDftInplace, SvpPPolBytesOf, SvpPrepare, TakeScalarZnx, TakeSvpPPol, TakeVecZnx, TakeVecZnxDft, VecZnxAddInplace, VecZnxAddNormal, VecZnxBigAddNormal, VecZnxBigAddSmallInplace, - VecZnxBigAllocBytes, VecZnxBigNormalize, VecZnxDftAllocBytes, VecZnxDftApply, VecZnxFillUniform, VecZnxIdftApplyConsume, + VecZnxBigBytesOf, VecZnxBigNormalize, VecZnxDftApply, VecZnxDftBytesOf, VecZnxFillUniform, VecZnxIdftApplyConsume, VecZnxNormalize, VecZnxNormalizeInplace, VecZnxNormalizeTmpBytes, VecZnxSub, VecZnxSubInplace, }, layouts::{Backend, DataMut, Module, ScalarZnx, Scratch, VecZnx, VecZnxBig, VecZnxToMut, ZnxInfos, ZnxZero}, @@ -22,21 +22,21 @@ impl GLWE> { pub fn encrypt_sk_scratch_space(module: &Module, infos: &A) -> usize where A: GLWEInfos, - Module: VecZnxNormalizeTmpBytes + VecZnxDftAllocBytes, + Module: VecZnxNormalizeTmpBytes + VecZnxDftBytesOf, { let size: usize = infos.size(); assert_eq!(module.n() as u32, infos.n()); - module.vec_znx_normalize_tmp_bytes() + 2 * VecZnx::bytes_of(module.n(), 1, size) + module.vec_znx_dft_bytes_of(1, size) + module.vec_znx_normalize_tmp_bytes() + 2 * VecZnx::bytes_of(module.n(), 1, size) + module.bytes_of_vec_znx_dft(1, size) } pub fn encrypt_pk_scratch_space(module: &Module, infos: &A) -> usize where A: GLWEInfos, - Module: VecZnxDftAllocBytes + SvpPPolAllocBytes + VecZnxBigAllocBytes + VecZnxNormalizeTmpBytes, + Module: VecZnxDftBytesOf + SvpPPolBytesOf + VecZnxBigBytesOf + VecZnxNormalizeTmpBytes, { let size: usize = infos.size(); assert_eq!(module.n() as u32, infos.n()); - ((module.vec_znx_dft_bytes_of(1, size) + module.vec_znx_big_bytes_of(1, size)) | ScalarZnx::bytes_of(module.n(), 1)) - + module.svp_ppol_bytes_of(1) + ((module.bytes_of_vec_znx_dft(1, size) + module.bytes_of_vec_znx_big(1, size)) | ScalarZnx::bytes_of(module.n(), 1)) + + module.bytes_of_svp_ppol(1) + module.vec_znx_normalize_tmp_bytes() } } @@ -120,7 +120,7 @@ pub trait GLWEEncryptSk { impl GLWEEncryptSk for Module where - Module: GLWEEncryptSkInternal + VecZnxNormalizeTmpBytes + VecZnxDftAllocBytes, + Module: GLWEEncryptSkInternal + VecZnxNormalizeTmpBytes + VecZnxDftBytesOf, Scratch: ScratchAvailable, { fn glwe_encrypt_sk( @@ -186,7 +186,7 @@ pub trait GLWEEncryptZeroSk { impl GLWEEncryptZeroSk for Module where - Module: GLWEEncryptSkInternal + VecZnxNormalizeTmpBytes + VecZnxDftAllocBytes, + Module: GLWEEncryptSkInternal + VecZnxNormalizeTmpBytes + VecZnxDftBytesOf, Scratch: ScratchAvailable, { fn glwe_encrypt_zero_sk( @@ -440,7 +440,7 @@ pub(crate) trait GLWEEncryptSkInternal { impl GLWEEncryptSkInternal for Module where - Module: VecZnxDftAllocBytes + Module: VecZnxDftBytesOf + VecZnxBigNormalize + VecZnxDftApply + SvpApplyDftToDftInplace diff --git a/poulpy-core/src/encryption/glwe_pk.rs b/poulpy-core/src/encryption/glwe_pk.rs index d8f96c2..6312b13 100644 --- a/poulpy-core/src/encryption/glwe_pk.rs +++ b/poulpy-core/src/encryption/glwe_pk.rs @@ -1,5 +1,5 @@ use poulpy_hal::{ - api::{ScratchOwnedAlloc, ScratchOwnedBorrow, VecZnxDftAllocBytes, VecZnxNormalizeTmpBytes}, + api::{ScratchOwnedAlloc, ScratchOwnedBorrow, VecZnxDftBytesOf, VecZnxNormalizeTmpBytes}, layouts::{Backend, DataMut, DataRef, Module, ScratchOwned}, source::Source, }; @@ -21,7 +21,7 @@ pub trait GLWEPublicKeyGenerate { impl GLWEPublicKeyGenerate for Module where - Module: GLWEEncryptZeroSk + VecZnxNormalizeTmpBytes + VecZnxDftAllocBytes, + Module: GLWEEncryptZeroSk + VecZnxNormalizeTmpBytes + VecZnxDftBytesOf, ScratchOwned: ScratchOwnedAlloc + ScratchOwnedBorrow, { fn glwe_public_key_generate(&self, res: &mut R, sk: &S, source_xa: &mut Source, source_xe: &mut Source) diff --git a/poulpy-core/src/encryption/glwe_to_lwe_ksk.rs b/poulpy-core/src/encryption/glwe_to_lwe_ksk.rs index 56c92aa..585bb12 100644 --- a/poulpy-core/src/encryption/glwe_to_lwe_ksk.rs +++ b/poulpy-core/src/encryption/glwe_to_lwe_ksk.rs @@ -1,8 +1,8 @@ use poulpy_hal::{ api::{ - ScratchAvailable, SvpApplyDftToDftInplace, SvpPPolAllocBytes, SvpPrepare, TakeScalarZnx, TakeVecZnx, TakeVecZnxDft, - VecZnxAddInplace, VecZnxAddNormal, VecZnxAddScalarInplace, VecZnxAutomorphismInplace, VecZnxBigNormalize, - VecZnxDftAllocBytes, VecZnxDftApply, VecZnxFillUniform, VecZnxIdftApplyConsume, VecZnxNormalize, VecZnxNormalizeInplace, + ScratchAvailable, SvpApplyDftToDftInplace, SvpPPolBytesOf, SvpPrepare, TakeScalarZnx, TakeVecZnx, TakeVecZnxDft, + VecZnxAddInplace, VecZnxAddNormal, VecZnxAddScalarInplace, VecZnxAutomorphismInplace, VecZnxBigNormalize, VecZnxDftApply, + VecZnxDftBytesOf, VecZnxFillUniform, VecZnxIdftApplyConsume, VecZnxNormalize, VecZnxNormalizeInplace, VecZnxNormalizeTmpBytes, VecZnxSub, VecZnxSubInplace, VecZnxSwitchRing, }, layouts::{Backend, DataMut, DataRef, Module, Scratch, ZnxView, ZnxViewMut, ZnxZero}, @@ -20,7 +20,7 @@ impl GLWEToLWESwitchingKey> { pub fn encrypt_sk_scratch_space(module: &Module, infos: &A) -> usize where A: GGLWEInfos, - Module: SvpPPolAllocBytes + VecZnxNormalizeTmpBytes + VecZnxDftAllocBytes + VecZnxNormalizeTmpBytes, + Module: SvpPPolBytesOf + VecZnxNormalizeTmpBytes + VecZnxDftBytesOf + VecZnxNormalizeTmpBytes, { GLWESecretPrepared::bytes_of(module, infos.rank_in()) + (GLWESwitchingKey::encrypt_sk_scratch_space(module, infos) | GLWESecret::bytes_of(infos.n(), infos.rank_in())) @@ -42,7 +42,7 @@ impl GLWEToLWESwitchingKey { DGlwe: DataRef, Module: VecZnxAutomorphismInplace + VecZnxAddScalarInplace - + VecZnxDftAllocBytes + + VecZnxDftBytesOf + VecZnxBigNormalize + VecZnxDftApply + SvpApplyDftToDftInplace @@ -57,7 +57,7 @@ impl GLWEToLWESwitchingKey { + VecZnxSub + SvpPrepare + VecZnxSwitchRing - + SvpPPolAllocBytes, + + SvpPPolBytesOf, Scratch: TakeVecZnxDft + ScratchAvailable + TakeVecZnx + TakeScalarZnx + TakeGLWESecretPrepared, { #[cfg(debug_assertions)] diff --git a/poulpy-core/src/encryption/lwe_ksk.rs b/poulpy-core/src/encryption/lwe_ksk.rs index 23cea9b..28eab5f 100644 --- a/poulpy-core/src/encryption/lwe_ksk.rs +++ b/poulpy-core/src/encryption/lwe_ksk.rs @@ -1,8 +1,8 @@ use poulpy_hal::{ api::{ - ScratchAvailable, SvpApplyDftToDftInplace, SvpPPolAllocBytes, SvpPrepare, TakeScalarZnx, TakeVecZnx, TakeVecZnxDft, - VecZnxAddInplace, VecZnxAddNormal, VecZnxAddScalarInplace, VecZnxAutomorphismInplace, VecZnxBigNormalize, - VecZnxDftAllocBytes, VecZnxDftApply, VecZnxFillUniform, VecZnxIdftApplyConsume, VecZnxNormalize, VecZnxNormalizeInplace, + ScratchAvailable, SvpApplyDftToDftInplace, SvpPPolBytesOf, SvpPrepare, TakeScalarZnx, TakeVecZnx, TakeVecZnxDft, + VecZnxAddInplace, VecZnxAddNormal, VecZnxAddScalarInplace, VecZnxAutomorphismInplace, VecZnxBigNormalize, VecZnxDftApply, + VecZnxDftBytesOf, VecZnxFillUniform, VecZnxIdftApplyConsume, VecZnxNormalize, VecZnxNormalizeInplace, VecZnxNormalizeTmpBytes, VecZnxSub, VecZnxSubInplace, VecZnxSwitchRing, }, layouts::{Backend, DataMut, DataRef, Module, Scratch, ZnxView, ZnxViewMut}, @@ -21,7 +21,7 @@ impl LWESwitchingKey> { pub fn encrypt_sk_scratch_space(module: &Module, infos: &A) -> usize where A: GGLWEInfos, - Module: SvpPPolAllocBytes + VecZnxNormalizeTmpBytes + VecZnxDftAllocBytes + VecZnxNormalizeTmpBytes, + Module: SvpPPolBytesOf + VecZnxNormalizeTmpBytes + VecZnxDftBytesOf + VecZnxNormalizeTmpBytes, { debug_assert_eq!( infos.dsize().0, @@ -59,7 +59,7 @@ impl LWESwitchingKey { DOut: DataRef, Module: VecZnxAutomorphismInplace + VecZnxAddScalarInplace - + VecZnxDftAllocBytes + + VecZnxDftBytesOf + VecZnxBigNormalize + VecZnxDftApply + SvpApplyDftToDftInplace @@ -74,7 +74,7 @@ impl LWESwitchingKey { + VecZnxSub + SvpPrepare + VecZnxSwitchRing - + SvpPPolAllocBytes, + + SvpPPolBytesOf, Scratch: TakeVecZnxDft + ScratchAvailable + TakeVecZnx + TakeScalarZnx + TakeGLWESecretPrepared, { #[cfg(debug_assertions)] diff --git a/poulpy-core/src/encryption/lwe_to_glwe_ksk.rs b/poulpy-core/src/encryption/lwe_to_glwe_ksk.rs index bf60c09..0f8ea56 100644 --- a/poulpy-core/src/encryption/lwe_to_glwe_ksk.rs +++ b/poulpy-core/src/encryption/lwe_to_glwe_ksk.rs @@ -1,8 +1,8 @@ use poulpy_hal::{ api::{ - ScratchAvailable, SvpApplyDftToDftInplace, SvpPPolAllocBytes, SvpPrepare, TakeScalarZnx, TakeVecZnx, TakeVecZnxDft, - VecZnxAddInplace, VecZnxAddNormal, VecZnxAddScalarInplace, VecZnxAutomorphismInplace, VecZnxBigNormalize, - VecZnxDftAllocBytes, VecZnxDftApply, VecZnxFillUniform, VecZnxIdftApplyConsume, VecZnxNormalize, VecZnxNormalizeInplace, + ScratchAvailable, SvpApplyDftToDftInplace, SvpPPolBytesOf, SvpPrepare, TakeScalarZnx, TakeVecZnx, TakeVecZnxDft, + VecZnxAddInplace, VecZnxAddNormal, VecZnxAddScalarInplace, VecZnxAutomorphismInplace, VecZnxBigNormalize, VecZnxDftApply, + VecZnxDftBytesOf, VecZnxFillUniform, VecZnxIdftApplyConsume, VecZnxNormalize, VecZnxNormalizeInplace, VecZnxNormalizeTmpBytes, VecZnxSub, VecZnxSubInplace, VecZnxSwitchRing, }, layouts::{Backend, DataMut, DataRef, Module, Scratch, ZnxView, ZnxViewMut}, @@ -18,7 +18,7 @@ impl LWEToGLWESwitchingKey> { pub fn encrypt_sk_scratch_space(module: &Module, infos: &A) -> usize where A: GGLWEInfos, - Module: SvpPPolAllocBytes + VecZnxNormalizeTmpBytes + VecZnxDftAllocBytes + VecZnxNormalizeTmpBytes, + Module: SvpPPolBytesOf + VecZnxNormalizeTmpBytes + VecZnxDftBytesOf + VecZnxNormalizeTmpBytes, { debug_assert_eq!( infos.rank_in(), @@ -45,7 +45,7 @@ impl LWEToGLWESwitchingKey { DGlwe: DataRef, Module: VecZnxAutomorphismInplace + VecZnxAddScalarInplace - + VecZnxDftAllocBytes + + VecZnxDftBytesOf + VecZnxBigNormalize + VecZnxDftApply + SvpApplyDftToDftInplace @@ -60,7 +60,7 @@ impl LWEToGLWESwitchingKey { + VecZnxSub + SvpPrepare + VecZnxSwitchRing - + SvpPPolAllocBytes, + + SvpPPolBytesOf, Scratch: TakeVecZnxDft + ScratchAvailable + TakeVecZnx + TakeScalarZnx + TakeGLWESecretPrepared, { #[cfg(debug_assertions)] diff --git a/poulpy-core/src/external_product/gglwe_atk.rs b/poulpy-core/src/external_product/gglwe_atk.rs index 7228c28..742af02 100644 --- a/poulpy-core/src/external_product/gglwe_atk.rs +++ b/poulpy-core/src/external_product/gglwe_atk.rs @@ -1,6 +1,6 @@ use poulpy_hal::{ api::{ - ScratchAvailable, TakeVecZnx, TakeVecZnxDft, VecZnxBigNormalize, VecZnxDftAllocBytes, VecZnxDftApply, + ScratchAvailable, TakeVecZnx, TakeVecZnxDft, VecZnxBigNormalize, VecZnxDftApply, VecZnxDftBytesOf, VecZnxIdftApplyConsume, VecZnxNormalize, VecZnxNormalizeTmpBytes, VmpApplyDftToDft, VmpApplyDftToDftAdd, VmpApplyDftToDftTmpBytes, }, @@ -20,7 +20,7 @@ impl AutomorphismKey> { OUT: GGLWEInfos, IN: GGLWEInfos, GGSW: GGSWInfos, - Module: VecZnxDftAllocBytes + VmpApplyDftToDftTmpBytes + VecZnxNormalizeTmpBytes, + Module: VecZnxDftBytesOf + VmpApplyDftToDftTmpBytes + VecZnxNormalizeTmpBytes, { GLWESwitchingKey::external_product_scratch_space(module, out_infos, in_infos, ggsw_infos) } @@ -33,7 +33,7 @@ impl AutomorphismKey> { where OUT: GGLWEInfos, GGSW: GGSWInfos, - Module: VecZnxDftAllocBytes + VmpApplyDftToDftTmpBytes + VecZnxNormalizeTmpBytes, + Module: VecZnxDftBytesOf + VmpApplyDftToDftTmpBytes + VecZnxNormalizeTmpBytes, { GLWESwitchingKey::external_product_inplace_scratch_space(module, out_infos, ggsw_infos) } @@ -47,7 +47,7 @@ impl AutomorphismKey { rhs: &GGSWPrepared, scratch: &mut Scratch, ) where - Module: VecZnxDftAllocBytes + Module: VecZnxDftBytesOf + VmpApplyDftToDftTmpBytes + VecZnxNormalizeTmpBytes + VecZnxDftApply @@ -67,7 +67,7 @@ impl AutomorphismKey { rhs: &GGSWPrepared, scratch: &mut Scratch, ) where - Module: VecZnxDftAllocBytes + Module: VecZnxDftBytesOf + VmpApplyDftToDftTmpBytes + VecZnxNormalizeTmpBytes + VecZnxDftApply diff --git a/poulpy-core/src/external_product/gglwe_ksk.rs b/poulpy-core/src/external_product/gglwe_ksk.rs index c09898e..5877d40 100644 --- a/poulpy-core/src/external_product/gglwe_ksk.rs +++ b/poulpy-core/src/external_product/gglwe_ksk.rs @@ -1,6 +1,6 @@ use poulpy_hal::{ api::{ - ScratchAvailable, TakeVecZnx, TakeVecZnxDft, VecZnxBigNormalize, VecZnxDftAllocBytes, VecZnxDftApply, + ScratchAvailable, TakeVecZnx, TakeVecZnxDft, VecZnxBigNormalize, VecZnxDftApply, VecZnxDftBytesOf, VecZnxIdftApplyConsume, VecZnxNormalize, VecZnxNormalizeTmpBytes, VmpApplyDftToDft, VmpApplyDftToDftAdd, VmpApplyDftToDftTmpBytes, }, @@ -20,7 +20,7 @@ impl GLWESwitchingKey> { OUT: GGLWEInfos, IN: GGLWEInfos, GGSW: GGSWInfos, - Module: VecZnxDftAllocBytes + VmpApplyDftToDftTmpBytes + VecZnxNormalizeTmpBytes, + Module: VecZnxDftBytesOf + VmpApplyDftToDftTmpBytes + VecZnxNormalizeTmpBytes, { GLWE::external_product_scratch_space( module, @@ -38,7 +38,7 @@ impl GLWESwitchingKey> { where OUT: GGLWEInfos, GGSW: GGSWInfos, - Module: VecZnxDftAllocBytes + VmpApplyDftToDftTmpBytes + VecZnxNormalizeTmpBytes, + Module: VecZnxDftBytesOf + VmpApplyDftToDftTmpBytes + VecZnxNormalizeTmpBytes, { GLWE::external_product_inplace_scratch_space(module, &out_infos.glwe_layout(), ggsw_infos) } @@ -52,7 +52,7 @@ impl GLWESwitchingKey { rhs: &GGSWPrepared, scratch: &mut Scratch, ) where - Module: VecZnxDftAllocBytes + Module: VecZnxDftBytesOf + VmpApplyDftToDftTmpBytes + VecZnxNormalizeTmpBytes + VecZnxDftApply @@ -110,7 +110,7 @@ impl GLWESwitchingKey { rhs: &GGSWPrepared, scratch: &mut Scratch, ) where - Module: VecZnxDftAllocBytes + Module: VecZnxDftBytesOf + VmpApplyDftToDftTmpBytes + VecZnxNormalizeTmpBytes + VecZnxDftApply diff --git a/poulpy-core/src/external_product/ggsw_ct.rs b/poulpy-core/src/external_product/ggsw_ct.rs index 8e5eccd..387fdee 100644 --- a/poulpy-core/src/external_product/ggsw_ct.rs +++ b/poulpy-core/src/external_product/ggsw_ct.rs @@ -1,6 +1,6 @@ use poulpy_hal::{ api::{ - ScratchAvailable, TakeVecZnx, TakeVecZnxDft, VecZnxBigNormalize, VecZnxDftAllocBytes, VecZnxDftApply, + ScratchAvailable, TakeVecZnx, TakeVecZnxDft, VecZnxBigNormalize, VecZnxDftApply, VecZnxDftBytesOf, VecZnxIdftApplyConsume, VecZnxNormalize, VecZnxNormalizeTmpBytes, VmpApplyDftToDft, VmpApplyDftToDftAdd, VmpApplyDftToDftTmpBytes, }, @@ -21,7 +21,7 @@ impl GGSW> { OUT: GGSWInfos, IN: GGSWInfos, GGSW: GGSWInfos, - Module: VecZnxDftAllocBytes + VmpApplyDftToDftTmpBytes + VecZnxNormalizeTmpBytes, + Module: VecZnxDftBytesOf + VmpApplyDftToDftTmpBytes + VecZnxNormalizeTmpBytes, { GLWE::external_product_scratch_space( module, @@ -39,7 +39,7 @@ impl GGSW> { where OUT: GGSWInfos, GGSW: GGSWInfos, - Module: VecZnxDftAllocBytes + VmpApplyDftToDftTmpBytes + VecZnxNormalizeTmpBytes, + Module: VecZnxDftBytesOf + VmpApplyDftToDftTmpBytes + VecZnxNormalizeTmpBytes, { GLWE::external_product_inplace_scratch_space(module, &out_infos.glwe_layout(), apply_infos) } @@ -53,7 +53,7 @@ impl GGSW { rhs: &GGSWPrepared, scratch: &mut Scratch, ) where - Module: VecZnxDftAllocBytes + Module: VecZnxDftBytesOf + VmpApplyDftToDftTmpBytes + VecZnxNormalizeTmpBytes + VecZnxDftApply @@ -108,7 +108,7 @@ impl GGSW { rhs: &GGSWPrepared, scratch: &mut Scratch, ) where - Module: VecZnxDftAllocBytes + Module: VecZnxDftBytesOf + VmpApplyDftToDftTmpBytes + VecZnxNormalizeTmpBytes + VecZnxDftApply diff --git a/poulpy-core/src/external_product/glwe_ct.rs b/poulpy-core/src/external_product/glwe_ct.rs index 221d000..7c08cb6 100644 --- a/poulpy-core/src/external_product/glwe_ct.rs +++ b/poulpy-core/src/external_product/glwe_ct.rs @@ -1,21 +1,22 @@ use poulpy_hal::{ api::{ - ScratchAvailable, TakeVecZnx, TakeVecZnxDft, VecZnxBigNormalize, VecZnxDftAllocBytes, VecZnxDftApply, - VecZnxIdftApplyConsume, VecZnxNormalize, VecZnxNormalizeTmpBytes, VmpApplyDftToDft, VmpApplyDftToDftAdd, - VmpApplyDftToDftTmpBytes, + ScratchAvailable, VecZnxBigNormalize, VecZnxDftApply, VecZnxDftBytesOf, VecZnxIdftApplyConsume, VecZnxNormalize, + VecZnxNormalizeTmpBytes, VmpApplyDftToDft, VmpApplyDftToDftAdd, VmpApplyDftToDftTmpBytes, }, layouts::{Backend, DataMut, DataRef, DataViewMut, Module, Scratch, VecZnx, VecZnxBig}, }; -use crate::layouts::{ - GGSWInfos, GLWE, GLWEInfos, GLWEToMut, GLWEToRef, LWEInfos, - prepared::{GGSWCiphertextPreparedToRef, GGSWPrepared}, +use crate::{ + ScratchTakeCore, + layouts::{ + GGSWInfos, GGSWToRef, GLWE, GLWEInfos, GLWEToMut, GLWEToRef, GetDegree, LWEInfos, + prepared::{GGSWCiphertextPreparedToRef, GGSWPrepared}, + }, }; -impl GLWE> { - #[allow(clippy::too_many_arguments)] - pub fn external_product_scratch_space( - module: &Module, +impl GLWE { + pub fn external_product_scratch_space( + module: Module, out_infos: &OUT, in_infos: &IN, apply_infos: &GGSW, @@ -24,76 +25,35 @@ impl GLWE> { OUT: GLWEInfos, IN: GLWEInfos, GGSW: GGSWInfos, - Module: VecZnxDftAllocBytes + VmpApplyDftToDftTmpBytes + VecZnxNormalizeTmpBytes, + Module: GLWEExternalProduct, { - let in_size: usize = in_infos - .k() - .div_ceil(apply_infos.base2k()) - .div_ceil(apply_infos.dsize().into()) as usize; - let out_size: usize = out_infos.size(); - let ggsw_size: usize = apply_infos.size(); - let res_dft: usize = module.vec_znx_dft_bytes_of((apply_infos.rank() + 1).into(), ggsw_size); - let a_dft: usize = module.vec_znx_dft_bytes_of((apply_infos.rank() + 1).into(), in_size); - let vmp: usize = module.vmp_apply_dft_to_dft_tmp_bytes( - out_size, - in_size, - in_size, // rows - (apply_infos.rank() + 1).into(), // cols in - (apply_infos.rank() + 1).into(), // cols out - ggsw_size, - ); - let normalize_big: usize = module.vec_znx_normalize_tmp_bytes(); - - if in_infos.base2k() == apply_infos.base2k() { - res_dft + a_dft + (vmp | normalize_big) - } else { - let normalize_conv: usize = VecZnx::bytes_of(module.n(), (apply_infos.rank() + 1).into(), in_size); - res_dft + ((a_dft + normalize_conv + (module.vec_znx_normalize_tmp_bytes() | vmp)) | normalize_big) - } + module.glwe_external_product_scratch_space(out_infos, in_infos, apply_infos) } - pub fn external_product_inplace_scratch_space( - module: &Module, - out_infos: &OUT, - apply_infos: &GGSW, - ) -> usize + pub fn external_product(&mut self, module: &Module, lhs: &L, rhs: &R, scratch: &mut Scratch) where - OUT: GLWEInfos, - GGSW: GGSWInfos, - Module: VecZnxDftAllocBytes + VmpApplyDftToDftTmpBytes + VecZnxNormalizeTmpBytes, - { - Self::external_product_scratch_space(module, out_infos, out_infos, apply_infos) - } -} - -impl GLWE { - pub fn external_product( - &mut self, - module: &Module, - lhs: &GLWE, - rhs: &GGSWPrepared, - scratch: &mut Scratch, - ) where + L: GLWEToRef, + R: GGSWToRef, Module: GLWEExternalProduct, + Scratch: ScratchTakeCore, { - module.external_product(self, lhs, rhs, scratch); + module.glwe_external_product(self, lhs, rhs, scratch); } - pub fn external_product_inplace( - &mut self, - module: &Module, - rhs: &GGSWPrepared, - scratch: &mut Scratch, - ) where + pub fn external_product_inplace(&mut self, module: &Module, rhs: &R, scratch: &mut Scratch) + where + R: GGSWToRef, Module: GLWEExternalProduct, + Scratch: ScratchTakeCore, { - module.external_product_inplace(self, rhs, scratch); + module.glwe_external_product_inplace(self, rhs, scratch); } } pub trait GLWEExternalProduct where - Self: VecZnxDftAllocBytes + Self: GetDegree + + VecZnxDftBytesOf + VmpApplyDftToDftTmpBytes + VecZnxNormalizeTmpBytes + VecZnxDftApply @@ -101,13 +61,49 @@ where + VmpApplyDftToDftAdd + VecZnxIdftApplyConsume + VecZnxBigNormalize - + VecZnxNormalize, - Scratch: TakeVecZnxDft + ScratchAvailable + TakeVecZnx, + + VecZnxNormalize + + VecZnxDftBytesOf + + VmpApplyDftToDftTmpBytes + + VecZnxNormalizeTmpBytes, { + #[allow(clippy::too_many_arguments)] + fn glwe_external_product_scratch_space(&self, out_infos: &OUT, in_infos: &IN, apply_infos: &GGSW) -> usize + where + OUT: GLWEInfos, + IN: GLWEInfos, + GGSW: GGSWInfos, + { + let in_size: usize = in_infos + .k() + .div_ceil(apply_infos.base2k()) + .div_ceil(apply_infos.dsize().into()) as usize; + let out_size: usize = out_infos.size(); + let ggsw_size: usize = apply_infos.size(); + let res_dft: usize = self.bytes_of_vec_znx_dft((apply_infos.rank() + 1).into(), ggsw_size); + let a_dft: usize = self.bytes_of_vec_znx_dft((apply_infos.rank() + 1).into(), in_size); + let vmp: usize = self.vmp_apply_dft_to_dft_tmp_bytes( + out_size, + in_size, + in_size, // rows + (apply_infos.rank() + 1).into(), // cols in + (apply_infos.rank() + 1).into(), // cols out + ggsw_size, + ); + let normalize_big: usize = self.vec_znx_normalize_tmp_bytes(); + + if in_infos.base2k() == apply_infos.base2k() { + res_dft + a_dft + (vmp | normalize_big) + } else { + let normalize_conv: usize = VecZnx::bytes_of(self.n().into(), (apply_infos.rank() + 1).into(), in_size); + res_dft + ((a_dft + normalize_conv + (self.vec_znx_normalize_tmp_bytes() | vmp)) | normalize_big) + } + } + fn glwe_external_product_inplace(&self, res: &mut R, ggsw: &D, scratch: &mut Scratch) where R: GLWEToMut, D: GGSWCiphertextPreparedToRef, + Scratch: ScratchTakeCore, { let res: &mut GLWE<&mut [u8]> = &mut res.to_mut(); let rhs: &GGSWPrepared<&[u8], BE> = &ggsw.to_ref(); @@ -121,7 +117,7 @@ where assert_eq!(rhs.rank(), res.rank()); assert_eq!(rhs.n(), res.n()); - assert!(scratch.available() >= GLWE::external_product_inplace_scratch_space(self, res, rhs)); + assert!(scratch.available() >= self.glwe_external_product_scratch_space(res, res, rhs)); } let cols: usize = (rhs.rank() + 1).into(); @@ -157,7 +153,7 @@ where } } } else { - let (mut a_conv, scratch_3) = scratch_2.take_vec_znx(self.n(), cols, a_size); + let (mut a_conv, scratch_3) = scratch_2.take_vec_znx(self.n().into(), cols, a_size); for j in 0..cols { self.vec_znx_normalize( @@ -216,6 +212,7 @@ where R: GLWEToMut, A: GLWEToRef, D: GGSWCiphertextPreparedToRef, + Scratch: ScratchTakeCore, { let res: &mut GLWE<&mut [u8]> = &mut res.to_mut(); let lhs: &GLWE<&[u8]> = &lhs.to_ref(); @@ -234,7 +231,7 @@ where assert_eq!(rhs.rank(), res.rank()); assert_eq!(rhs.n(), res.n()); assert_eq!(lhs.n(), res.n()); - assert!(scratch.available() >= GLWE::external_product_scratch_space(self, res, lhs, rhs)); + assert!(scratch.available() >= self.glwe_external_product_scratch_space(res, lhs, rhs)); } let cols: usize = (rhs.rank() + 1).into(); @@ -242,8 +239,8 @@ where let a_size: usize = (lhs.size() * basek_in).div_ceil(basek_ggsw); - let (mut res_dft, scratch_1) = scratch.take_vec_znx_dft(self.n(), cols, rhs.size()); // Todo optimise - let (mut a_dft, scratch_2) = scratch_1.take_vec_znx_dft(self.n(), cols, a_size.div_ceil(dsize)); + let (mut res_dft, scratch_1) = scratch.take_vec_znx_dft(self.n().into(), cols, rhs.size()); // Todo optimise + let (mut a_dft, scratch_2) = scratch_1.take_vec_znx_dft(self.n().into(), cols, a_size.div_ceil(dsize)); a_dft.data_mut().fill(0); if basek_in == basek_ggsw { @@ -271,7 +268,7 @@ where } } } else { - let (mut a_conv, scratch_3) = scratch_2.take_vec_znx(self.n(), cols, a_size); + let (mut a_conv, scratch_3) = scratch_2.take_vec_znx(self.n().into(), cols, a_size); for j in 0..cols { self.vec_znx_normalize( @@ -326,9 +323,9 @@ where } } -impl GLWEExternalProduct for Module -where - Self: VecZnxDftAllocBytes +impl GLWEExternalProduct for Module where + Self: GetDegree + + VecZnxDftBytesOf + VmpApplyDftToDftTmpBytes + VecZnxNormalizeTmpBytes + VecZnxDftApply @@ -336,7 +333,9 @@ where + VmpApplyDftToDftAdd + VecZnxIdftApplyConsume + VecZnxBigNormalize - + VecZnxNormalize, - Scratch: TakeVecZnxDft + ScratchAvailable + TakeVecZnx, + + VecZnxNormalize + + VecZnxDftBytesOf + + VmpApplyDftToDftTmpBytes + + VecZnxNormalizeTmpBytes { } diff --git a/poulpy-core/src/external_product/mod.rs b/poulpy-core/src/external_product/mod.rs index 7e6c5ae..ad59fe9 100644 --- a/poulpy-core/src/external_product/mod.rs +++ b/poulpy-core/src/external_product/mod.rs @@ -1,8 +1,6 @@ -use poulpy_hal::layouts::{Backend, Scratch}; - -use crate::layouts::{GLWEToMut, GLWEToRef, prepared::GGSWCiphertextPreparedToRef}; - mod gglwe_atk; mod gglwe_ksk; mod ggsw_ct; mod glwe_ct; + +pub use glwe_ct::*; diff --git a/poulpy-core/src/glwe_packing.rs b/poulpy-core/src/glwe_packing.rs index 07b61a4..c5a2129 100644 --- a/poulpy-core/src/glwe_packing.rs +++ b/poulpy-core/src/glwe_packing.rs @@ -4,7 +4,7 @@ use poulpy_hal::{ api::{ ScratchAvailable, TakeVecZnx, TakeVecZnxDft, VecZnxAddInplace, VecZnxAutomorphismInplace, VecZnxBigAddSmallInplace, VecZnxBigAutomorphismInplace, VecZnxBigNormalize, VecZnxBigNormalizeTmpBytes, VecZnxBigSubSmallNegateInplace, VecZnxCopy, - VecZnxDftAllocBytes, VecZnxDftApply, VecZnxDftCopy, VecZnxIdftApplyConsume, VecZnxIdftApplyTmpA, VecZnxNegateInplace, + VecZnxDftApply, VecZnxDftBytesOf, VecZnxDftCopy, VecZnxIdftApplyConsume, VecZnxIdftApplyTmpA, VecZnxNegateInplace, VecZnxNormalize, VecZnxNormalizeInplace, VecZnxNormalizeTmpBytes, VecZnxRotate, VecZnxRotateInplace, VecZnxRshInplace, VecZnxSub, VecZnxSubInplace, VecZnxSwitchRing, VmpApplyDftToDft, VmpApplyDftToDftAdd, VmpApplyDftToDftTmpBytes, }, @@ -12,7 +12,7 @@ use poulpy_hal::{ }; use crate::{ - GLWEOperations, TakeGLWECt, + GLWEOperations, TakeGLWE, layouts::{GGLWEInfos, GLWE, GLWEInfos, LWEInfos, prepared::AutomorphismKeyPrepared}, }; @@ -94,7 +94,7 @@ impl GLWEPacker { where OUT: GLWEInfos, KEY: GGLWEInfos, - Module: VecZnxDftAllocBytes + VmpApplyDftToDftTmpBytes + VecZnxBigNormalizeTmpBytes + VecZnxNormalizeTmpBytes, + Module: VecZnxDftBytesOf + VmpApplyDftToDftTmpBytes + VecZnxBigNormalizeTmpBytes + VecZnxNormalizeTmpBytes, { pack_core_scratch_space(module, out_infos, key_infos) } @@ -119,7 +119,7 @@ impl GLWEPacker { auto_keys: &HashMap>, scratch: &mut Scratch, ) where - Module: VecZnxDftAllocBytes + Module: VecZnxDftBytesOf + VmpApplyDftToDftTmpBytes + VecZnxBigNormalizeTmpBytes + VmpApplyDftToDft @@ -181,7 +181,7 @@ fn pack_core_scratch_space(module: &Module, out_infos: where OUT: GLWEInfos, KEY: GGLWEInfos, - Module: VecZnxDftAllocBytes + VmpApplyDftToDftTmpBytes + VecZnxBigNormalizeTmpBytes + VecZnxNormalizeTmpBytes, + Module: VecZnxDftBytesOf + VmpApplyDftToDftTmpBytes + VecZnxBigNormalizeTmpBytes + VecZnxNormalizeTmpBytes, { combine_scratch_space(module, out_infos, key_infos) } @@ -194,7 +194,7 @@ fn pack_core( auto_keys: &HashMap>, scratch: &mut Scratch, ) where - Module: VecZnxDftAllocBytes + Module: VecZnxDftBytesOf + VmpApplyDftToDftTmpBytes + VecZnxBigNormalizeTmpBytes + VmpApplyDftToDft @@ -272,7 +272,7 @@ fn combine_scratch_space(module: &Module, out_infos: &O where OUT: GLWEInfos, KEY: GGLWEInfos, - Module: VecZnxDftAllocBytes + VmpApplyDftToDftTmpBytes + VecZnxBigNormalizeTmpBytes + VecZnxNormalizeTmpBytes, + Module: VecZnxDftBytesOf + VmpApplyDftToDftTmpBytes + VecZnxBigNormalizeTmpBytes + VecZnxNormalizeTmpBytes, { GLWE::bytes_of(out_infos) + (GLWE::rsh_scratch_space(module.n()) | GLWE::automorphism_inplace_scratch_space(module, out_infos, key_infos)) @@ -287,7 +287,7 @@ fn combine( auto_keys: &HashMap>, scratch: &mut Scratch, ) where - Module: VecZnxDftAllocBytes + Module: VecZnxDftBytesOf + VmpApplyDftToDftTmpBytes + VecZnxBigNormalizeTmpBytes + VmpApplyDftToDft @@ -310,7 +310,7 @@ fn combine( + VecZnxBigAutomorphismInplace + VecZnxNormalize + VecZnxNormalizeTmpBytes, - Scratch: TakeVecZnxDft + ScratchAvailable + TakeVecZnx + TakeGLWECt, + Scratch: TakeVecZnxDft + ScratchAvailable + TakeVecZnx + TakeGLWE, { let log_n: usize = acc.data.n().log2(); let a: &mut GLWE> = &mut acc.data; @@ -413,7 +413,7 @@ pub fn glwe_packing( + VecZnxNegateInplace + VecZnxCopy + VecZnxSubInplace - + VecZnxDftAllocBytes + + VecZnxDftBytesOf + VmpApplyDftToDftTmpBytes + VecZnxBigNormalizeTmpBytes + VmpApplyDftToDft @@ -480,7 +480,7 @@ fn pack_internal( + VecZnxNegateInplace + VecZnxCopy + VecZnxSubInplace - + VecZnxDftAllocBytes + + VecZnxDftBytesOf + VmpApplyDftToDftTmpBytes + VecZnxBigNormalizeTmpBytes + VmpApplyDftToDft diff --git a/poulpy-core/src/glwe_trace.rs b/poulpy-core/src/glwe_trace.rs index 85f0db3..5158361 100644 --- a/poulpy-core/src/glwe_trace.rs +++ b/poulpy-core/src/glwe_trace.rs @@ -3,14 +3,14 @@ use std::collections::HashMap; use poulpy_hal::{ api::{ ScratchAvailable, TakeVecZnx, TakeVecZnxDft, VecZnxBigAddSmallInplace, VecZnxBigAutomorphismInplace, VecZnxBigNormalize, - VecZnxBigNormalizeTmpBytes, VecZnxCopy, VecZnxDftAllocBytes, VecZnxDftApply, VecZnxIdftApplyConsume, VecZnxNormalize, + VecZnxBigNormalizeTmpBytes, VecZnxCopy, VecZnxDftApply, VecZnxDftBytesOf, VecZnxIdftApplyConsume, VecZnxNormalize, VecZnxNormalizeTmpBytes, VecZnxRshInplace, VmpApplyDftToDft, VmpApplyDftToDftAdd, VmpApplyDftToDftTmpBytes, }, layouts::{Backend, DataMut, DataRef, Module, Scratch, VecZnx}, }; use crate::{ - TakeGLWECt, + TakeGLWE, layouts::{Base2K, GGLWEInfos, GLWE, GLWEInfos, GLWELayout, LWEInfos, prepared::AutomorphismKeyPrepared}, operations::GLWEOperations, }; @@ -38,7 +38,7 @@ impl GLWE> { OUT: GLWEInfos, IN: GLWEInfos, KEY: GGLWEInfos, - Module: VecZnxDftAllocBytes + VmpApplyDftToDftTmpBytes + VecZnxBigNormalizeTmpBytes + VecZnxNormalizeTmpBytes, + Module: VecZnxDftBytesOf + VmpApplyDftToDftTmpBytes + VecZnxBigNormalizeTmpBytes + VecZnxNormalizeTmpBytes, { let trace: usize = Self::automorphism_inplace_scratch_space(module, out_infos, key_infos); if in_infos.base2k() != key_infos.base2k() { @@ -57,7 +57,7 @@ impl GLWE> { where OUT: GLWEInfos, KEY: GGLWEInfos, - Module: VecZnxDftAllocBytes + VmpApplyDftToDftTmpBytes + VecZnxBigNormalizeTmpBytes + VecZnxNormalizeTmpBytes, + Module: VecZnxDftBytesOf + VmpApplyDftToDftTmpBytes + VecZnxBigNormalizeTmpBytes + VecZnxNormalizeTmpBytes, { Self::trace_scratch_space(module, out_infos, out_infos, key_infos) } @@ -73,7 +73,7 @@ impl GLWE { auto_keys: &HashMap>, scratch: &mut Scratch, ) where - Module: VecZnxDftAllocBytes + Module: VecZnxDftBytesOf + VmpApplyDftToDftTmpBytes + VecZnxBigNormalizeTmpBytes + VmpApplyDftToDft @@ -101,7 +101,7 @@ impl GLWE { auto_keys: &HashMap>, scratch: &mut Scratch, ) where - Module: VecZnxDftAllocBytes + Module: VecZnxDftBytesOf + VmpApplyDftToDftTmpBytes + VecZnxBigNormalizeTmpBytes + VmpApplyDftToDft diff --git a/poulpy-core/src/keyswitching/gglwe_ct.rs b/poulpy-core/src/keyswitching/gglwe_ct.rs index 589c391..9b6f947 100644 --- a/poulpy-core/src/keyswitching/gglwe_ct.rs +++ b/poulpy-core/src/keyswitching/gglwe_ct.rs @@ -1,7 +1,7 @@ use poulpy_hal::{ api::{ ScratchAvailable, TakeVecZnx, TakeVecZnxDft, VecZnxBigAddSmallInplace, VecZnxBigNormalize, VecZnxBigNormalizeTmpBytes, - VecZnxDftAllocBytes, VecZnxDftApply, VecZnxIdftApplyConsume, VecZnxNormalize, VecZnxNormalizeTmpBytes, VmpApplyDftToDft, + VecZnxDftApply, VecZnxDftBytesOf, VecZnxIdftApplyConsume, VecZnxNormalize, VecZnxNormalizeTmpBytes, VmpApplyDftToDft, VmpApplyDftToDftAdd, VmpApplyDftToDftTmpBytes, }, layouts::{Backend, DataMut, DataRef, Module, Scratch, ZnxZero}, @@ -23,7 +23,7 @@ impl AutomorphismKey> { OUT: GGLWEInfos, IN: GGLWEInfos, KEY: GGLWEInfos, - Module: VecZnxDftAllocBytes + VmpApplyDftToDftTmpBytes + VecZnxBigNormalizeTmpBytes + VecZnxNormalizeTmpBytes, + Module: VecZnxDftBytesOf + VmpApplyDftToDftTmpBytes + VecZnxBigNormalizeTmpBytes + VecZnxNormalizeTmpBytes, { GLWESwitchingKey::keyswitch_scratch_space(module, out_infos, in_infos, key_infos) } @@ -32,7 +32,7 @@ impl AutomorphismKey> { where OUT: GGLWEInfos, KEY: GGLWEInfos, - Module: VecZnxDftAllocBytes + VmpApplyDftToDftTmpBytes + VecZnxBigNormalizeTmpBytes + VecZnxNormalizeTmpBytes, + Module: VecZnxDftBytesOf + VmpApplyDftToDftTmpBytes + VecZnxBigNormalizeTmpBytes + VecZnxNormalizeTmpBytes, { GLWESwitchingKey::keyswitch_inplace_scratch_space(module, out_infos, key_infos) } @@ -46,7 +46,7 @@ impl AutomorphismKey { rhs: &GLWESwitchingKeyPrepared, scratch: &mut Scratch, ) where - Module: VecZnxDftAllocBytes + Module: VecZnxDftBytesOf + VmpApplyDftToDftTmpBytes + VecZnxBigNormalizeTmpBytes + VmpApplyDftToDft @@ -68,7 +68,7 @@ impl AutomorphismKey { rhs: &AutomorphismKeyPrepared, scratch: &mut Scratch, ) where - Module: VecZnxDftAllocBytes + Module: VecZnxDftBytesOf + VmpApplyDftToDftTmpBytes + VecZnxBigNormalizeTmpBytes + VmpApplyDftToDft @@ -96,7 +96,7 @@ impl GLWESwitchingKey> { OUT: GGLWEInfos, IN: GGLWEInfos, KEY: GGLWEInfos, - Module: VecZnxDftAllocBytes + VmpApplyDftToDftTmpBytes + VecZnxBigNormalizeTmpBytes + VecZnxNormalizeTmpBytes, + Module: VecZnxDftBytesOf + VmpApplyDftToDftTmpBytes + VecZnxBigNormalizeTmpBytes + VecZnxNormalizeTmpBytes, { GLWE::keyswitch_scratch_space(module, out_infos, in_infos, key_apply) } @@ -105,7 +105,7 @@ impl GLWESwitchingKey> { where OUT: GGLWEInfos + GLWEInfos, KEY: GGLWEInfos + GLWEInfos, - Module: VecZnxDftAllocBytes + VmpApplyDftToDftTmpBytes + VecZnxBigNormalizeTmpBytes + VecZnxNormalizeTmpBytes, + Module: VecZnxDftBytesOf + VmpApplyDftToDftTmpBytes + VecZnxBigNormalizeTmpBytes + VecZnxNormalizeTmpBytes, { GLWE::keyswitch_inplace_scratch_space(module, out_infos, key_apply) } @@ -119,7 +119,7 @@ impl GLWESwitchingKey { rhs: &GLWESwitchingKeyPrepared, scratch: &mut Scratch, ) where - Module: VecZnxDftAllocBytes + Module: VecZnxDftBytesOf + VmpApplyDftToDftTmpBytes + VecZnxBigNormalizeTmpBytes + VmpApplyDftToDft @@ -190,7 +190,7 @@ impl GLWESwitchingKey { rhs: &GLWESwitchingKeyPrepared, scratch: &mut Scratch, ) where - Module: VecZnxDftAllocBytes + Module: VecZnxDftBytesOf + VmpApplyDftToDftTmpBytes + VecZnxBigNormalizeTmpBytes + VmpApplyDftToDft diff --git a/poulpy-core/src/keyswitching/ggsw_ct.rs b/poulpy-core/src/keyswitching/ggsw_ct.rs index eea54a2..42aa925 100644 --- a/poulpy-core/src/keyswitching/ggsw_ct.rs +++ b/poulpy-core/src/keyswitching/ggsw_ct.rs @@ -1,7 +1,7 @@ use poulpy_hal::{ api::{ - ScratchAvailable, TakeVecZnx, TakeVecZnxBig, TakeVecZnxDft, VecZnxBigAddSmallInplace, VecZnxBigAllocBytes, - VecZnxBigNormalize, VecZnxBigNormalizeTmpBytes, VecZnxCopy, VecZnxDftAddInplace, VecZnxDftAllocBytes, VecZnxDftApply, + ScratchAvailable, TakeVecZnx, TakeVecZnxBig, TakeVecZnxDft, VecZnxBigAddSmallInplace, VecZnxBigBytesOf, + VecZnxBigNormalize, VecZnxBigNormalizeTmpBytes, VecZnxCopy, VecZnxDftAddInplace, VecZnxDftApply, VecZnxDftBytesOf, VecZnxDftCopy, VecZnxIdftApplyConsume, VecZnxIdftApplyTmpA, VecZnxNormalize, VecZnxNormalizeTmpBytes, VmpApplyDftToDft, VmpApplyDftToDftAdd, VmpApplyDftToDftTmpBytes, }, @@ -21,7 +21,7 @@ impl GGSW> { where OUT: GGSWInfos, TSK: GGLWEInfos, - Module: VecZnxDftAllocBytes + VmpApplyDftToDftTmpBytes + VecZnxBigAllocBytes + VecZnxNormalizeTmpBytes, + Module: VecZnxDftBytesOf + VmpApplyDftToDftTmpBytes + VecZnxBigBytesOf + VecZnxNormalizeTmpBytes, { let tsk_size: usize = tsk_infos.k().div_ceil(tsk_infos.base2k()) as usize; let size_in: usize = out_infos @@ -29,8 +29,8 @@ impl GGSW> { .div_ceil(tsk_infos.base2k()) .div_ceil(tsk_infos.dsize().into()) as usize; - let tmp_dft_i: usize = module.vec_znx_dft_bytes_of((tsk_infos.rank_out() + 1).into(), tsk_size); - let tmp_a: usize = module.vec_znx_dft_bytes_of(1, size_in); + let tmp_dft_i: usize = module.bytes_of_vec_znx_dft((tsk_infos.rank_out() + 1).into(), tsk_size); + let tmp_a: usize = module.bytes_of_vec_znx_dft(1, size_in); let vmp: usize = module.vmp_apply_dft_to_dft_tmp_bytes( tsk_size, size_in, @@ -39,7 +39,7 @@ impl GGSW> { (tsk_infos.rank_out()).into(), // Verify if rank+1 tsk_size, ); - let tmp_idft: usize = module.vec_znx_big_bytes_of(1, tsk_size); + let tmp_idft: usize = module.bytes_of_vec_znx_big(1, tsk_size); let norm: usize = module.vec_znx_normalize_tmp_bytes(); tmp_dft_i + ((tmp_a + vmp) | (tmp_idft + norm)) @@ -58,11 +58,8 @@ impl GGSW> { IN: GGSWInfos, KEY: GGLWEInfos, TSK: GGLWEInfos, - Module: VecZnxDftAllocBytes - + VmpApplyDftToDftTmpBytes - + VecZnxBigAllocBytes - + VecZnxNormalizeTmpBytes - + VecZnxBigNormalizeTmpBytes, + Module: + VecZnxDftBytesOf + VmpApplyDftToDftTmpBytes + VecZnxBigBytesOf + VecZnxNormalizeTmpBytes + VecZnxBigNormalizeTmpBytes, { #[cfg(debug_assertions)] { @@ -75,10 +72,10 @@ impl GGSW> { let size_out: usize = out_infos.k().div_ceil(out_infos.base2k()) as usize; let res_znx: usize = VecZnx::bytes_of(module.n(), rank + 1, size_out); - let ci_dft: usize = module.vec_znx_dft_bytes_of(rank + 1, size_out); + let ci_dft: usize = module.bytes_of_vec_znx_dft(rank + 1, size_out); let ks: usize = GLWE::keyswitch_scratch_space(module, out_infos, in_infos, apply_infos); let expand_rows: usize = GGSW::expand_row_scratch_space(module, out_infos, tsk_infos); - let res_dft: usize = module.vec_znx_dft_bytes_of(rank + 1, size_out); + let res_dft: usize = module.bytes_of_vec_znx_dft(rank + 1, size_out); if in_infos.base2k() == tsk_infos.base2k() { res_znx + ci_dft + (ks | expand_rows | res_dft) @@ -103,11 +100,8 @@ impl GGSW> { OUT: GGSWInfos, KEY: GGLWEInfos, TSK: GGLWEInfos, - Module: VecZnxDftAllocBytes - + VmpApplyDftToDftTmpBytes - + VecZnxBigAllocBytes - + VecZnxNormalizeTmpBytes - + VecZnxBigNormalizeTmpBytes, + Module: + VecZnxDftBytesOf + VmpApplyDftToDftTmpBytes + VecZnxBigBytesOf + VecZnxNormalizeTmpBytes + VecZnxBigNormalizeTmpBytes, { GGSW::keyswitch_scratch_space(module, out_infos, out_infos, apply_infos, tsk_infos) } @@ -124,9 +118,9 @@ impl GGSW { DataA: DataRef, DataTsk: DataRef, Module: VecZnxCopy - + VecZnxDftAllocBytes + + VecZnxDftBytesOf + VmpApplyDftToDftTmpBytes - + VecZnxBigAllocBytes + + VecZnxBigBytesOf + VecZnxNormalizeTmpBytes + VecZnxDftApply + VecZnxDftCopy @@ -162,7 +156,7 @@ impl GGSW { tsk: &TensorKeyPrepared, scratch: &mut Scratch, ) where - Module: VecZnxDftAllocBytes + Module: VecZnxDftBytesOf + VmpApplyDftToDftTmpBytes + VecZnxBigNormalizeTmpBytes + VmpApplyDftToDft @@ -171,8 +165,8 @@ impl GGSW { + VecZnxIdftApplyConsume + VecZnxBigAddSmallInplace + VecZnxBigNormalize - + VecZnxDftAllocBytes - + VecZnxBigAllocBytes + + VecZnxDftBytesOf + + VecZnxBigBytesOf + VecZnxNormalizeTmpBytes + VecZnxDftCopy + VecZnxDftAddInplace @@ -196,7 +190,7 @@ impl GGSW { tsk: &TensorKeyPrepared, scratch: &mut Scratch, ) where - Module: VecZnxDftAllocBytes + Module: VecZnxDftBytesOf + VmpApplyDftToDftTmpBytes + VecZnxBigNormalizeTmpBytes + VmpApplyDftToDft @@ -205,8 +199,8 @@ impl GGSW { + VecZnxIdftApplyConsume + VecZnxBigAddSmallInplace + VecZnxBigNormalize - + VecZnxDftAllocBytes - + VecZnxBigAllocBytes + + VecZnxDftBytesOf + + VecZnxBigBytesOf + VecZnxNormalizeTmpBytes + VecZnxDftCopy + VecZnxDftAddInplace @@ -229,9 +223,9 @@ impl GGSW { tsk: &TensorKeyPrepared, scratch: &mut Scratch, ) where - Module: VecZnxDftAllocBytes + Module: VecZnxDftBytesOf + VmpApplyDftToDftTmpBytes - + VecZnxBigAllocBytes + + VecZnxBigBytesOf + VecZnxNormalizeTmpBytes + VecZnxDftApply + VecZnxDftCopy diff --git a/poulpy-core/src/keyswitching/glwe_ct.rs b/poulpy-core/src/keyswitching/glwe_ct.rs index f785016..1f3e10c 100644 --- a/poulpy-core/src/keyswitching/glwe_ct.rs +++ b/poulpy-core/src/keyswitching/glwe_ct.rs @@ -1,7 +1,7 @@ use poulpy_hal::{ api::{ ScratchAvailable, TakeVecZnx, TakeVecZnxDft, VecZnxBigAddSmallInplace, VecZnxBigNormalize, VecZnxBigNormalizeTmpBytes, - VecZnxDftAllocBytes, VecZnxDftApply, VecZnxIdftApplyConsume, VecZnxNormalize, VecZnxNormalizeTmpBytes, VmpApplyDftToDft, + VecZnxDftApply, VecZnxDftBytesOf, VecZnxIdftApplyConsume, VecZnxNormalize, VecZnxNormalizeTmpBytes, VmpApplyDftToDft, VmpApplyDftToDftAdd, VmpApplyDftToDftTmpBytes, }, layouts::{Backend, DataMut, DataRef, DataViewMut, Module, Scratch, VecZnx, VecZnxBig, VecZnxDft, VmpPMat, ZnxInfos}, @@ -20,7 +20,7 @@ impl GLWE> { OUT: GLWEInfos, IN: GLWEInfos, KEY: GGLWEInfos, - Module: VecZnxDftAllocBytes + VmpApplyDftToDftTmpBytes + VecZnxBigNormalizeTmpBytes + VecZnxNormalizeTmpBytes, + Module: VecZnxDftBytesOf + VmpApplyDftToDftTmpBytes + VecZnxBigNormalizeTmpBytes + VecZnxNormalizeTmpBytes, { let in_size: usize = in_infos .k() @@ -28,8 +28,8 @@ impl GLWE> { .div_ceil(key_apply.dsize().into()) as usize; let out_size: usize = out_infos.size(); let ksk_size: usize = key_apply.size(); - let res_dft: usize = module.vec_znx_dft_bytes_of((key_apply.rank_out() + 1).into(), ksk_size); // TODO OPTIMIZE - let ai_dft: usize = module.vec_znx_dft_bytes_of((key_apply.rank_in()).into(), in_size); + let res_dft: usize = module.bytes_of_vec_znx_dft((key_apply.rank_out() + 1).into(), ksk_size); // TODO OPTIMIZE + let ai_dft: usize = module.bytes_of_vec_znx_dft((key_apply.rank_in()).into(), in_size); let vmp: usize = module.vmp_apply_dft_to_dft_tmp_bytes( out_size, in_size, @@ -37,7 +37,7 @@ impl GLWE> { (key_apply.rank_in()).into(), (key_apply.rank_out() + 1).into(), ksk_size, - ) + module.vec_znx_dft_bytes_of((key_apply.rank_in()).into(), in_size); + ) + module.bytes_of_vec_znx_dft((key_apply.rank_in()).into(), in_size); let normalize_big: usize = module.vec_znx_big_normalize_tmp_bytes(); if in_infos.base2k() == key_apply.base2k() { res_dft + ((ai_dft + vmp) | normalize_big) @@ -56,7 +56,7 @@ impl GLWE> { where OUT: GLWEInfos, KEY: GGLWEInfos, - Module: VecZnxDftAllocBytes + VmpApplyDftToDftTmpBytes + VecZnxBigNormalizeTmpBytes + VecZnxNormalizeTmpBytes, + Module: VecZnxDftBytesOf + VmpApplyDftToDftTmpBytes + VecZnxBigNormalizeTmpBytes + VecZnxNormalizeTmpBytes, { Self::keyswitch_scratch_space(module, out_infos, out_infos, key_apply) } @@ -73,7 +73,7 @@ impl GLWE { ) where DataLhs: DataRef, DataRhs: DataRef, - Module: VecZnxDftAllocBytes + VmpApplyDftToDftTmpBytes + VecZnxBigNormalizeTmpBytes + VecZnxNormalizeTmpBytes, + Module: VecZnxDftBytesOf + VmpApplyDftToDftTmpBytes + VecZnxBigNormalizeTmpBytes + VecZnxNormalizeTmpBytes, Scratch: ScratchAvailable, { assert_eq!( @@ -121,7 +121,7 @@ impl GLWE { scratch: &Scratch, ) where DataRhs: DataRef, - Module: VecZnxDftAllocBytes + VmpApplyDftToDftTmpBytes + VecZnxBigNormalizeTmpBytes + VecZnxNormalizeTmpBytes, + Module: VecZnxDftBytesOf + VmpApplyDftToDftTmpBytes + VecZnxBigNormalizeTmpBytes + VecZnxNormalizeTmpBytes, Scratch: ScratchAvailable, { assert_eq!( @@ -152,7 +152,7 @@ impl GLWE { rhs: &GLWESwitchingKeyPrepared, scratch: &mut Scratch, ) where - Module: VecZnxDftAllocBytes + Module: VecZnxDftBytesOf + VmpApplyDftToDftTmpBytes + VecZnxBigNormalizeTmpBytes + VmpApplyDftToDft @@ -194,7 +194,7 @@ impl GLWE { rhs: &GLWESwitchingKeyPrepared, scratch: &mut Scratch, ) where - Module: VecZnxDftAllocBytes + Module: VecZnxDftBytesOf + VmpApplyDftToDftTmpBytes + VecZnxBigNormalizeTmpBytes + VmpApplyDftToDftTmpBytes @@ -243,7 +243,7 @@ impl GLWE { where DataRes: DataMut, DataKey: DataRef, - Module: VecZnxDftAllocBytes + Module: VecZnxDftBytesOf + VmpApplyDftToDftTmpBytes + VecZnxBigNormalizeTmpBytes + VmpApplyDftToDftTmpBytes @@ -294,7 +294,7 @@ where DataRes: DataMut, DataIn: DataRef, DataVmp: DataRef, - Module: VecZnxDftAllocBytes + Module: VecZnxDftBytesOf + VecZnxDftApply + VmpApplyDftToDft + VecZnxIdftApplyConsume @@ -340,7 +340,7 @@ where DataRes: DataMut, DataIn: DataRef, DataVmp: DataRef, - Module: VecZnxDftAllocBytes + Module: VecZnxDftBytesOf + VecZnxDftApply + VmpApplyDftToDft + VmpApplyDftToDftAdd diff --git a/poulpy-core/src/keyswitching/lwe_ct.rs b/poulpy-core/src/keyswitching/lwe_ct.rs index dd8c552..9a0c3bc 100644 --- a/poulpy-core/src/keyswitching/lwe_ct.rs +++ b/poulpy-core/src/keyswitching/lwe_ct.rs @@ -1,14 +1,14 @@ use poulpy_hal::{ api::{ ScratchAvailable, TakeVecZnx, TakeVecZnxDft, VecZnxBigAddSmallInplace, VecZnxBigNormalize, VecZnxBigNormalizeTmpBytes, - VecZnxCopy, VecZnxDftAllocBytes, VecZnxDftApply, VecZnxIdftApplyConsume, VecZnxNormalize, VecZnxNormalizeTmpBytes, + VecZnxCopy, VecZnxDftApply, VecZnxDftBytesOf, VecZnxIdftApplyConsume, VecZnxNormalize, VecZnxNormalizeTmpBytes, VmpApplyDftToDft, VmpApplyDftToDftAdd, VmpApplyDftToDftTmpBytes, }, layouts::{Backend, DataMut, DataRef, Module, Scratch, ZnxView, ZnxViewMut, ZnxZero}, }; use crate::{ - TakeGLWECt, + TakeGLWE, layouts::{GGLWEInfos, GLWE, GLWELayout, LWE, LWEInfos, Rank, TorusPrecision, prepared::LWESwitchingKeyPrepared}, }; @@ -23,7 +23,7 @@ impl LWE> { OUT: LWEInfos, IN: LWEInfos, KEY: GGLWEInfos, - Module: VecZnxDftAllocBytes + Module: VecZnxDftBytesOf + VmpApplyDftToDftTmpBytes + VecZnxBigNormalizeTmpBytes + VmpApplyDftToDftTmpBytes @@ -69,7 +69,7 @@ impl LWE { ) where A: DataRef, DKs: DataRef, - Module: VecZnxDftAllocBytes + Module: VecZnxDftBytesOf + VmpApplyDftToDftTmpBytes + VecZnxBigNormalizeTmpBytes + VmpApplyDftToDft diff --git a/poulpy-core/src/layouts/compressed/gglwe_atk.rs b/poulpy-core/src/layouts/compressed/gglwe_atk.rs index 29cf49b..04a51c0 100644 --- a/poulpy-core/src/layouts/compressed/gglwe_atk.rs +++ b/poulpy-core/src/layouts/compressed/gglwe_atk.rs @@ -210,7 +210,7 @@ impl AutomorphismKey where Self: SetAutomorphismGaloisElement, { - pub fn decompressed(&mut self, module: &Module, other: &O) + pub fn decompress(&mut self, module: &Module, other: &O) where O: AutomorphismKeyCompressedToRef + GetAutomorphismGaloisElement, Module: AutomorphismKeyDecompress, diff --git a/poulpy-core/src/layouts/compressed/gglwe_tsk.rs b/poulpy-core/src/layouts/compressed/gglwe_tsk.rs index 4c51b6a..730336c 100644 --- a/poulpy-core/src/layouts/compressed/gglwe_tsk.rs +++ b/poulpy-core/src/layouts/compressed/gglwe_tsk.rs @@ -86,7 +86,7 @@ pub trait TensorKeyCompressedAlloc where Self: GLWESwitchingKeyCompressedAlloc, { - fn tensor_key_compressed_alloc( + fn alloc_tensor_key_compressed( &self, base2k: Base2K, k: TorusPrecision, @@ -102,7 +102,7 @@ where } } - fn tensor_key_compressed_alloc_from_infos(&self, infos: &A) -> TensorKeyCompressed> + fn alloc_tensor_key_compressed_from_infos(&self, infos: &A) -> TensorKeyCompressed> where A: GGLWEInfos, { @@ -111,7 +111,7 @@ where infos.rank_out(), "rank_in != rank_out is not supported for GGLWETensorKeyCompressed" ); - self.tensor_key_compressed_alloc( + self.alloc_tensor_key_compressed( infos.base2k(), infos.k(), infos.rank(), @@ -120,16 +120,16 @@ where ) } - fn tensor_key_compressed_bytes_of(&self, base2k: Base2K, k: TorusPrecision, rank: Rank, dnum: Dnum, dsize: Dsize) -> usize { + fn bytes_of_tensor_key_compressed(&self, base2k: Base2K, k: TorusPrecision, rank: Rank, dnum: Dnum, dsize: Dsize) -> usize { let pairs: usize = (((rank.0 + 1) * rank.0) >> 1).max(1) as usize; pairs * self.bytes_of_glwe_switching_key_compressed(base2k, k, Rank(1), dnum, dsize) } - fn tensor_key_compressed_bytes_of_from_infos(&self, infos: &A) -> usize + fn bytes_of_tensor_key_compressed_from_infos(&self, infos: &A) -> usize where A: GGLWEInfos, { - self.tensor_key_compressed_bytes_of( + self.bytes_of_tensor_key_compressed( infos.base2k(), infos.k(), infos.rank(), @@ -145,14 +145,14 @@ impl TensorKeyCompressed> { A: GGLWEInfos, Module: TensorKeyCompressedAlloc, { - module.tensor_key_compressed_alloc_from_infos(infos) + module.alloc_tensor_key_compressed_from_infos(infos) } pub fn alloc(module: Module, base2k: Base2K, k: TorusPrecision, rank: Rank, dnum: Dnum, dsize: Dsize) -> Self where Module: TensorKeyCompressedAlloc, { - module.tensor_key_compressed_alloc(base2k, k, rank, dnum, dsize) + module.alloc_tensor_key_compressed(base2k, k, rank, dnum, dsize) } pub fn bytes_of_from_infos(module: Module, infos: &A) -> usize @@ -160,7 +160,7 @@ impl TensorKeyCompressed> { A: GGLWEInfos, Module: TensorKeyCompressedAlloc, { - module.tensor_key_compressed_bytes_of_from_infos(infos) + module.bytes_of_tensor_key_compressed_from_infos(infos) } pub fn bytes_of( @@ -174,7 +174,7 @@ impl TensorKeyCompressed> { where Module: TensorKeyCompressedAlloc, { - module.tensor_key_compressed_bytes_of(base2k, k, rank, dnum, dsize) + module.bytes_of_tensor_key_compressed(base2k, k, rank, dnum, dsize) } } diff --git a/poulpy-core/src/layouts/gglwe_ksk.rs b/poulpy-core/src/layouts/gglwe_ksk.rs index c818d84..1384ccc 100644 --- a/poulpy-core/src/layouts/gglwe_ksk.rs +++ b/poulpy-core/src/layouts/gglwe_ksk.rs @@ -224,6 +224,8 @@ where } } +impl GLWESwitchingKeyAlloc for Module where Self: GGLWEAlloc {} + impl GLWESwitchingKey> { pub fn alloc_from_infos(module: &Module, infos: &A) -> Self where diff --git a/poulpy-core/src/layouts/prepared/gglwe_atk.rs b/poulpy-core/src/layouts/prepared/gglwe_atk.rs index 853419b..e9f907c 100644 --- a/poulpy-core/src/layouts/prepared/gglwe_atk.rs +++ b/poulpy-core/src/layouts/prepared/gglwe_atk.rs @@ -176,7 +176,7 @@ impl AutomorphismKeyPrepared, B> { } } -pub trait AutomorphismKeyPrepare +pub trait PrepareAutomorphismKey where Self: GLWESwitchingKeyPrepare, { @@ -197,7 +197,7 @@ where } } -impl AutomorphismKeyPrepare for Module where Module: GLWESwitchingKeyPrepare {} +impl PrepareAutomorphismKey for Module where Module: GLWESwitchingKeyPrepare {} impl AutomorphismKeyPrepared, B> { pub fn prepare_tmp_bytes(&self, module: &Module) -> usize @@ -212,7 +212,7 @@ impl AutomorphismKeyPrepared { pub fn prepare(&mut self, module: &Module, other: &O, scratch: &mut Scratch) where O: AutomorphismKeyToRef + GetAutomorphismGaloisElement, - Module: AutomorphismKeyPrepare, + Module: PrepareAutomorphismKey, { module.prepare_automorphism_key(self, other, scratch); } diff --git a/poulpy-core/src/layouts/prepared/gglwe_ct.rs b/poulpy-core/src/layouts/prepared/gglwe_ct.rs index 2f7f6d2..a428474 100644 --- a/poulpy-core/src/layouts/prepared/gglwe_ct.rs +++ b/poulpy-core/src/layouts/prepared/gglwe_ct.rs @@ -1,5 +1,5 @@ use poulpy_hal::{ - api::{VmpPMatAlloc, VmpPMatAllocBytes, VmpPrepare, VmpPrepareTmpBytes}, + api::{VmpPMatAlloc, VmpPMatBytesOf, VmpPrepare, VmpPrepareTmpBytes}, layouts::{Backend, Data, DataMut, DataRef, Module, Scratch, VmpPMat, VmpPMatToMut, VmpPMatToRef, ZnxInfos}, }; @@ -59,7 +59,7 @@ impl GGLWEInfos for GGLWEPrepared { pub trait GGLWEPreparedAlloc where - Self: GetDegree + VmpPMatAlloc + VmpPMatAllocBytes, + Self: GetDegree + VmpPMatAlloc + VmpPMatBytesOf, { fn alloc_gglwe_prepared( &self, @@ -130,7 +130,7 @@ where dsize.0, ); - self.vmp_pmat_bytes_of(dnum.into(), rank_in.into(), (rank_out + 1).into(), size) + self.bytes_of_vmp_pmat(dnum.into(), rank_in.into(), (rank_out + 1).into(), size) } fn bytes_of_gglwe_prepared_from_infos(&self, infos: &A) -> usize @@ -149,7 +149,7 @@ where } } -impl GGLWEPreparedAlloc for Module where Module: GetDegree + VmpPMatAlloc + VmpPMatAllocBytes {} +impl GGLWEPreparedAlloc for Module where Module: GetDegree + VmpPMatAlloc + VmpPMatBytesOf {} impl GGLWEPrepared, B> where diff --git a/poulpy-core/src/layouts/prepared/gglwe_ksk.rs b/poulpy-core/src/layouts/prepared/gglwe_ksk.rs index 43eccc8..2bd20f3 100644 --- a/poulpy-core/src/layouts/prepared/gglwe_ksk.rs +++ b/poulpy-core/src/layouts/prepared/gglwe_ksk.rs @@ -95,7 +95,7 @@ where } } - fn glwe_switching_key_prepared_alloc_from_infos(&self, infos: &A) -> GLWESwitchingKeyPrepared, B> + fn alloc_glwe_switching_key_prepared_from_infos(&self, infos: &A) -> GLWESwitchingKeyPrepared, B> where A: GGLWEInfos, { @@ -121,7 +121,7 @@ where self.bytes_of_gglwe_prepared(base2k, k, rank_in, rank_out, dnum, dsize) } - fn glwe_switching_key_prepared_bytes_of_from_infos(&self, infos: &A) -> usize + fn bytes_of_glwe_switching_key_prepared_from_infos(&self, infos: &A) -> usize where A: GGLWEInfos, { @@ -146,7 +146,7 @@ where where A: GGLWEInfos, { - module.glwe_switching_key_prepared_alloc_from_infos(infos) + module.alloc_glwe_switching_key_prepared_from_infos(infos) } pub fn alloc( @@ -165,7 +165,7 @@ where where A: GGLWEInfos, { - module.glwe_switching_key_prepared_bytes_of_from_infos(infos) + module.bytes_of_glwe_switching_key_prepared_from_infos(infos) } pub fn bytes_of( diff --git a/poulpy-core/src/layouts/prepared/ggsw_ct.rs b/poulpy-core/src/layouts/prepared/ggsw_ct.rs index 8f3b6c1..fe7f218 100644 --- a/poulpy-core/src/layouts/prepared/ggsw_ct.rs +++ b/poulpy-core/src/layouts/prepared/ggsw_ct.rs @@ -1,5 +1,5 @@ use poulpy_hal::{ - api::{VmpPMatAlloc, VmpPMatAllocBytes, VmpPrepare, VmpPrepareTmpBytes}, + api::{VmpPMatAlloc, VmpPMatBytesOf, VmpPrepare, VmpPrepareTmpBytes}, layouts::{Backend, Data, DataMut, DataRef, Module, Scratch, VmpPMat, VmpPMatToMut, VmpPMatToRef, ZnxInfos}, }; @@ -51,7 +51,7 @@ impl GGSWInfos for GGSWPrepared { pub trait GGSWPreparedAlloc where - Self: GetDegree + VmpPMatAlloc + VmpPMatAllocBytes, + Self: GetDegree + VmpPMatAlloc + VmpPMatBytesOf, { fn alloc_ggsw_prepared( &self, @@ -117,7 +117,7 @@ where dsize.0, ); - self.vmp_pmat_bytes_of(dnum.into(), (rank + 1).into(), (rank + 1).into(), size) + self.bytes_of_vmp_pmat(dnum.into(), (rank + 1).into(), (rank + 1).into(), size) } fn bytes_of_ggsw_prepared_from_infos(&self, infos: &A) -> usize @@ -135,7 +135,7 @@ where } } -impl GGSWPreparedAlloc for Module where Module: GetDegree + VmpPMatAlloc + VmpPMatAllocBytes {} +impl GGSWPreparedAlloc for Module where Module: GetDegree + VmpPMatAlloc + VmpPMatBytesOf {} impl GGSWPrepared, B> where diff --git a/poulpy-core/src/layouts/prepared/glwe_pk.rs b/poulpy-core/src/layouts/prepared/glwe_pk.rs index 36d1e81..b6f2a0c 100644 --- a/poulpy-core/src/layouts/prepared/glwe_pk.rs +++ b/poulpy-core/src/layouts/prepared/glwe_pk.rs @@ -1,5 +1,5 @@ use poulpy_hal::{ - api::{VecZnxDftAlloc, VecZnxDftAllocBytes, VecZnxDftApply}, + api::{VecZnxDftAlloc, VecZnxDftApply, VecZnxDftBytesOf}, layouts::{Backend, Data, DataMut, DataRef, Module, VecZnxDft, VecZnxDftToMut, VecZnxDftToRef, ZnxInfos}, }; @@ -52,7 +52,7 @@ impl GLWEInfos for GLWEPublicKeyPrepared { pub trait GLWEPublicKeyPreparedAlloc where - Self: GetDegree + VecZnxDftAlloc + VecZnxDftAllocBytes, + Self: GetDegree + VecZnxDftAlloc + VecZnxDftBytesOf, { fn alloc_glwe_public_key_prepared(&self, base2k: Base2K, k: TorusPrecision, rank: Rank) -> GLWEPublicKeyPrepared, B> { GLWEPublicKeyPrepared { @@ -71,7 +71,7 @@ where } fn bytes_of_glwe_public_key_prepared(&self, base2k: Base2K, k: TorusPrecision, rank: Rank) -> usize { - self.vec_znx_dft_bytes_of((rank + 1).into(), k.0.div_ceil(base2k.0) as usize) + self.bytes_of_vec_znx_dft((rank + 1).into(), k.0.div_ceil(base2k.0) as usize) } fn bytes_of_glwe_public_key_prepared_from_infos(&self, infos: &A) -> usize @@ -82,7 +82,7 @@ where } } -impl GLWEPublicKeyPreparedAlloc for Module where Self: VecZnxDftAlloc + VecZnxDftAllocBytes {} +impl GLWEPublicKeyPreparedAlloc for Module where Self: VecZnxDftAlloc + VecZnxDftBytesOf {} impl GLWEPublicKeyPrepared, B> where diff --git a/poulpy-core/src/layouts/prepared/glwe_sk.rs b/poulpy-core/src/layouts/prepared/glwe_sk.rs index 4fc9ba3..6028698 100644 --- a/poulpy-core/src/layouts/prepared/glwe_sk.rs +++ b/poulpy-core/src/layouts/prepared/glwe_sk.rs @@ -1,5 +1,5 @@ use poulpy_hal::{ - api::{SvpPPolAlloc, SvpPPolAllocBytes, SvpPrepare}, + api::{SvpPPolAlloc, SvpPPolBytesOf, SvpPrepare}, layouts::{Backend, Data, DataMut, DataRef, Module, SvpPPol, SvpPPolToMut, SvpPPolToRef, ZnxInfos}, }; @@ -47,7 +47,7 @@ impl GLWEInfos for GLWESecretPrepared { pub trait GLWESecretPreparedAlloc where - Self: GetDegree + SvpPPolAllocBytes + SvpPPolAlloc, + Self: GetDegree + SvpPPolBytesOf + SvpPPolAlloc, { fn alloc_glwe_secret_prepared(&self, rank: Rank) -> GLWESecretPrepared, B> { GLWESecretPrepared { @@ -64,7 +64,7 @@ where } fn bytes_of_glwe_secret(&self, rank: Rank) -> usize { - self.svp_ppol_bytes_of(rank.into()) + self.bytes_of_svp_ppol(rank.into()) } fn bytes_of_glwe_secret_from_infos(&self, infos: &A) -> usize where @@ -75,7 +75,7 @@ where } } -impl GLWESecretPreparedAlloc for Module where Self: GetDegree + SvpPPolAllocBytes + SvpPPolAlloc {} +impl GLWESecretPreparedAlloc for Module where Self: GetDegree + SvpPPolBytesOf + SvpPPolAlloc {} impl GLWESecretPrepared, B> where diff --git a/poulpy-core/src/layouts/prepared/glwe_to_lwe_ksk.rs b/poulpy-core/src/layouts/prepared/glwe_to_lwe_ksk.rs index 620bf85..d4b8e85 100644 --- a/poulpy-core/src/layouts/prepared/glwe_to_lwe_ksk.rs +++ b/poulpy-core/src/layouts/prepared/glwe_to_lwe_ksk.rs @@ -57,7 +57,7 @@ pub trait GLWEToLWESwitchingKeyPreparedAlloc where Self: GLWESwitchingKeyPreparedAlloc, { - fn glwe_to_lwe_switching_key_prepared_alloc( + fn alloc_glwe_to_lwe_switching_key_prepared( &self, base2k: Base2K, k: TorusPrecision, @@ -66,7 +66,7 @@ where ) -> GLWEToLWESwitchingKeyPrepared, B> { GLWEToLWESwitchingKeyPrepared(self.alloc_glwe_switching_key_prepared(base2k, k, rank_in, Rank(1), dnum, Dsize(1))) } - fn glwe_to_lwe_switching_key_prepared_alloc_from_infos(&self, infos: &A) -> GLWEToLWESwitchingKeyPrepared, B> + fn alloc_glwe_to_lwe_switching_key_prepared_from_infos(&self, infos: &A) -> GLWEToLWESwitchingKeyPrepared, B> where A: GGLWEInfos, { @@ -80,14 +80,14 @@ where 1, "dsize > 1 is not supported for GLWEToLWESwitchingKeyPrepared" ); - self.glwe_to_lwe_switching_key_prepared_alloc(infos.base2k(), infos.k(), infos.rank_in(), infos.dnum()) + self.alloc_glwe_to_lwe_switching_key_prepared(infos.base2k(), infos.k(), infos.rank_in(), infos.dnum()) } - fn glwe_to_lwe_switching_key_prepared_bytes_of(&self, base2k: Base2K, k: TorusPrecision, rank_in: Rank, dnum: Dnum) -> usize { + fn bytes_of_glwe_to_lwe_switching_key_prepared(&self, base2k: Base2K, k: TorusPrecision, rank_in: Rank, dnum: Dnum) -> usize { self.bytes_of_glwe_switching_key_prepared(base2k, k, rank_in, Rank(1), dnum, Dsize(1)) } - fn glwe_to_lwe_switching_key_prepared_bytes_of_from_infos(&self, infos: &A) -> usize + fn bytes_of_glwe_to_lwe_switching_key_prepared_from_infos(&self, infos: &A) -> usize where A: GGLWEInfos, { @@ -101,7 +101,7 @@ where 1, "dsize > 1 is not supported for GLWEToLWESwitchingKeyPrepared" ); - self.glwe_to_lwe_switching_key_prepared_bytes_of(infos.base2k(), infos.k(), infos.rank_in(), infos.dnum()) + self.bytes_of_glwe_to_lwe_switching_key_prepared(infos.base2k(), infos.k(), infos.rank_in(), infos.dnum()) } } @@ -115,22 +115,22 @@ where where A: GGLWEInfos, { - module.glwe_to_lwe_switching_key_prepared_alloc_from_infos(infos) + module.alloc_glwe_to_lwe_switching_key_prepared_from_infos(infos) } pub fn alloc(module: &Module, base2k: Base2K, k: TorusPrecision, rank_in: Rank, dnum: Dnum) -> Self { - module.glwe_to_lwe_switching_key_prepared_alloc(base2k, k, rank_in, dnum) + module.alloc_glwe_to_lwe_switching_key_prepared(base2k, k, rank_in, dnum) } pub fn bytes_of_from_infos(module: &Module, infos: &A) -> usize where A: GGLWEInfos, { - module.glwe_to_lwe_switching_key_prepared_bytes_of_from_infos(infos) + module.bytes_of_glwe_to_lwe_switching_key_prepared_from_infos(infos) } pub fn bytes_of(module: &Module, base2k: Base2K, k: TorusPrecision, rank_in: Rank, dnum: Dnum) -> usize { - module.glwe_to_lwe_switching_key_prepared_bytes_of(base2k, k, rank_in, dnum) + module.bytes_of_glwe_to_lwe_switching_key_prepared(base2k, k, rank_in, dnum) } } @@ -138,14 +138,14 @@ pub trait GLWEToLWESwitchingKeyPrepare where Self: GLWESwitchingKeyPrepare, { - fn glwe_to_lwe_switching_key_prepare_tmp_bytes(&self, infos: &A) + fn prepare_glwe_to_lwe_switching_key_tmp_bytes(&self, infos: &A) where A: GGLWEInfos, { self.prepare_glwe_switching_key_tmp_bytes(infos); } - fn glwe_to_lwe_switching_key_prepare(&self, res: &mut R, other: &O, scratch: &mut Scratch) + fn prepare_glwe_to_lwe_switching_key(&self, res: &mut R, other: &O, scratch: &mut Scratch) where R: GLWEToLWESwitchingKeyPreparedToMut, O: GLWEToLWESwitchingKeyToRef, @@ -162,7 +162,7 @@ impl GLWEToLWESwitchingKeyPrepared, B> { A: GGLWEInfos, Module: GLWEToLWESwitchingKeyPrepare, { - module.glwe_to_lwe_switching_key_prepare_tmp_bytes(infos); + module.prepare_glwe_to_lwe_switching_key_tmp_bytes(infos); } } @@ -172,7 +172,7 @@ impl GLWEToLWESwitchingKeyPrepared { O: GLWEToLWESwitchingKeyToRef, Module: GLWEToLWESwitchingKeyPrepare, { - module.glwe_to_lwe_switching_key_prepare(self, other, scratch); + module.prepare_glwe_to_lwe_switching_key(self, other, scratch); } } diff --git a/poulpy-core/src/layouts/prepared/lwe_ksk.rs b/poulpy-core/src/layouts/prepared/lwe_ksk.rs index ffb5bf9..b5b3a35 100644 --- a/poulpy-core/src/layouts/prepared/lwe_ksk.rs +++ b/poulpy-core/src/layouts/prepared/lwe_ksk.rs @@ -65,7 +65,7 @@ where LWESwitchingKeyPrepared(self.alloc_glwe_switching_key_prepared(base2k, k, Rank(1), Rank(1), dnum, Dsize(1))) } - fn lwe_switching_key_prepared_alloc_from_infos(&self, infos: &A) -> LWESwitchingKeyPrepared, B> + fn alloc_lwe_switching_key_prepared_from_infos(&self, infos: &A) -> LWESwitchingKeyPrepared, B> where A: GGLWEInfos, { @@ -87,11 +87,11 @@ where self.alloc_lwe_switching_key_prepared(infos.base2k(), infos.k(), infos.dnum()) } - fn lwe_switching_key_prepared_bytes_of(&self, base2k: Base2K, k: TorusPrecision, dnum: Dnum) -> usize { + fn bytes_of_lwe_switching_key_prepared(&self, base2k: Base2K, k: TorusPrecision, dnum: Dnum) -> usize { self.bytes_of_glwe_switching_key_prepared(base2k, k, Rank(1), Rank(1), dnum, Dsize(1)) } - fn lwe_switching_key_prepared_bytes_of_from_infos(&self, infos: &A) -> usize + fn bytes_of_lwe_switching_key_prepared_from_infos(&self, infos: &A) -> usize where A: GGLWEInfos, { @@ -110,7 +110,7 @@ where 1, "rank_out > 1 is not supported for LWESwitchingKey" ); - self.lwe_switching_key_prepared_bytes_of(infos.base2k(), infos.k(), infos.dnum()) + self.bytes_of_lwe_switching_key_prepared(infos.base2k(), infos.k(), infos.dnum()) } } @@ -124,7 +124,7 @@ where where A: GGLWEInfos, { - module.lwe_switching_key_prepared_alloc_from_infos(infos) + module.alloc_lwe_switching_key_prepared_from_infos(infos) } pub fn alloc(module: &Module, base2k: Base2K, k: TorusPrecision, dnum: Dnum) -> Self { @@ -135,11 +135,11 @@ where where A: GGLWEInfos, { - module.lwe_switching_key_prepared_bytes_of_from_infos(infos) + module.bytes_of_lwe_switching_key_prepared_from_infos(infos) } pub fn bytes_of(module: &Module, base2k: Base2K, k: TorusPrecision, dnum: Dnum) -> usize { - module.lwe_switching_key_prepared_bytes_of(base2k, k, dnum) + module.bytes_of_lwe_switching_key_prepared(base2k, k, dnum) } } @@ -147,13 +147,13 @@ pub trait LWESwitchingKeyPrepare where Self: GLWESwitchingKeyPrepare, { - fn lwe_switching_key_prepare_tmp_bytes(&self, infos: &A) + fn prepare_lwe_switching_key_tmp_bytes(&self, infos: &A) where A: GGLWEInfos, { self.prepare_glwe_switching_key_tmp_bytes(infos); } - fn lwe_switching_key_prepare(&self, res: &mut R, other: &O, scratch: &mut Scratch) + fn prepare_lwe_switching_key(&self, res: &mut R, other: &O, scratch: &mut Scratch) where R: LWESwitchingKeyPreparedToMut, O: LWESwitchingKeyToRef, @@ -170,7 +170,7 @@ impl LWESwitchingKeyPrepared, B> { A: GGLWEInfos, Module: LWESwitchingKeyPrepare, { - module.lwe_switching_key_prepare_tmp_bytes(infos); + module.prepare_lwe_switching_key_tmp_bytes(infos); } } @@ -180,7 +180,7 @@ impl LWESwitchingKeyPrepared { O: LWESwitchingKeyToRef, Module: LWESwitchingKeyPrepare, { - module.lwe_switching_key_prepare(self, other, scratch); + module.prepare_lwe_switching_key(self, other, scratch); } } diff --git a/poulpy-core/src/layouts/prepared/lwe_to_glwe_ksk.rs b/poulpy-core/src/layouts/prepared/lwe_to_glwe_ksk.rs index b2e7383..53867de 100644 --- a/poulpy-core/src/layouts/prepared/lwe_to_glwe_ksk.rs +++ b/poulpy-core/src/layouts/prepared/lwe_to_glwe_ksk.rs @@ -58,7 +58,7 @@ pub trait LWEToGLWESwitchingKeyPreparedAlloc where Self: GLWESwitchingKeyPreparedAlloc, { - fn lwe_to_glwe_switching_key_prepared_alloc( + fn alloc_lwe_to_glwe_switching_key_prepared( &self, base2k: Base2K, k: TorusPrecision, @@ -67,7 +67,7 @@ where ) -> LWEToGLWESwitchingKeyPrepared, B> { LWEToGLWESwitchingKeyPrepared(self.alloc_glwe_switching_key_prepared(base2k, k, Rank(1), rank_out, dnum, Dsize(1))) } - fn lwe_to_glwe_switching_key_prepared_alloc_from_infos(&self, infos: &A) -> LWEToGLWESwitchingKeyPrepared, B> + fn alloc_lwe_to_glwe_switching_key_prepared_from_infos(&self, infos: &A) -> LWEToGLWESwitchingKeyPrepared, B> where A: GGLWEInfos, { @@ -81,10 +81,10 @@ where 1, "dsize > 1 is not supported for LWEToGLWESwitchingKey" ); - self.lwe_to_glwe_switching_key_prepared_alloc(infos.base2k(), infos.k(), infos.rank_out(), infos.dnum()) + self.alloc_lwe_to_glwe_switching_key_prepared(infos.base2k(), infos.k(), infos.rank_out(), infos.dnum()) } - fn lwe_to_glwe_switching_key_prepared_bytes_of( + fn bytes_of_lwe_to_glwe_switching_key_prepared( &self, base2k: Base2K, k: TorusPrecision, @@ -94,7 +94,7 @@ where self.bytes_of_glwe_switching_key_prepared(base2k, k, Rank(1), rank_out, dnum, Dsize(1)) } - fn lwe_to_glwe_switching_key_prepared_bytes_of_from_infos(&self, infos: &A) -> usize + fn bytes_of_lwe_to_glwe_switching_key_prepared_from_infos(&self, infos: &A) -> usize where A: GGLWEInfos, { @@ -108,7 +108,7 @@ where 1, "dsize > 1 is not supported for LWEToGLWESwitchingKey" ); - self.lwe_to_glwe_switching_key_prepared_bytes_of(infos.base2k(), infos.k(), infos.rank_out(), infos.dnum()) + self.bytes_of_lwe_to_glwe_switching_key_prepared(infos.base2k(), infos.k(), infos.rank_out(), infos.dnum()) } } @@ -122,22 +122,22 @@ where where A: GGLWEInfos, { - module.lwe_to_glwe_switching_key_prepared_alloc_from_infos(infos) + module.alloc_lwe_to_glwe_switching_key_prepared_from_infos(infos) } pub fn alloc(module: &Module, base2k: Base2K, k: TorusPrecision, rank_out: Rank, dnum: Dnum) -> Self { - module.lwe_to_glwe_switching_key_prepared_alloc(base2k, k, rank_out, dnum) + module.alloc_lwe_to_glwe_switching_key_prepared(base2k, k, rank_out, dnum) } pub fn bytes_of_from_infos(module: &Module, infos: &A) -> usize where A: GGLWEInfos, { - module.lwe_to_glwe_switching_key_prepared_bytes_of_from_infos(infos) + module.bytes_of_lwe_to_glwe_switching_key_prepared_from_infos(infos) } pub fn bytes_of(module: &Module, base2k: Base2K, k: TorusPrecision, rank_out: Rank, dnum: Dnum) -> usize { - module.lwe_to_glwe_switching_key_prepared_bytes_of(base2k, k, rank_out, dnum) + module.bytes_of_lwe_to_glwe_switching_key_prepared(base2k, k, rank_out, dnum) } } @@ -145,14 +145,14 @@ pub trait LWEToGLWESwitchingKeyPrepare where Self: GLWESwitchingKeyPrepare, { - fn lwe_to_glwe_switching_key_prepare_tmp_bytes(&self, infos: &A) + fn prepare_lwe_to_glwe_switching_key_tmp_bytes(&self, infos: &A) where A: GGLWEInfos, { self.prepare_glwe_switching_key_tmp_bytes(infos); } - fn lwe_to_glwe_switching_key_prepare(&self, res: &mut R, other: &O, scratch: &mut Scratch) + fn prepare_lwe_to_glwe_switching_key(&self, res: &mut R, other: &O, scratch: &mut Scratch) where R: LWEToGLWESwitchingKeyPreparedToMut, O: LWEToGLWESwitchingKeyToRef, @@ -169,7 +169,7 @@ impl LWEToGLWESwitchingKeyPrepared, B> { A: GGLWEInfos, Module: LWEToGLWESwitchingKeyPrepare, { - module.lwe_to_glwe_switching_key_prepare_tmp_bytes(infos); + module.prepare_lwe_to_glwe_switching_key_tmp_bytes(infos); } } @@ -179,7 +179,7 @@ impl LWEToGLWESwitchingKeyPrepared { O: LWEToGLWESwitchingKeyToRef, Module: LWEToGLWESwitchingKeyPrepare, { - module.lwe_to_glwe_switching_key_prepare(self, other, scratch); + module.prepare_lwe_to_glwe_switching_key(self, other, scratch); } } diff --git a/poulpy-core/src/noise/gglwe_ct.rs b/poulpy-core/src/noise/gglwe_ct.rs index 4582ad2..ae40bf4 100644 --- a/poulpy-core/src/noise/gglwe_ct.rs +++ b/poulpy-core/src/noise/gglwe_ct.rs @@ -1,8 +1,8 @@ use poulpy_hal::{ api::{ ScratchOwnedAlloc, ScratchOwnedBorrow, SvpApplyDftToDftInplace, VecZnxBigAddInplace, VecZnxBigAddSmallInplace, - VecZnxBigAllocBytes, VecZnxBigNormalize, VecZnxDftAllocBytes, VecZnxDftApply, VecZnxIdftApplyConsume, - VecZnxNormalizeTmpBytes, VecZnxSubScalarInplace, + VecZnxBigBytesOf, VecZnxBigNormalize, VecZnxDftApply, VecZnxDftBytesOf, VecZnxIdftApplyConsume, VecZnxNormalizeTmpBytes, + VecZnxSubScalarInplace, }, layouts::{Backend, DataRef, Module, ScalarZnx, ScratchOwned, ZnxZero}, oep::{ScratchOwnedAllocImpl, ScratchOwnedBorrowImpl, TakeVecZnxBigImpl, TakeVecZnxDftImpl}, @@ -20,8 +20,8 @@ impl GGLWE { ) where DataSk: DataRef, DataWant: DataRef, - Module: VecZnxDftAllocBytes - + VecZnxBigAllocBytes + Module: VecZnxDftBytesOf + + VecZnxBigBytesOf + VecZnxDftApply + SvpApplyDftToDftInplace + VecZnxIdftApplyConsume diff --git a/poulpy-core/src/noise/ggsw_ct.rs b/poulpy-core/src/noise/ggsw_ct.rs index 0527b14..93302e3 100644 --- a/poulpy-core/src/noise/ggsw_ct.rs +++ b/poulpy-core/src/noise/ggsw_ct.rs @@ -1,9 +1,9 @@ use poulpy_hal::{ api::{ ScratchOwnedAlloc, ScratchOwnedBorrow, SvpApplyDftToDftInplace, VecZnxAddScalarInplace, VecZnxBigAddInplace, - VecZnxBigAddSmallInplace, VecZnxBigAlloc, VecZnxBigAllocBytes, VecZnxBigNormalize, VecZnxBigNormalizeTmpBytes, - VecZnxDftAlloc, VecZnxDftAllocBytes, VecZnxDftApply, VecZnxIdftApplyConsume, VecZnxIdftApplyTmpA, - VecZnxNormalizeTmpBytes, VecZnxSubInplace, + VecZnxBigAddSmallInplace, VecZnxBigAlloc, VecZnxBigBytesOf, VecZnxBigNormalize, VecZnxBigNormalizeTmpBytes, + VecZnxDftAlloc, VecZnxDftApply, VecZnxDftBytesOf, VecZnxIdftApplyConsume, VecZnxIdftApplyTmpA, VecZnxNormalizeTmpBytes, + VecZnxSubInplace, }, layouts::{Backend, DataRef, Module, ScalarZnx, ScratchOwned, VecZnxBig, VecZnxDft, ZnxZero}, oep::{ScratchOwnedAllocImpl, ScratchOwnedBorrowImpl, TakeVecZnxBigImpl, TakeVecZnxDftImpl}, @@ -21,8 +21,8 @@ impl GGSW { ) where DataSk: DataRef, DataScalar: DataRef, - Module: VecZnxDftAllocBytes - + VecZnxBigAllocBytes + Module: VecZnxDftBytesOf + + VecZnxBigBytesOf + VecZnxDftApply + SvpApplyDftToDftInplace + VecZnxIdftApplyConsume @@ -94,8 +94,8 @@ impl GGSW { ) where DataSk: DataRef, DataScalar: DataRef, - Module: VecZnxDftAllocBytes - + VecZnxBigAllocBytes + Module: VecZnxDftBytesOf + + VecZnxBigBytesOf + VecZnxDftApply + SvpApplyDftToDftInplace + VecZnxIdftApplyConsume diff --git a/poulpy-core/src/noise/glwe_ct.rs b/poulpy-core/src/noise/glwe_ct.rs index c1fcd2f..76eaa19 100644 --- a/poulpy-core/src/noise/glwe_ct.rs +++ b/poulpy-core/src/noise/glwe_ct.rs @@ -1,8 +1,8 @@ use poulpy_hal::{ api::{ ScratchOwnedAlloc, ScratchOwnedBorrow, SvpApplyDftToDftInplace, TakeVecZnxBig, TakeVecZnxDft, VecZnxBigAddInplace, - VecZnxBigAddSmallInplace, VecZnxBigAllocBytes, VecZnxBigNormalize, VecZnxDftAllocBytes, VecZnxDftApply, - VecZnxIdftApplyConsume, VecZnxNormalizeInplace, VecZnxNormalizeTmpBytes, VecZnxSubInplace, + VecZnxBigAddSmallInplace, VecZnxBigBytesOf, VecZnxBigNormalize, VecZnxDftApply, VecZnxDftBytesOf, VecZnxIdftApplyConsume, + VecZnxNormalizeInplace, VecZnxNormalizeTmpBytes, VecZnxSubInplace, }, layouts::{Backend, DataRef, Module, Scratch, ScratchOwned}, oep::{ScratchOwnedAllocImpl, ScratchOwnedBorrowImpl, TakeVecZnxBigImpl, TakeVecZnxDftImpl}, @@ -48,8 +48,8 @@ impl GLWE { ) where DataSk: DataRef, DataPt: DataRef, - Module: VecZnxDftAllocBytes - + VecZnxBigAllocBytes + Module: VecZnxDftBytesOf + + VecZnxBigBytesOf + VecZnxDftApply + SvpApplyDftToDftInplace + VecZnxIdftApplyConsume diff --git a/poulpy-core/src/scratch.rs b/poulpy-core/src/scratch.rs index a125d70..6cfc130 100644 --- a/poulpy-core/src/scratch.rs +++ b/poulpy-core/src/scratch.rs @@ -1,13 +1,13 @@ use poulpy_hal::{ - api::{TakeMatZnx, TakeScalarZnx, TakeSvpPPol, TakeVecZnx, TakeVecZnxDft, TakeVmpPMat}, - layouts::{Backend, Scratch}, + api::{ScratchAvailable, ScratchTakeBasic}, + layouts::{Backend, Module, Scratch}, }; use crate::{ dist::Distribution, layouts::{ AutomorphismKey, Degree, GGLWE, GGLWEInfos, GGSW, GGSWInfos, GLWE, GLWEInfos, GLWEPlaintext, GLWEPublicKey, GLWESecret, - GLWESwitchingKey, Rank, TensorKey, + GLWESwitchingKey, GetDegree, Rank, TensorKey, prepared::{ AutomorphismKeyPrepared, GGLWEPrepared, GGSWPrepared, GLWEPublicKeyPrepared, GLWESecretPrepared, GLWESwitchingKeyPrepared, TensorKeyPrepared, @@ -15,119 +15,15 @@ use crate::{ }, }; -pub trait TakeGLWECt { - fn take_glwe_ct(&mut self, infos: &A) -> (GLWE<&mut [u8]>, &mut Self) - where - A: GLWEInfos; -} - -pub trait TakeGLWECtSlice { - fn take_glwe_ct_slice(&mut self, size: usize, infos: &A) -> (Vec>, &mut Self) - where - A: GLWEInfos; -} - -pub trait TakeGLWEPt { - fn take_glwe_pt(&mut self, infos: &A) -> (GLWEPlaintext<&mut [u8]>, &mut Self) - where - A: GLWEInfos; -} - -pub trait TakeGGLWE { - fn take_gglwe(&mut self, infos: &A) -> (GGLWE<&mut [u8]>, &mut Self) - where - A: GGLWEInfos; -} - -pub trait TakeGGLWEPrepared { - fn take_gglwe_prepared(&mut self, infos: &A) -> (GGLWEPrepared<&mut [u8], B>, &mut Self) - where - A: GGLWEInfos; -} - -pub trait TakeGGSW { - fn take_ggsw(&mut self, infos: &A) -> (GGSW<&mut [u8]>, &mut Self) - where - A: GGSWInfos; -} - -pub trait TakeGGSWPrepared { - fn take_ggsw_prepared(&mut self, infos: &A) -> (GGSWPrepared<&mut [u8], B>, &mut Self) - where - A: GGSWInfos; -} - -pub trait TakeGGSWPreparedSlice { - fn take_ggsw_prepared_slice(&mut self, size: usize, infos: &A) -> (Vec>, &mut Self) - where - A: GGSWInfos; -} - -pub trait TakeGLWESecret { - fn take_glwe_secret(&mut self, n: Degree, rank: Rank) -> (GLWESecret<&mut [u8]>, &mut Self); -} - -pub trait TakeGLWESecretPrepared { - fn take_glwe_secret_prepared(&mut self, n: Degree, rank: Rank) -> (GLWESecretPrepared<&mut [u8], B>, &mut Self); -} - -pub trait TakeGLWEPk { - fn take_glwe_pk(&mut self, infos: &A) -> (GLWEPublicKey<&mut [u8]>, &mut Self) - where - A: GLWEInfos; -} - -pub trait TakeGLWEPkPrepared { - fn take_glwe_pk_prepared(&mut self, infos: &A) -> (GLWEPublicKeyPrepared<&mut [u8], B>, &mut Self) - where - A: GLWEInfos; -} - -pub trait TakeGLWESwitchingKey { - fn take_glwe_switching_key(&mut self, infos: &A) -> (GLWESwitchingKey<&mut [u8]>, &mut Self) - where - A: GGLWEInfos; -} - -pub trait TakeGGLWESwitchingKeyPrepared { - fn take_gglwe_switching_key_prepared(&mut self, infos: &A) -> (GLWESwitchingKeyPrepared<&mut [u8], B>, &mut Self) - where - A: GGLWEInfos; -} - -pub trait TakeTensorKey { - fn take_tensor_key(&mut self, infos: &A) -> (TensorKey<&mut [u8]>, &mut Self) - where - A: GGLWEInfos; -} - -pub trait TakeGGLWETensorKeyPrepared { - fn take_gglwe_tensor_key_prepared(&mut self, infos: &A) -> (TensorKeyPrepared<&mut [u8], B>, &mut Self) - where - A: GGLWEInfos; -} - -pub trait TakeGGLWEAutomorphismKey { - fn take_gglwe_automorphism_key(&mut self, infos: &A) -> (AutomorphismKey<&mut [u8]>, &mut Self) - where - A: GGLWEInfos; -} - -pub trait TakeGGLWEAutomorphismKeyPrepared { - fn take_gglwe_automorphism_key_prepared(&mut self, infos: &A) -> (AutomorphismKeyPrepared<&mut [u8], B>, &mut Self) - where - A: GGLWEInfos; -} - -impl TakeGLWECt for Scratch +pub trait ScratchTakeCore where - Scratch: TakeVecZnx, + Self: ScratchTakeBasic + ScratchAvailable, { - fn take_glwe_ct(&mut self, infos: &A) -> (GLWE<&mut [u8]>, &mut Self) + fn take_glwe_ct(&mut self, module: &Module, infos: &A) -> (GLWE<&mut [u8]>, &mut Self) where A: GLWEInfos, { - let (data, scratch) = self.take_vec_znx(infos.n().into(), (infos.rank() + 1).into(), infos.size()); + let (data, scratch) = self.take_vec_znx(module, (infos.rank() + 1).into(), infos.size()); ( GLWE { k: infos.k(), @@ -137,12 +33,7 @@ where scratch, ) } -} -impl TakeGLWECtSlice for Scratch -where - Scratch: TakeVecZnx, -{ fn take_glwe_ct_slice(&mut self, size: usize, infos: &A) -> (Vec>, &mut Self) where A: GLWEInfos, @@ -156,12 +47,7 @@ where } (cts, scratch) } -} -impl TakeGLWEPt for Scratch -where - Scratch: TakeVecZnx, -{ fn take_glwe_pt(&mut self, infos: &A) -> (GLWEPlaintext<&mut [u8]>, &mut Self) where A: GLWEInfos, @@ -176,12 +62,7 @@ where scratch, ) } -} -impl TakeGGLWE for Scratch -where - Scratch: TakeMatZnx, -{ fn take_gglwe(&mut self, infos: &A) -> (GGLWE<&mut [u8]>, &mut Self) where A: GGLWEInfos, @@ -203,12 +84,7 @@ where scratch, ) } -} -impl TakeGGLWEPrepared for Scratch -where - Scratch: TakeVmpPMat, -{ fn take_gglwe_prepared(&mut self, infos: &A) -> (GGLWEPrepared<&mut [u8], B>, &mut Self) where A: GGLWEInfos, @@ -230,12 +106,7 @@ where scratch, ) } -} -impl TakeGGSW for Scratch -where - Scratch: TakeMatZnx, -{ fn take_ggsw(&mut self, infos: &A) -> (GGSW<&mut [u8]>, &mut Self) where A: GGSWInfos, @@ -257,12 +128,7 @@ where scratch, ) } -} -impl TakeGGSWPrepared for Scratch -where - Scratch: TakeVmpPMat, -{ fn take_ggsw_prepared(&mut self, infos: &A) -> (GGSWPrepared<&mut [u8], B>, &mut Self) where A: GGSWInfos, @@ -284,12 +150,7 @@ where scratch, ) } -} -impl TakeGGSWPreparedSlice for Scratch -where - Scratch: TakeGGSWPrepared, -{ fn take_ggsw_prepared_slice(&mut self, size: usize, infos: &A) -> (Vec>, &mut Self) where A: GGSWInfos, @@ -303,12 +164,7 @@ where } (cts, scratch) } -} -impl TakeGLWEPk for Scratch -where - Scratch: TakeVecZnx, -{ fn take_glwe_pk(&mut self, infos: &A) -> (GLWEPublicKey<&mut [u8]>, &mut Self) where A: GLWEInfos, @@ -324,12 +180,7 @@ where scratch, ) } -} -impl TakeGLWEPkPrepared for Scratch -where - Scratch: TakeVecZnxDft, -{ fn take_glwe_pk_prepared(&mut self, infos: &A) -> (GLWEPublicKeyPrepared<&mut [u8], B>, &mut Self) where A: GLWEInfos, @@ -345,12 +196,7 @@ where scratch, ) } -} -impl TakeGLWESecret for Scratch -where - Scratch: TakeScalarZnx, -{ fn take_glwe_secret(&mut self, n: Degree, rank: Rank) -> (GLWESecret<&mut [u8]>, &mut Self) { let (data, scratch) = self.take_scalar_znx(n.into(), rank.into()); ( @@ -361,12 +207,7 @@ where scratch, ) } -} -impl TakeGLWESecretPrepared for Scratch -where - Scratch: TakeSvpPPol, -{ fn take_glwe_secret_prepared(&mut self, n: Degree, rank: Rank) -> (GLWESecretPrepared<&mut [u8], B>, &mut Self) { let (data, scratch) = self.take_svp_ppol(n.into(), rank.into()); ( @@ -377,12 +218,7 @@ where scratch, ) } -} -impl TakeGLWESwitchingKey for Scratch -where - Scratch: TakeMatZnx, -{ fn take_glwe_switching_key(&mut self, infos: &A) -> (GLWESwitchingKey<&mut [u8]>, &mut Self) where A: GGLWEInfos, @@ -397,12 +233,7 @@ where scratch, ) } -} -impl TakeGGLWESwitchingKeyPrepared for Scratch -where - Scratch: TakeGGLWEPrepared, -{ fn take_gglwe_switching_key_prepared(&mut self, infos: &A) -> (GLWESwitchingKeyPrepared<&mut [u8], B>, &mut Self) where A: GGLWEInfos, @@ -417,12 +248,7 @@ where scratch, ) } -} -impl TakeGGLWEAutomorphismKey for Scratch -where - Scratch: TakeMatZnx, -{ fn take_gglwe_automorphism_key(&mut self, infos: &A) -> (AutomorphismKey<&mut [u8]>, &mut Self) where A: GGLWEInfos, @@ -430,12 +256,7 @@ where let (data, scratch) = self.take_glwe_switching_key(infos); (AutomorphismKey { key: data, p: 0 }, scratch) } -} -impl TakeGGLWEAutomorphismKeyPrepared for Scratch -where - Scratch: TakeGGLWESwitchingKeyPrepared, -{ fn take_gglwe_automorphism_key_prepared(&mut self, infos: &A) -> (AutomorphismKeyPrepared<&mut [u8], B>, &mut Self) where A: GGLWEInfos, @@ -443,12 +264,7 @@ where let (data, scratch) = self.take_gglwe_switching_key_prepared(infos); (AutomorphismKeyPrepared { key: data, p: 0 }, scratch) } -} -impl TakeTensorKey for Scratch -where - Scratch: TakeMatZnx, -{ fn take_tensor_key(&mut self, infos: &A) -> (TensorKey<&mut [u8]>, &mut Self) where A: GGLWEInfos, @@ -478,12 +294,7 @@ where } (TensorKey { keys }, scratch) } -} -impl TakeGGLWETensorKeyPrepared for Scratch -where - Scratch: TakeVmpPMat, -{ fn take_gglwe_tensor_key_prepared(&mut self, infos: &A) -> (TensorKeyPrepared<&mut [u8], B>, &mut Self) where A: GGLWEInfos, @@ -515,3 +326,5 @@ where (TensorKeyPrepared { keys }, scratch) } } + +impl ScratchTakeCore for Scratch where Self: ScratchTakeBasic + ScratchAvailable {} diff --git a/poulpy-core/src/tests/test_suite/automorphism/gglwe_atk.rs b/poulpy-core/src/tests/test_suite/automorphism/gglwe_atk.rs index b1acd01..b98bfaf 100644 --- a/poulpy-core/src/tests/test_suite/automorphism/gglwe_atk.rs +++ b/poulpy-core/src/tests/test_suite/automorphism/gglwe_atk.rs @@ -1,9 +1,9 @@ use poulpy_hal::{ api::{ - ScratchOwnedAlloc, ScratchOwnedBorrow, SvpApplyDftToDftInplace, SvpPPolAlloc, SvpPPolAllocBytes, SvpPrepare, + ScratchOwnedAlloc, ScratchOwnedBorrow, SvpApplyDftToDftInplace, SvpPPolAlloc, SvpPPolBytesOf, SvpPrepare, VecZnxAddInplace, VecZnxAddNormal, VecZnxAddScalarInplace, VecZnxAutomorphism, VecZnxAutomorphismInplace, - VecZnxBigAddInplace, VecZnxBigAddSmallInplace, VecZnxBigAllocBytes, VecZnxBigNormalize, VecZnxBigNormalizeTmpBytes, - VecZnxCopy, VecZnxDftAllocBytes, VecZnxDftApply, VecZnxFillUniform, VecZnxIdftApplyConsume, VecZnxNormalize, + VecZnxBigAddInplace, VecZnxBigAddSmallInplace, VecZnxBigBytesOf, VecZnxBigNormalize, VecZnxBigNormalizeTmpBytes, + VecZnxCopy, VecZnxDftApply, VecZnxDftBytesOf, VecZnxFillUniform, VecZnxIdftApplyConsume, VecZnxNormalize, VecZnxNormalizeInplace, VecZnxNormalizeTmpBytes, VecZnxSub, VecZnxSubInplace, VecZnxSubScalarInplace, VecZnxSwitchRing, VmpApplyDftToDft, VmpApplyDftToDftAdd, VmpApplyDftToDftTmpBytes, VmpPMatAlloc, VmpPrepare, }, @@ -27,7 +27,7 @@ use crate::{ #[allow(clippy::too_many_arguments)] pub fn test_gglwe_automorphism_key_automorphism(module: &Module) where - Module: VecZnxDftAllocBytes + Module: VecZnxDftBytesOf + VmpApplyDftToDftTmpBytes + VecZnxBigNormalizeTmpBytes + VmpApplyDftToDft @@ -38,8 +38,8 @@ where + VecZnxBigNormalize + VecZnxAutomorphism + VecZnxAutomorphismInplace - + SvpPPolAllocBytes - + VecZnxDftAllocBytes + + SvpPPolBytesOf + + VecZnxDftBytesOf + VecZnxNormalizeTmpBytes + VmpPMatAlloc + VmpPrepare @@ -224,7 +224,7 @@ where #[allow(clippy::too_many_arguments)] pub fn test_gglwe_automorphism_key_automorphism_inplace(module: &Module) where - Module: VecZnxDftAllocBytes + Module: VecZnxDftBytesOf + VecZnxBigNormalize + VecZnxDftApply + SvpApplyDftToDftInplace @@ -238,9 +238,9 @@ where + VecZnxNormalize + VecZnxSub + SvpPrepare - + SvpPPolAllocBytes + + SvpPPolBytesOf + SvpPPolAlloc - + VecZnxDftAllocBytes + + VecZnxDftBytesOf + VmpApplyDftToDftTmpBytes + VecZnxBigNormalizeTmpBytes + VmpApplyDftToDftTmpBytes @@ -255,8 +255,8 @@ where + VecZnxAddScalarInplace + VecZnxAutomorphism + VecZnxAutomorphismInplace - + VecZnxDftAllocBytes - + VecZnxBigAllocBytes + + VecZnxDftBytesOf + + VecZnxBigBytesOf + VecZnxDftApply + SvpApplyDftToDftInplace + VecZnxIdftApplyConsume diff --git a/poulpy-core/src/tests/test_suite/automorphism/ggsw_ct.rs b/poulpy-core/src/tests/test_suite/automorphism/ggsw_ct.rs index e49fb0f..17f182f 100644 --- a/poulpy-core/src/tests/test_suite/automorphism/ggsw_ct.rs +++ b/poulpy-core/src/tests/test_suite/automorphism/ggsw_ct.rs @@ -1,9 +1,9 @@ use poulpy_hal::{ api::{ - ScratchOwnedAlloc, ScratchOwnedBorrow, SvpApplyDftToDft, SvpApplyDftToDftInplace, SvpPPolAlloc, SvpPPolAllocBytes, + ScratchOwnedAlloc, ScratchOwnedBorrow, SvpApplyDftToDft, SvpApplyDftToDftInplace, SvpPPolAlloc, SvpPPolBytesOf, SvpPrepare, VecZnxAddInplace, VecZnxAddNormal, VecZnxAddScalarInplace, VecZnxAutomorphism, VecZnxAutomorphismInplace, - VecZnxBigAddInplace, VecZnxBigAddSmallInplace, VecZnxBigAlloc, VecZnxBigAllocBytes, VecZnxBigNormalize, - VecZnxBigNormalizeTmpBytes, VecZnxCopy, VecZnxDftAddInplace, VecZnxDftAlloc, VecZnxDftAllocBytes, VecZnxDftApply, + VecZnxBigAddInplace, VecZnxBigAddSmallInplace, VecZnxBigAlloc, VecZnxBigBytesOf, VecZnxBigNormalize, + VecZnxBigNormalizeTmpBytes, VecZnxCopy, VecZnxDftAddInplace, VecZnxDftAlloc, VecZnxDftApply, VecZnxDftBytesOf, VecZnxDftCopy, VecZnxFillUniform, VecZnxIdftApplyConsume, VecZnxIdftApplyTmpA, VecZnxNormalize, VecZnxNormalizeInplace, VecZnxNormalizeTmpBytes, VecZnxSub, VecZnxSubInplace, VecZnxSwitchRing, VmpApplyDftToDft, VmpApplyDftToDftAdd, VmpApplyDftToDftTmpBytes, VmpPMatAlloc, VmpPrepare, @@ -27,8 +27,8 @@ use crate::{ pub fn test_ggsw_automorphism(module: &Module) where - Module: VecZnxDftAllocBytes - + VecZnxBigAllocBytes + Module: VecZnxDftBytesOf + + VecZnxBigBytesOf + VecZnxDftApply + SvpApplyDftToDftInplace + VecZnxIdftApplyConsume @@ -41,7 +41,7 @@ where + VecZnxBigNormalizeTmpBytes + VecZnxIdftApplyTmpA + SvpPrepare - + SvpPPolAllocBytes + + SvpPPolBytesOf + SvpPPolAlloc + VecZnxAddScalarInplace + VecZnxCopy @@ -219,8 +219,8 @@ where #[allow(clippy::too_many_arguments)] pub fn test_ggsw_automorphism_inplace(module: &Module) where - Module: VecZnxDftAllocBytes - + VecZnxBigAllocBytes + Module: VecZnxDftBytesOf + + VecZnxBigBytesOf + VecZnxDftApply + SvpApplyDftToDftInplace + VecZnxIdftApplyConsume @@ -233,7 +233,7 @@ where + VecZnxBigNormalizeTmpBytes + VecZnxIdftApplyTmpA + SvpPrepare - + SvpPPolAllocBytes + + SvpPPolBytesOf + SvpPPolAlloc + VecZnxAddScalarInplace + VecZnxCopy diff --git a/poulpy-core/src/tests/test_suite/automorphism/glwe_ct.rs b/poulpy-core/src/tests/test_suite/automorphism/glwe_ct.rs index 4d6218a..49643fe 100644 --- a/poulpy-core/src/tests/test_suite/automorphism/glwe_ct.rs +++ b/poulpy-core/src/tests/test_suite/automorphism/glwe_ct.rs @@ -1,9 +1,9 @@ use poulpy_hal::{ api::{ - ScratchOwnedAlloc, ScratchOwnedBorrow, SvpApplyDftToDftInplace, SvpPPolAlloc, SvpPPolAllocBytes, SvpPrepare, + ScratchOwnedAlloc, ScratchOwnedBorrow, SvpApplyDftToDftInplace, SvpPPolAlloc, SvpPPolBytesOf, SvpPrepare, VecZnxAddInplace, VecZnxAddNormal, VecZnxAddScalarInplace, VecZnxAutomorphism, VecZnxAutomorphismInplace, - VecZnxBigAddInplace, VecZnxBigAddSmallInplace, VecZnxBigAllocBytes, VecZnxBigNormalize, VecZnxBigNormalizeTmpBytes, - VecZnxDftAllocBytes, VecZnxDftApply, VecZnxFillUniform, VecZnxIdftApplyConsume, VecZnxNormalize, VecZnxNormalizeInplace, + VecZnxBigAddInplace, VecZnxBigAddSmallInplace, VecZnxBigBytesOf, VecZnxBigNormalize, VecZnxBigNormalizeTmpBytes, + VecZnxDftApply, VecZnxDftBytesOf, VecZnxFillUniform, VecZnxIdftApplyConsume, VecZnxNormalize, VecZnxNormalizeInplace, VecZnxNormalizeTmpBytes, VecZnxSub, VecZnxSubInplace, VecZnxSwitchRing, VmpApplyDftToDft, VmpApplyDftToDftAdd, VmpApplyDftToDftTmpBytes, VmpPMatAlloc, VmpPrepare, }, @@ -26,7 +26,7 @@ use crate::{ pub fn test_glwe_automorphism(module: &Module) where - Module: VecZnxDftAllocBytes + Module: VecZnxDftBytesOf + VecZnxBigNormalize + VecZnxDftApply + SvpApplyDftToDftInplace @@ -40,9 +40,9 @@ where + VecZnxNormalize + VecZnxSub + SvpPrepare - + SvpPPolAllocBytes + + SvpPPolBytesOf + SvpPPolAlloc - + VecZnxBigAllocBytes + + VecZnxBigBytesOf + VecZnxBigAddInplace + VecZnxBigAddSmallInplace + VmpApplyDftToDftTmpBytes @@ -169,7 +169,7 @@ where #[allow(clippy::too_many_arguments)] pub fn test_glwe_automorphism_inplace(module: &Module) where - Module: VecZnxDftAllocBytes + Module: VecZnxDftBytesOf + VecZnxBigNormalize + VecZnxDftApply + SvpApplyDftToDftInplace @@ -183,9 +183,9 @@ where + VecZnxNormalize + VecZnxSub + SvpPrepare - + SvpPPolAllocBytes + + SvpPPolBytesOf + SvpPPolAlloc - + VecZnxBigAllocBytes + + VecZnxBigBytesOf + VecZnxBigAddInplace + VecZnxBigAddSmallInplace + VmpApplyDftToDftTmpBytes diff --git a/poulpy-core/src/tests/test_suite/conversion.rs b/poulpy-core/src/tests/test_suite/conversion.rs index d1384ee..94d922e 100644 --- a/poulpy-core/src/tests/test_suite/conversion.rs +++ b/poulpy-core/src/tests/test_suite/conversion.rs @@ -1,9 +1,9 @@ use poulpy_hal::{ api::{ - ScratchOwnedAlloc, ScratchOwnedBorrow, SvpApplyDftToDftInplace, SvpPPolAlloc, SvpPPolAllocBytes, SvpPrepare, + ScratchOwnedAlloc, ScratchOwnedBorrow, SvpApplyDftToDftInplace, SvpPPolAlloc, SvpPPolBytesOf, SvpPrepare, VecZnxAddInplace, VecZnxAddNormal, VecZnxAddScalarInplace, VecZnxAutomorphismInplace, VecZnxBigAddInplace, - VecZnxBigAddSmallInplace, VecZnxBigAllocBytes, VecZnxBigNormalize, VecZnxBigNormalizeTmpBytes, VecZnxDftAllocBytes, - VecZnxDftApply, VecZnxFillUniform, VecZnxIdftApplyConsume, VecZnxNormalize, VecZnxNormalizeInplace, + VecZnxBigAddSmallInplace, VecZnxBigBytesOf, VecZnxBigNormalize, VecZnxBigNormalizeTmpBytes, VecZnxDftApply, + VecZnxDftBytesOf, VecZnxFillUniform, VecZnxIdftApplyConsume, VecZnxNormalize, VecZnxNormalizeInplace, VecZnxNormalizeTmpBytes, VecZnxSub, VecZnxSubInplace, VecZnxSwitchRing, VmpApplyDftToDft, VmpApplyDftToDftAdd, VmpApplyDftToDftTmpBytes, VmpPMatAlloc, VmpPrepare, ZnAddNormal, ZnFillUniform, ZnNormalizeInplace, }, @@ -23,7 +23,7 @@ use crate::layouts::{ pub fn test_lwe_to_glwe(module: &Module) where - Module: VecZnxDftAllocBytes + Module: VecZnxDftBytesOf + VecZnxBigNormalize + VecZnxDftApply + SvpApplyDftToDftInplace @@ -36,9 +36,9 @@ where + VecZnxNormalize + VecZnxSub + SvpPrepare - + SvpPPolAllocBytes + + SvpPPolBytesOf + SvpPPolAlloc - + VecZnxBigAllocBytes + + VecZnxBigBytesOf + VecZnxBigAddInplace + VecZnxBigAddSmallInplace + VecZnxNormalizeTmpBytes @@ -142,7 +142,7 @@ where pub fn test_glwe_to_lwe(module: &Module) where - Module: VecZnxDftAllocBytes + Module: VecZnxDftBytesOf + VecZnxBigNormalize + VecZnxDftApply + SvpApplyDftToDftInplace @@ -155,9 +155,9 @@ where + VecZnxNormalize + VecZnxSub + SvpPrepare - + SvpPPolAllocBytes + + SvpPPolBytesOf + SvpPPolAlloc - + VecZnxBigAllocBytes + + VecZnxBigBytesOf + VecZnxBigAddInplace + VecZnxBigAddSmallInplace + VecZnxNormalizeTmpBytes diff --git a/poulpy-core/src/tests/test_suite/encryption/gglwe_atk.rs b/poulpy-core/src/tests/test_suite/encryption/gglwe_atk.rs index b08de6b..68fca13 100644 --- a/poulpy-core/src/tests/test_suite/encryption/gglwe_atk.rs +++ b/poulpy-core/src/tests/test_suite/encryption/gglwe_atk.rs @@ -1,9 +1,9 @@ use poulpy_hal::{ api::{ - ScratchOwnedAlloc, ScratchOwnedBorrow, SvpApplyDftToDftInplace, SvpPPolAlloc, SvpPPolAllocBytes, SvpPrepare, + ScratchOwnedAlloc, ScratchOwnedBorrow, SvpApplyDftToDftInplace, SvpPPolAlloc, SvpPPolBytesOf, SvpPrepare, VecZnxAddInplace, VecZnxAddNormal, VecZnxAddScalarInplace, VecZnxAutomorphism, VecZnxAutomorphismInplace, - VecZnxBigAddInplace, VecZnxBigAddSmallInplace, VecZnxBigAllocBytes, VecZnxBigNormalize, VecZnxBigNormalizeTmpBytes, - VecZnxCopy, VecZnxDftAllocBytes, VecZnxDftApply, VecZnxFillUniform, VecZnxIdftApplyConsume, VecZnxNormalize, + VecZnxBigAddInplace, VecZnxBigAddSmallInplace, VecZnxBigBytesOf, VecZnxBigNormalize, VecZnxBigNormalizeTmpBytes, + VecZnxCopy, VecZnxDftApply, VecZnxDftBytesOf, VecZnxFillUniform, VecZnxIdftApplyConsume, VecZnxNormalize, VecZnxNormalizeInplace, VecZnxNormalizeTmpBytes, VecZnxSub, VecZnxSubInplace, VecZnxSubScalarInplace, VecZnxSwitchRing, VmpApplyDftToDft, VmpApplyDftToDftAdd, VmpApplyDftToDftTmpBytes, VmpPMatAlloc, VmpPrepare, }, @@ -26,7 +26,7 @@ use crate::{ pub fn test_gglwe_automorphisk_key_encrypt_sk(module: &Module) where - Module: VecZnxDftAllocBytes + Module: VecZnxDftBytesOf + VecZnxBigNormalize + VecZnxDftApply + SvpApplyDftToDftInplace @@ -40,7 +40,7 @@ where + VecZnxNormalize + VecZnxSub + SvpPrepare - + SvpPPolAllocBytes + + SvpPPolBytesOf + SvpPPolAlloc + VmpApplyDftToDftTmpBytes + VecZnxBigNormalizeTmpBytes @@ -51,7 +51,7 @@ where + VecZnxSwitchRing + VecZnxAddScalarInplace + VecZnxAutomorphismInplace - + VecZnxBigAllocBytes + + VecZnxBigBytesOf + VecZnxBigAddInplace + VecZnxSubScalarInplace + VecZnxCopy @@ -129,7 +129,7 @@ where pub fn test_gglwe_automorphisk_key_compressed_encrypt_sk(module: &Module) where - Module: VecZnxDftAllocBytes + Module: VecZnxDftBytesOf + VecZnxBigNormalize + VecZnxDftApply + SvpApplyDftToDftInplace @@ -143,7 +143,7 @@ where + VecZnxNormalize + VecZnxSub + SvpPrepare - + SvpPPolAllocBytes + + SvpPPolBytesOf + SvpPPolAlloc + VmpApplyDftToDftTmpBytes + VecZnxBigNormalizeTmpBytes @@ -154,7 +154,7 @@ where + VecZnxSwitchRing + VecZnxAddScalarInplace + VecZnxAutomorphismInplace - + VecZnxBigAllocBytes + + VecZnxBigBytesOf + VecZnxBigAddInplace + VecZnxSubScalarInplace + VecZnxCopy diff --git a/poulpy-core/src/tests/test_suite/encryption/gglwe_ct.rs b/poulpy-core/src/tests/test_suite/encryption/gglwe_ct.rs index 95a0f7e..e3450f9 100644 --- a/poulpy-core/src/tests/test_suite/encryption/gglwe_ct.rs +++ b/poulpy-core/src/tests/test_suite/encryption/gglwe_ct.rs @@ -1,8 +1,8 @@ use poulpy_hal::{ api::{ - ScratchOwnedAlloc, ScratchOwnedBorrow, SvpApplyDftToDftInplace, SvpPPolAlloc, SvpPPolAllocBytes, SvpPrepare, + ScratchOwnedAlloc, ScratchOwnedBorrow, SvpApplyDftToDftInplace, SvpPPolAlloc, SvpPPolBytesOf, SvpPrepare, VecZnxAddInplace, VecZnxAddNormal, VecZnxAddScalarInplace, VecZnxBigAddInplace, VecZnxBigAddSmallInplace, - VecZnxBigAllocBytes, VecZnxBigNormalize, VecZnxCopy, VecZnxDftAllocBytes, VecZnxDftApply, VecZnxFillUniform, + VecZnxBigBytesOf, VecZnxBigNormalize, VecZnxCopy, VecZnxDftApply, VecZnxDftBytesOf, VecZnxFillUniform, VecZnxIdftApplyConsume, VecZnxNormalize, VecZnxNormalizeInplace, VecZnxNormalizeTmpBytes, VecZnxSub, VecZnxSubInplace, VecZnxSubScalarInplace, VecZnxSwitchRing, VmpPMatAlloc, VmpPrepare, }, @@ -25,7 +25,7 @@ use crate::{ pub fn test_gglwe_switching_key_encrypt_sk(module: &Module) where - Module: VecZnxDftAllocBytes + Module: VecZnxDftBytesOf + VecZnxBigNormalize + VecZnxDftApply + SvpApplyDftToDftInplace @@ -39,12 +39,12 @@ where + VecZnxNormalize + VecZnxSub + SvpPrepare - + SvpPPolAllocBytes + + SvpPPolBytesOf + SvpPPolAlloc + VecZnxBigAddSmallInplace + VecZnxSwitchRing + VecZnxAddScalarInplace - + VecZnxBigAllocBytes + + VecZnxBigBytesOf + VecZnxBigAddInplace + VecZnxSubScalarInplace + VecZnxCopy @@ -117,7 +117,7 @@ where pub fn test_gglwe_switching_key_compressed_encrypt_sk(module: &Module) where - Module: VecZnxDftAllocBytes + Module: VecZnxDftBytesOf + VecZnxBigNormalize + VecZnxDftApply + SvpApplyDftToDftInplace @@ -131,12 +131,12 @@ where + VecZnxNormalize + VecZnxSub + SvpPrepare - + SvpPPolAllocBytes + + SvpPPolBytesOf + SvpPPolAlloc + VecZnxBigAddSmallInplace + VecZnxSwitchRing + VecZnxAddScalarInplace - + VecZnxBigAllocBytes + + VecZnxBigBytesOf + VecZnxBigAddInplace + VecZnxSubScalarInplace + VecZnxCopy diff --git a/poulpy-core/src/tests/test_suite/encryption/ggsw_ct.rs b/poulpy-core/src/tests/test_suite/encryption/ggsw_ct.rs index 2aa8f1a..c419bb4 100644 --- a/poulpy-core/src/tests/test_suite/encryption/ggsw_ct.rs +++ b/poulpy-core/src/tests/test_suite/encryption/ggsw_ct.rs @@ -1,10 +1,10 @@ use poulpy_hal::{ api::{ - ScratchOwnedAlloc, ScratchOwnedBorrow, SvpApplyDftToDftInplace, SvpPPolAlloc, SvpPPolAllocBytes, SvpPrepare, + ScratchOwnedAlloc, ScratchOwnedBorrow, SvpApplyDftToDftInplace, SvpPPolAlloc, SvpPPolBytesOf, SvpPrepare, VecZnxAddInplace, VecZnxAddNormal, VecZnxAddScalarInplace, VecZnxBigAddInplace, VecZnxBigAddSmallInplace, VecZnxBigAlloc, - VecZnxBigAllocBytes, VecZnxBigNormalize, VecZnxBigNormalizeTmpBytes, VecZnxCopy, VecZnxDftAlloc, VecZnxDftAllocBytes, - VecZnxDftApply, VecZnxFillUniform, VecZnxIdftApplyConsume, VecZnxIdftApplyTmpA, VecZnxNormalize, VecZnxNormalizeInplace, - VecZnxNormalizeTmpBytes, VecZnxSub, VecZnxSubInplace, VmpPMatAlloc, VmpPrepare, + VecZnxBigBytesOf, VecZnxBigNormalize, VecZnxBigNormalizeTmpBytes, VecZnxCopy, VecZnxDftAlloc, VecZnxDftApply, + VecZnxDftBytesOf, VecZnxFillUniform, VecZnxIdftApplyConsume, VecZnxIdftApplyTmpA, VecZnxNormalize, + VecZnxNormalizeInplace, VecZnxNormalizeTmpBytes, VecZnxSub, VecZnxSubInplace, VmpPMatAlloc, VmpPrepare, }, layouts::{Backend, Module, ScalarZnx, ScratchOwned}, oep::{ @@ -79,7 +79,7 @@ where pub fn test_ggsw_compressed_encrypt_sk(module: &Module) where - Module: VecZnxDftAllocBytes + Module: VecZnxDftBytesOf + VecZnxBigNormalize + VecZnxDftApply + SvpApplyDftToDftInplace @@ -93,11 +93,11 @@ where + VecZnxNormalize + VecZnxSub + SvpPrepare - + SvpPPolAllocBytes + + SvpPPolBytesOf + SvpPPolAlloc + VecZnxBigAddSmallInplace + VecZnxAddScalarInplace - + VecZnxBigAllocBytes + + VecZnxBigBytesOf + VecZnxBigAddInplace + VecZnxCopy + VmpPMatAlloc diff --git a/poulpy-core/src/tests/test_suite/encryption/glwe_ct.rs b/poulpy-core/src/tests/test_suite/encryption/glwe_ct.rs index 841ed6e..9094c33 100644 --- a/poulpy-core/src/tests/test_suite/encryption/glwe_ct.rs +++ b/poulpy-core/src/tests/test_suite/encryption/glwe_ct.rs @@ -1,10 +1,9 @@ use poulpy_hal::{ api::{ - ScratchOwnedAlloc, ScratchOwnedBorrow, SvpApplyDftToDft, SvpApplyDftToDftInplace, SvpPPolAlloc, SvpPPolAllocBytes, + ScratchOwnedAlloc, ScratchOwnedBorrow, SvpApplyDftToDft, SvpApplyDftToDftInplace, SvpPPolAlloc, SvpPPolBytesOf, SvpPrepare, VecZnxAddInplace, VecZnxAddNormal, VecZnxBigAddInplace, VecZnxBigAddNormal, VecZnxBigAddSmallInplace, - VecZnxBigAllocBytes, VecZnxBigNormalize, VecZnxCopy, VecZnxDftAlloc, VecZnxDftAllocBytes, VecZnxDftApply, - VecZnxFillUniform, VecZnxIdftApplyConsume, VecZnxNormalize, VecZnxNormalizeInplace, VecZnxNormalizeTmpBytes, VecZnxSub, - VecZnxSubInplace, + VecZnxBigBytesOf, VecZnxBigNormalize, VecZnxCopy, VecZnxDftAlloc, VecZnxDftApply, VecZnxDftBytesOf, VecZnxFillUniform, + VecZnxIdftApplyConsume, VecZnxNormalize, VecZnxNormalizeInplace, VecZnxNormalizeTmpBytes, VecZnxSub, VecZnxSubInplace, }, layouts::{Backend, Module, ScratchOwned}, oep::{ @@ -26,8 +25,8 @@ use crate::{ pub fn test_glwe_encrypt_sk(module: &Module) where - Module: VecZnxDftAllocBytes - + VecZnxBigAllocBytes + Module: VecZnxDftBytesOf + + VecZnxBigBytesOf + VecZnxDftApply + SvpApplyDftToDftInplace + VecZnxIdftApplyConsume @@ -36,7 +35,7 @@ where + VecZnxBigNormalize + VecZnxNormalizeTmpBytes + SvpPrepare - + SvpPPolAllocBytes + + SvpPPolBytesOf + SvpPPolAlloc + SvpApplyDftToDft + VecZnxBigAddNormal @@ -117,8 +116,8 @@ where pub fn test_glwe_compressed_encrypt_sk(module: &Module) where - Module: VecZnxDftAllocBytes - + VecZnxBigAllocBytes + Module: VecZnxDftBytesOf + + VecZnxBigBytesOf + VecZnxDftApply + SvpApplyDftToDftInplace + VecZnxIdftApplyConsume @@ -127,7 +126,7 @@ where + VecZnxBigNormalize + VecZnxNormalizeTmpBytes + SvpPrepare - + SvpPPolAllocBytes + + SvpPPolBytesOf + SvpPPolAlloc + SvpApplyDftToDft + VecZnxBigAddNormal @@ -219,8 +218,8 @@ where pub fn test_glwe_encrypt_zero_sk(module: &Module) where - Module: VecZnxDftAllocBytes - + VecZnxBigAllocBytes + Module: VecZnxDftBytesOf + + VecZnxBigBytesOf + VecZnxDftApply + SvpApplyDftToDftInplace + VecZnxIdftApplyConsume @@ -229,7 +228,7 @@ where + VecZnxBigNormalize + VecZnxNormalizeTmpBytes + SvpPrepare - + SvpPPolAllocBytes + + SvpPPolBytesOf + SvpPPolAlloc + SvpApplyDftToDft + VecZnxBigAddNormal @@ -294,7 +293,7 @@ where pub fn test_glwe_encrypt_pk(module: &Module) where - Module: VecZnxDftAllocBytes + Module: VecZnxDftBytesOf + VecZnxBigNormalize + VecZnxDftApply + SvpApplyDftToDftInplace @@ -308,10 +307,10 @@ where + VecZnxNormalize + VecZnxSub + SvpPrepare - + SvpPPolAllocBytes + + SvpPPolBytesOf + SvpPPolAlloc + VecZnxBigAddSmallInplace - + VecZnxBigAllocBytes + + VecZnxBigBytesOf + VecZnxBigAddInplace + VecZnxCopy + VecZnxDftAlloc diff --git a/poulpy-core/src/tests/test_suite/encryption/glwe_tsk.rs b/poulpy-core/src/tests/test_suite/encryption/glwe_tsk.rs index 7b34e63..1f369db 100644 --- a/poulpy-core/src/tests/test_suite/encryption/glwe_tsk.rs +++ b/poulpy-core/src/tests/test_suite/encryption/glwe_tsk.rs @@ -1,8 +1,8 @@ use poulpy_hal::{ api::{ - ScratchOwnedAlloc, ScratchOwnedBorrow, SvpApplyDftToDft, SvpApplyDftToDftInplace, SvpPPolAlloc, SvpPPolAllocBytes, + ScratchOwnedAlloc, ScratchOwnedBorrow, SvpApplyDftToDft, SvpApplyDftToDftInplace, SvpPPolAlloc, SvpPPolBytesOf, SvpPrepare, VecZnxAddInplace, VecZnxAddNormal, VecZnxAddScalarInplace, VecZnxBigAddInplace, VecZnxBigAddSmallInplace, - VecZnxBigAlloc, VecZnxBigAllocBytes, VecZnxBigNormalize, VecZnxCopy, VecZnxDftAlloc, VecZnxDftAllocBytes, VecZnxDftApply, + VecZnxBigAlloc, VecZnxBigBytesOf, VecZnxBigNormalize, VecZnxCopy, VecZnxDftAlloc, VecZnxDftApply, VecZnxDftBytesOf, VecZnxFillUniform, VecZnxIdftApplyConsume, VecZnxIdftApplyTmpA, VecZnxNormalize, VecZnxNormalizeInplace, VecZnxNormalizeTmpBytes, VecZnxSub, VecZnxSubInplace, VecZnxSubScalarInplace, VecZnxSwitchRing, }, @@ -25,7 +25,7 @@ use crate::{ pub fn test_gglwe_tensor_key_encrypt_sk(module: &Module) where - Module: VecZnxDftAllocBytes + Module: VecZnxDftBytesOf + VecZnxBigNormalize + VecZnxDftApply + SvpApplyDftToDftInplace @@ -39,10 +39,10 @@ where + VecZnxNormalize + VecZnxSub + SvpPrepare - + SvpPPolAllocBytes + + SvpPPolBytesOf + SvpPPolAlloc + VecZnxBigAddSmallInplace - + VecZnxBigAllocBytes + + VecZnxBigBytesOf + VecZnxBigAddInplace + VecZnxCopy + VecZnxDftAlloc @@ -145,7 +145,7 @@ where pub fn test_gglwe_tensor_key_compressed_encrypt_sk(module: &Module) where - Module: VecZnxDftAllocBytes + Module: VecZnxDftBytesOf + VecZnxBigNormalize + VecZnxDftApply + SvpApplyDftToDftInplace @@ -159,10 +159,10 @@ where + VecZnxNormalize + VecZnxSub + SvpPrepare - + SvpPPolAllocBytes + + SvpPPolBytesOf + SvpPPolAlloc + VecZnxBigAddSmallInplace - + VecZnxBigAllocBytes + + VecZnxBigBytesOf + VecZnxBigAddInplace + VecZnxCopy + VecZnxDftAlloc diff --git a/poulpy-core/src/tests/test_suite/external_product/gglwe_ksk.rs b/poulpy-core/src/tests/test_suite/external_product/gglwe_ksk.rs index c4cb4aa..f10643b 100644 --- a/poulpy-core/src/tests/test_suite/external_product/gglwe_ksk.rs +++ b/poulpy-core/src/tests/test_suite/external_product/gglwe_ksk.rs @@ -1,8 +1,8 @@ use poulpy_hal::{ api::{ - ScratchOwnedAlloc, ScratchOwnedBorrow, SvpApplyDftToDftInplace, SvpPPolAlloc, SvpPPolAllocBytes, SvpPrepare, + ScratchOwnedAlloc, ScratchOwnedBorrow, SvpApplyDftToDftInplace, SvpPPolAlloc, SvpPPolBytesOf, SvpPrepare, VecZnxAddInplace, VecZnxAddNormal, VecZnxAddScalarInplace, VecZnxBigAddInplace, VecZnxBigAddSmallInplace, - VecZnxBigAllocBytes, VecZnxBigNormalize, VecZnxCopy, VecZnxDftAllocBytes, VecZnxDftApply, VecZnxFillUniform, + VecZnxBigBytesOf, VecZnxBigNormalize, VecZnxCopy, VecZnxDftApply, VecZnxDftBytesOf, VecZnxFillUniform, VecZnxIdftApplyConsume, VecZnxNormalize, VecZnxNormalizeInplace, VecZnxNormalizeTmpBytes, VecZnxRotateInplace, VecZnxSub, VecZnxSubInplace, VecZnxSubScalarInplace, VecZnxSwitchRing, VmpApplyDftToDft, VmpApplyDftToDftAdd, VmpApplyDftToDftTmpBytes, VmpPMatAlloc, VmpPrepare, @@ -27,7 +27,7 @@ use crate::{ #[allow(clippy::too_many_arguments)] pub fn test_gglwe_switching_key_external_product(module: &Module) where - Module: VecZnxDftAllocBytes + Module: VecZnxDftBytesOf + VecZnxBigNormalize + VecZnxDftApply + SvpApplyDftToDftInplace @@ -41,9 +41,9 @@ where + VecZnxNormalize + VecZnxSub + SvpPrepare - + SvpPPolAllocBytes + + SvpPPolBytesOf + SvpPPolAlloc - + VecZnxBigAllocBytes + + VecZnxBigBytesOf + VecZnxBigAddInplace + VecZnxBigAddSmallInplace + VecZnxSwitchRing @@ -209,7 +209,7 @@ where #[allow(clippy::too_many_arguments)] pub fn test_gglwe_switching_key_external_product_inplace(module: &Module) where - Module: VecZnxDftAllocBytes + Module: VecZnxDftBytesOf + VecZnxBigNormalize + VecZnxDftApply + SvpApplyDftToDftInplace @@ -223,9 +223,9 @@ where + VecZnxNormalize + VecZnxSub + SvpPrepare - + SvpPPolAllocBytes + + SvpPPolBytesOf + SvpPPolAlloc - + VecZnxBigAllocBytes + + VecZnxBigBytesOf + VecZnxBigAddInplace + VecZnxBigAddSmallInplace + VecZnxSwitchRing diff --git a/poulpy-core/src/tests/test_suite/external_product/ggsw_ct.rs b/poulpy-core/src/tests/test_suite/external_product/ggsw_ct.rs index e7f8d85..8d62b19 100644 --- a/poulpy-core/src/tests/test_suite/external_product/ggsw_ct.rs +++ b/poulpy-core/src/tests/test_suite/external_product/ggsw_ct.rs @@ -1,11 +1,11 @@ use poulpy_hal::{ api::{ - ScratchOwnedAlloc, ScratchOwnedBorrow, SvpApplyDftToDftInplace, SvpPPolAlloc, SvpPPolAllocBytes, SvpPrepare, + ScratchOwnedAlloc, ScratchOwnedBorrow, SvpApplyDftToDftInplace, SvpPPolAlloc, SvpPPolBytesOf, SvpPrepare, VecZnxAddInplace, VecZnxAddNormal, VecZnxAddScalarInplace, VecZnxBigAddInplace, VecZnxBigAddSmallInplace, VecZnxBigAlloc, - VecZnxBigAllocBytes, VecZnxBigNormalize, VecZnxBigNormalizeTmpBytes, VecZnxCopy, VecZnxDftAlloc, VecZnxDftAllocBytes, - VecZnxDftApply, VecZnxFillUniform, VecZnxIdftApplyConsume, VecZnxIdftApplyTmpA, VecZnxNormalize, VecZnxNormalizeInplace, - VecZnxNormalizeTmpBytes, VecZnxRotateInplace, VecZnxSub, VecZnxSubInplace, VmpApplyDftToDft, VmpApplyDftToDftAdd, - VmpApplyDftToDftTmpBytes, VmpPMatAlloc, VmpPrepare, + VecZnxBigBytesOf, VecZnxBigNormalize, VecZnxBigNormalizeTmpBytes, VecZnxCopy, VecZnxDftAlloc, VecZnxDftApply, + VecZnxDftBytesOf, VecZnxFillUniform, VecZnxIdftApplyConsume, VecZnxIdftApplyTmpA, VecZnxNormalize, + VecZnxNormalizeInplace, VecZnxNormalizeTmpBytes, VecZnxRotateInplace, VecZnxSub, VecZnxSubInplace, VmpApplyDftToDft, + VmpApplyDftToDftAdd, VmpApplyDftToDftTmpBytes, VmpPMatAlloc, VmpPrepare, }, layouts::{Backend, Module, ScalarZnx, ScalarZnxToMut, ScratchOwned, ZnxViewMut}, oep::{ @@ -27,7 +27,7 @@ use crate::{ #[allow(clippy::too_many_arguments)] pub fn test_ggsw_external_product(module: &Module) where - Module: VecZnxDftAllocBytes + Module: VecZnxDftBytesOf + VecZnxBigNormalize + VecZnxDftApply + SvpApplyDftToDftInplace @@ -41,9 +41,9 @@ where + VecZnxNormalize + VecZnxSub + SvpPrepare - + SvpPPolAllocBytes + + SvpPPolBytesOf + SvpPPolAlloc - + VecZnxBigAllocBytes + + VecZnxBigBytesOf + VecZnxBigAddInplace + VecZnxBigAddSmallInplace + VecZnxAddScalarInplace @@ -192,7 +192,7 @@ where #[allow(clippy::too_many_arguments)] pub fn test_ggsw_external_product_inplace(module: &Module) where - Module: VecZnxDftAllocBytes + Module: VecZnxDftBytesOf + VecZnxBigNormalize + VecZnxDftApply + SvpApplyDftToDftInplace @@ -206,9 +206,9 @@ where + VecZnxNormalize + VecZnxSub + SvpPrepare - + SvpPPolAllocBytes + + SvpPPolBytesOf + SvpPPolAlloc - + VecZnxBigAllocBytes + + VecZnxBigBytesOf + VecZnxBigAddInplace + VecZnxBigAddSmallInplace + VecZnxAddScalarInplace diff --git a/poulpy-core/src/tests/test_suite/external_product/glwe_ct.rs b/poulpy-core/src/tests/test_suite/external_product/glwe_ct.rs index cf1880a..08f9695 100644 --- a/poulpy-core/src/tests/test_suite/external_product/glwe_ct.rs +++ b/poulpy-core/src/tests/test_suite/external_product/glwe_ct.rs @@ -1,8 +1,8 @@ use poulpy_hal::{ api::{ - ScratchOwnedAlloc, ScratchOwnedBorrow, SvpApplyDftToDftInplace, SvpPPolAlloc, SvpPPolAllocBytes, SvpPrepare, + ScratchOwnedAlloc, ScratchOwnedBorrow, SvpApplyDftToDftInplace, SvpPPolAlloc, SvpPPolBytesOf, SvpPrepare, VecZnxAddInplace, VecZnxAddNormal, VecZnxAddScalarInplace, VecZnxBigAddInplace, VecZnxBigAddSmallInplace, - VecZnxBigAllocBytes, VecZnxBigNormalize, VecZnxDftAllocBytes, VecZnxDftApply, VecZnxFillUniform, VecZnxIdftApplyConsume, + VecZnxBigBytesOf, VecZnxBigNormalize, VecZnxDftApply, VecZnxDftBytesOf, VecZnxFillUniform, VecZnxIdftApplyConsume, VecZnxNormalize, VecZnxNormalizeInplace, VecZnxNormalizeTmpBytes, VecZnxRotateInplace, VecZnxSub, VecZnxSubInplace, VmpApplyDftToDft, VmpApplyDftToDftAdd, VmpApplyDftToDftTmpBytes, VmpPMatAlloc, VmpPrepare, }, @@ -26,7 +26,7 @@ use crate::{ #[allow(clippy::too_many_arguments)] pub fn test_glwe_external_product(module: &Module) where - Module: VecZnxDftAllocBytes + Module: VecZnxDftBytesOf + VecZnxBigNormalize + VecZnxDftApply + SvpApplyDftToDftInplace @@ -39,9 +39,9 @@ where + VecZnxNormalize + VecZnxSub + SvpPrepare - + SvpPPolAllocBytes + + SvpPPolBytesOf + SvpPPolAlloc - + VecZnxBigAllocBytes + + VecZnxBigBytesOf + VecZnxBigAddInplace + VecZnxBigAddSmallInplace + VecZnxNormalizeTmpBytes @@ -178,7 +178,7 @@ where #[allow(clippy::too_many_arguments)] pub fn test_glwe_external_product_inplace(module: &Module) where - Module: VecZnxDftAllocBytes + Module: VecZnxDftBytesOf + VecZnxBigNormalize + VecZnxDftApply + SvpApplyDftToDftInplace @@ -191,9 +191,9 @@ where + VecZnxNormalize + VecZnxSub + SvpPrepare - + SvpPPolAllocBytes + + SvpPPolBytesOf + SvpPPolAlloc - + VecZnxBigAllocBytes + + VecZnxBigBytesOf + VecZnxBigAddInplace + VecZnxBigAddSmallInplace + VecZnxNormalizeTmpBytes diff --git a/poulpy-core/src/tests/test_suite/keyswitch/gglwe_ct.rs b/poulpy-core/src/tests/test_suite/keyswitch/gglwe_ct.rs index 41fb701..90c179b 100644 --- a/poulpy-core/src/tests/test_suite/keyswitch/gglwe_ct.rs +++ b/poulpy-core/src/tests/test_suite/keyswitch/gglwe_ct.rs @@ -1,11 +1,11 @@ use poulpy_hal::{ api::{ - ScratchOwnedAlloc, ScratchOwnedBorrow, SvpApplyDftToDftInplace, SvpPPolAlloc, SvpPPolAllocBytes, SvpPrepare, + ScratchOwnedAlloc, ScratchOwnedBorrow, SvpApplyDftToDftInplace, SvpPPolAlloc, SvpPPolBytesOf, SvpPrepare, VecZnxAddInplace, VecZnxAddNormal, VecZnxAddScalarInplace, VecZnxBigAddInplace, VecZnxBigAddSmallInplace, - VecZnxBigAllocBytes, VecZnxBigNormalize, VecZnxBigNormalizeTmpBytes, VecZnxDftAllocBytes, VecZnxDftApply, - VecZnxFillUniform, VecZnxIdftApplyConsume, VecZnxNormalize, VecZnxNormalizeInplace, VecZnxNormalizeTmpBytes, VecZnxSub, - VecZnxSubInplace, VecZnxSubScalarInplace, VecZnxSwitchRing, VmpApplyDftToDft, VmpApplyDftToDftAdd, - VmpApplyDftToDftTmpBytes, VmpPMatAlloc, VmpPrepare, + VecZnxBigBytesOf, VecZnxBigNormalize, VecZnxBigNormalizeTmpBytes, VecZnxDftApply, VecZnxDftBytesOf, VecZnxFillUniform, + VecZnxIdftApplyConsume, VecZnxNormalize, VecZnxNormalizeInplace, VecZnxNormalizeTmpBytes, VecZnxSub, VecZnxSubInplace, + VecZnxSubScalarInplace, VecZnxSwitchRing, VmpApplyDftToDft, VmpApplyDftToDftAdd, VmpApplyDftToDftTmpBytes, VmpPMatAlloc, + VmpPrepare, }, layouts::{Backend, Module, ScratchOwned}, oep::{ @@ -26,7 +26,7 @@ use crate::{ pub fn test_gglwe_switching_key_keyswitch(module: &Module) where - Module: VecZnxDftAllocBytes + Module: VecZnxDftBytesOf + VecZnxBigNormalize + VecZnxDftApply + SvpApplyDftToDftInplace @@ -39,9 +39,9 @@ where + VecZnxNormalize + VecZnxSub + SvpPrepare - + SvpPPolAllocBytes + + SvpPPolBytesOf + SvpPPolAlloc - + VecZnxBigAllocBytes + + VecZnxBigBytesOf + VecZnxBigAddInplace + VecZnxBigAddSmallInplace + VecZnxNormalizeTmpBytes @@ -196,7 +196,7 @@ where #[allow(clippy::too_many_arguments)] pub fn test_gglwe_switching_key_keyswitch_inplace(module: &Module) where - Module: VecZnxDftAllocBytes + Module: VecZnxDftBytesOf + VecZnxBigNormalize + VecZnxDftApply + SvpApplyDftToDftInplace @@ -209,9 +209,9 @@ where + VecZnxNormalize + VecZnxSub + SvpPrepare - + SvpPPolAllocBytes + + SvpPPolBytesOf + SvpPPolAlloc - + VecZnxBigAllocBytes + + VecZnxBigBytesOf + VecZnxBigAddInplace + VecZnxBigAddSmallInplace + VecZnxNormalizeTmpBytes diff --git a/poulpy-core/src/tests/test_suite/keyswitch/ggsw_ct.rs b/poulpy-core/src/tests/test_suite/keyswitch/ggsw_ct.rs index 55f1b7f..6d74811 100644 --- a/poulpy-core/src/tests/test_suite/keyswitch/ggsw_ct.rs +++ b/poulpy-core/src/tests/test_suite/keyswitch/ggsw_ct.rs @@ -1,9 +1,9 @@ use poulpy_hal::{ api::{ - ScratchOwnedAlloc, ScratchOwnedBorrow, SvpApplyDftToDft, SvpApplyDftToDftInplace, SvpPPolAlloc, SvpPPolAllocBytes, + ScratchOwnedAlloc, ScratchOwnedBorrow, SvpApplyDftToDft, SvpApplyDftToDftInplace, SvpPPolAlloc, SvpPPolBytesOf, SvpPrepare, VecZnxAddInplace, VecZnxAddNormal, VecZnxAddScalarInplace, VecZnxBigAddInplace, VecZnxBigAddSmallInplace, - VecZnxBigAlloc, VecZnxBigAllocBytes, VecZnxBigNormalize, VecZnxBigNormalizeTmpBytes, VecZnxDftAddInplace, VecZnxDftAlloc, - VecZnxDftAllocBytes, VecZnxDftApply, VecZnxDftCopy, VecZnxFillUniform, VecZnxIdftApplyConsume, VecZnxIdftApplyTmpA, + VecZnxBigAlloc, VecZnxBigBytesOf, VecZnxBigNormalize, VecZnxBigNormalizeTmpBytes, VecZnxDftAddInplace, VecZnxDftAlloc, + VecZnxDftApply, VecZnxDftBytesOf, VecZnxDftCopy, VecZnxFillUniform, VecZnxIdftApplyConsume, VecZnxIdftApplyTmpA, VecZnxNormalize, VecZnxNormalizeInplace, VecZnxNormalizeTmpBytes, VecZnxSub, VecZnxSubInplace, VecZnxSwitchRing, VmpApplyDftToDft, VmpApplyDftToDftAdd, VmpApplyDftToDftTmpBytes, VmpPMatAlloc, VmpPrepare, }, @@ -27,7 +27,7 @@ use crate::{ #[allow(clippy::too_many_arguments)] pub fn test_ggsw_keyswitch(module: &Module) where - Module: VecZnxDftAllocBytes + Module: VecZnxDftBytesOf + VecZnxBigNormalize + VecZnxDftApply + SvpApplyDftToDftInplace @@ -40,9 +40,9 @@ where + VecZnxNormalize + VecZnxSub + SvpPrepare - + SvpPPolAllocBytes + + SvpPPolBytesOf + SvpPPolAlloc - + VecZnxBigAllocBytes + + VecZnxBigBytesOf + VecZnxBigAddInplace + VecZnxBigAddSmallInplace + VecZnxNormalizeTmpBytes @@ -216,7 +216,7 @@ where #[allow(clippy::too_many_arguments)] pub fn test_ggsw_keyswitch_inplace(module: &Module) where - Module: VecZnxDftAllocBytes + Module: VecZnxDftBytesOf + VecZnxBigNormalize + VecZnxDftApply + SvpApplyDftToDftInplace @@ -229,9 +229,9 @@ where + VecZnxNormalize + VecZnxSub + SvpPrepare - + SvpPPolAllocBytes + + SvpPPolBytesOf + SvpPPolAlloc - + VecZnxBigAllocBytes + + VecZnxBigBytesOf + VecZnxBigAddInplace + VecZnxBigAddSmallInplace + VecZnxNormalizeTmpBytes diff --git a/poulpy-core/src/tests/test_suite/keyswitch/glwe_ct.rs b/poulpy-core/src/tests/test_suite/keyswitch/glwe_ct.rs index 6654fe9..7f629b8 100644 --- a/poulpy-core/src/tests/test_suite/keyswitch/glwe_ct.rs +++ b/poulpy-core/src/tests/test_suite/keyswitch/glwe_ct.rs @@ -1,11 +1,10 @@ use poulpy_hal::{ api::{ - ScratchOwnedAlloc, ScratchOwnedBorrow, SvpApplyDftToDftInplace, SvpPPolAlloc, SvpPPolAllocBytes, SvpPrepare, + ScratchOwnedAlloc, ScratchOwnedBorrow, SvpApplyDftToDftInplace, SvpPPolAlloc, SvpPPolBytesOf, SvpPrepare, VecZnxAddInplace, VecZnxAddNormal, VecZnxAddScalarInplace, VecZnxBigAddInplace, VecZnxBigAddSmallInplace, - VecZnxBigAllocBytes, VecZnxBigNormalize, VecZnxBigNormalizeTmpBytes, VecZnxDftAllocBytes, VecZnxDftApply, - VecZnxFillUniform, VecZnxIdftApplyConsume, VecZnxNormalize, VecZnxNormalizeInplace, VecZnxNormalizeTmpBytes, VecZnxSub, - VecZnxSubInplace, VecZnxSwitchRing, VmpApplyDftToDft, VmpApplyDftToDftAdd, VmpApplyDftToDftTmpBytes, VmpPMatAlloc, - VmpPrepare, + VecZnxBigBytesOf, VecZnxBigNormalize, VecZnxBigNormalizeTmpBytes, VecZnxDftApply, VecZnxDftBytesOf, VecZnxFillUniform, + VecZnxIdftApplyConsume, VecZnxNormalize, VecZnxNormalizeInplace, VecZnxNormalizeTmpBytes, VecZnxSub, VecZnxSubInplace, + VecZnxSwitchRing, VmpApplyDftToDft, VmpApplyDftToDftAdd, VmpApplyDftToDftTmpBytes, VmpPMatAlloc, VmpPrepare, }, layouts::{Backend, Module, ScratchOwned}, oep::{ @@ -27,7 +26,7 @@ use crate::{ #[allow(clippy::too_many_arguments)] pub fn test_glwe_keyswitch(module: &Module) where - Module: VecZnxDftAllocBytes + Module: VecZnxDftBytesOf + VecZnxBigNormalize + VecZnxDftApply + SvpApplyDftToDftInplace @@ -40,9 +39,9 @@ where + VecZnxNormalize + VecZnxSub + SvpPrepare - + SvpPPolAllocBytes + + SvpPPolBytesOf + SvpPPolAlloc - + VecZnxBigAllocBytes + + VecZnxBigBytesOf + VecZnxBigAddInplace + VecZnxBigAddSmallInplace + VecZnxNormalizeTmpBytes @@ -169,7 +168,7 @@ where pub fn test_glwe_keyswitch_inplace(module: &Module) where - Module: VecZnxDftAllocBytes + Module: VecZnxDftBytesOf + VecZnxBigNormalize + VecZnxDftApply + SvpApplyDftToDftInplace @@ -182,9 +181,9 @@ where + VecZnxNormalize + VecZnxSub + SvpPrepare - + SvpPPolAllocBytes + + SvpPPolBytesOf + SvpPPolAlloc - + VecZnxBigAllocBytes + + VecZnxBigBytesOf + VecZnxBigAddInplace + VecZnxBigAddSmallInplace + VecZnxNormalizeTmpBytes diff --git a/poulpy-core/src/tests/test_suite/keyswitch/lwe_ct.rs b/poulpy-core/src/tests/test_suite/keyswitch/lwe_ct.rs index b20361a..b833209 100644 --- a/poulpy-core/src/tests/test_suite/keyswitch/lwe_ct.rs +++ b/poulpy-core/src/tests/test_suite/keyswitch/lwe_ct.rs @@ -1,9 +1,9 @@ use poulpy_hal::{ api::{ - ScratchOwnedAlloc, ScratchOwnedBorrow, SvpApplyDftToDftInplace, SvpPPolAlloc, SvpPPolAllocBytes, SvpPrepare, + ScratchOwnedAlloc, ScratchOwnedBorrow, SvpApplyDftToDftInplace, SvpPPolAlloc, SvpPPolBytesOf, SvpPrepare, VecZnxAddInplace, VecZnxAddNormal, VecZnxAddScalarInplace, VecZnxAutomorphismInplace, VecZnxBigAddInplace, - VecZnxBigAddSmallInplace, VecZnxBigAllocBytes, VecZnxBigNormalize, VecZnxBigNormalizeTmpBytes, VecZnxCopy, - VecZnxDftAllocBytes, VecZnxDftApply, VecZnxFillUniform, VecZnxIdftApplyConsume, VecZnxNormalize, VecZnxNormalizeInplace, + VecZnxBigAddSmallInplace, VecZnxBigBytesOf, VecZnxBigNormalize, VecZnxBigNormalizeTmpBytes, VecZnxCopy, VecZnxDftApply, + VecZnxDftBytesOf, VecZnxFillUniform, VecZnxIdftApplyConsume, VecZnxNormalize, VecZnxNormalizeInplace, VecZnxNormalizeTmpBytes, VecZnxSub, VecZnxSubInplace, VecZnxSwitchRing, VmpApplyDftToDft, VmpApplyDftToDftAdd, VmpApplyDftToDftTmpBytes, VmpPMatAlloc, VmpPrepare, ZnAddNormal, ZnFillUniform, ZnNormalizeInplace, }, @@ -22,7 +22,7 @@ use crate::layouts::{ pub fn test_lwe_keyswitch(module: &Module) where - Module: VecZnxDftAllocBytes + Module: VecZnxDftBytesOf + VecZnxBigNormalize + VecZnxDftApply + SvpApplyDftToDftInplace @@ -35,9 +35,9 @@ where + VecZnxNormalize + VecZnxSub + SvpPrepare - + SvpPPolAllocBytes + + SvpPPolBytesOf + SvpPPolAlloc - + VecZnxBigAllocBytes + + VecZnxBigBytesOf + VecZnxBigAddInplace + VecZnxBigAddSmallInplace + VecZnxNormalizeTmpBytes diff --git a/poulpy-core/src/tests/test_suite/packing.rs b/poulpy-core/src/tests/test_suite/packing.rs index 005a556..ba6d250 100644 --- a/poulpy-core/src/tests/test_suite/packing.rs +++ b/poulpy-core/src/tests/test_suite/packing.rs @@ -2,10 +2,10 @@ use std::collections::HashMap; use poulpy_hal::{ api::{ - ScratchOwnedAlloc, ScratchOwnedBorrow, SvpApplyDftToDftInplace, SvpPPolAlloc, SvpPPolAllocBytes, SvpPrepare, + ScratchOwnedAlloc, ScratchOwnedBorrow, SvpApplyDftToDftInplace, SvpPPolAlloc, SvpPPolBytesOf, SvpPrepare, VecZnxAddInplace, VecZnxAddNormal, VecZnxAddScalarInplace, VecZnxAutomorphism, VecZnxAutomorphismInplace, - VecZnxBigAddInplace, VecZnxBigAddSmallInplace, VecZnxBigAllocBytes, VecZnxBigAutomorphismInplace, VecZnxBigNormalize, - VecZnxBigNormalizeTmpBytes, VecZnxBigSubSmallNegateInplace, VecZnxCopy, VecZnxDftAllocBytes, VecZnxDftApply, + VecZnxBigAddInplace, VecZnxBigAddSmallInplace, VecZnxBigAutomorphismInplace, VecZnxBigBytesOf, VecZnxBigNormalize, + VecZnxBigNormalizeTmpBytes, VecZnxBigSubSmallNegateInplace, VecZnxCopy, VecZnxDftApply, VecZnxDftBytesOf, VecZnxFillUniform, VecZnxIdftApplyConsume, VecZnxNegateInplace, VecZnxNormalize, VecZnxNormalizeInplace, VecZnxNormalizeTmpBytes, VecZnxRotate, VecZnxRotateInplace, VecZnxRshInplace, VecZnxSub, VecZnxSubInplace, VecZnxSwitchRing, VmpApplyDftToDft, VmpApplyDftToDftAdd, VmpApplyDftToDftTmpBytes, VmpPMatAlloc, VmpPrepare, @@ -28,7 +28,7 @@ use crate::{ pub fn test_glwe_packing(module: &Module) where - Module: VecZnxDftAllocBytes + Module: VecZnxDftBytesOf + VecZnxAutomorphism + VecZnxBigAutomorphismInplace + VecZnxBigSubSmallNegateInplace @@ -48,9 +48,9 @@ where + VecZnxNormalize + VecZnxSub + SvpPrepare - + SvpPPolAllocBytes + + SvpPPolBytesOf + SvpPPolAlloc - + VecZnxBigAllocBytes + + VecZnxBigBytesOf + VecZnxBigAddInplace + VecZnxBigAddSmallInplace + VecZnxNormalizeTmpBytes diff --git a/poulpy-core/src/tests/test_suite/trace.rs b/poulpy-core/src/tests/test_suite/trace.rs index 73ce3cb..2f5b5a5 100644 --- a/poulpy-core/src/tests/test_suite/trace.rs +++ b/poulpy-core/src/tests/test_suite/trace.rs @@ -2,13 +2,13 @@ use std::collections::HashMap; use poulpy_hal::{ api::{ - ScratchOwnedAlloc, ScratchOwnedBorrow, SvpApplyDftToDftInplace, SvpPPolAlloc, SvpPPolAllocBytes, SvpPrepare, + ScratchOwnedAlloc, ScratchOwnedBorrow, SvpApplyDftToDftInplace, SvpPPolAlloc, SvpPPolBytesOf, SvpPrepare, VecZnxAddInplace, VecZnxAddNormal, VecZnxAddScalarInplace, VecZnxAutomorphism, VecZnxBigAddInplace, - VecZnxBigAddSmallInplace, VecZnxBigAllocBytes, VecZnxBigAutomorphismInplace, VecZnxBigNormalize, - VecZnxBigNormalizeTmpBytes, VecZnxBigSubSmallNegateInplace, VecZnxCopy, VecZnxDftAllocBytes, VecZnxDftApply, - VecZnxFillUniform, VecZnxIdftApplyConsume, VecZnxNormalize, VecZnxNormalizeInplace, VecZnxNormalizeTmpBytes, - VecZnxRotateInplace, VecZnxRshInplace, VecZnxSub, VecZnxSubInplace, VecZnxSwitchRing, VmpApplyDftToDft, - VmpApplyDftToDftAdd, VmpApplyDftToDftTmpBytes, VmpPMatAlloc, VmpPrepare, + VecZnxBigAddSmallInplace, VecZnxBigAutomorphismInplace, VecZnxBigBytesOf, VecZnxBigNormalize, VecZnxBigNormalizeTmpBytes, + VecZnxBigSubSmallNegateInplace, VecZnxCopy, VecZnxDftApply, VecZnxDftBytesOf, VecZnxFillUniform, VecZnxIdftApplyConsume, + VecZnxNormalize, VecZnxNormalizeInplace, VecZnxNormalizeTmpBytes, VecZnxRotateInplace, VecZnxRshInplace, VecZnxSub, + VecZnxSubInplace, VecZnxSwitchRing, VmpApplyDftToDft, VmpApplyDftToDftAdd, VmpApplyDftToDftTmpBytes, VmpPMatAlloc, + VmpPrepare, }, layouts::{Backend, Module, ScratchOwned, ZnxView, ZnxViewMut}, oep::{ @@ -29,7 +29,7 @@ use crate::{ pub fn test_glwe_trace_inplace(module: &Module) where - Module: VecZnxDftAllocBytes + Module: VecZnxDftBytesOf + VecZnxAutomorphism + VecZnxBigAutomorphismInplace + VecZnxBigSubSmallNegateInplace @@ -47,9 +47,9 @@ where + VecZnxNormalize + VecZnxSub + SvpPrepare - + SvpPPolAllocBytes + + SvpPPolBytesOf + SvpPPolAlloc - + VecZnxBigAllocBytes + + VecZnxBigBytesOf + VecZnxBigAddInplace + VecZnxBigAddSmallInplace + VecZnxNormalizeTmpBytes diff --git a/poulpy-hal/src/api/scratch.rs b/poulpy-hal/src/api/scratch.rs index 38901bf..c1bd869 100644 --- a/poulpy-hal/src/api/scratch.rs +++ b/poulpy-hal/src/api/scratch.rs @@ -1,4 +1,7 @@ -use crate::layouts::{Backend, MatZnx, ScalarZnx, Scratch, SvpPPol, VecZnx, VecZnxBig, VecZnxDft, VmpPMat}; +use crate::{ + api::{SvpPPolBytesOf, VecZnxBigBytesOf, VecZnxDftBytesOf, VmpPMatBytesOf}, + layouts::{Backend, MatZnx, Module, ScalarZnx, Scratch, SvpPPol, VecZnx, VecZnxBig, VecZnxDft, VmpPMat}, +}; /// Allocates a new [crate::layouts::ScratchOwned] of `size` aligned bytes. pub trait ScratchOwnedAlloc { @@ -25,76 +28,124 @@ pub trait TakeSlice { fn take_slice(&mut self, len: usize) -> (&mut [T], &mut Self); } -/// Take a slice of bytes from a [Scratch], wraps it into a [ScalarZnx] and returns it -/// as well as a new [Scratch] minus the taken array of bytes. -pub trait TakeScalarZnx { - fn take_scalar_znx(&mut self, n: usize, cols: usize) -> (ScalarZnx<&mut [u8]>, &mut Self); -} +pub trait ScratchTakeBasic +where + Self: TakeSlice, +{ + fn take_scalar_znx(&mut self, module: &Module, cols: usize) -> (ScalarZnx<&mut [u8]>, &mut Self) { + let (take_slice, rem_slice) = self.take_slice(ScalarZnx::bytes_of(module.n(), cols)); + ( + ScalarZnx::from_data(take_slice, module.n(), cols), + rem_slice, + ) + } -/// Take a slice of bytes from a [Scratch], wraps it into a [SvpPPol] and returns it -/// as well as a new [Scratch] minus the taken array of bytes. -pub trait TakeSvpPPol { - fn take_svp_ppol(&mut self, n: usize, cols: usize) -> (SvpPPol<&mut [u8], B>, &mut Self); -} + fn take_svp_ppol(&mut self, module: &Module, cols: usize) -> (SvpPPol<&mut [u8], B>, &mut Self) + where + Module: SvpPPolBytesOf, + { + let (take_slice, rem_slice) = self.take_slice(module.bytes_of_svp_ppol(cols)); + (SvpPPol::from_data(take_slice, module.n(), cols), rem_slice) + } -/// Take a slice of bytes from a [Scratch], wraps it into a [VecZnx] and returns it -/// as well as a new [Scratch] minus the taken array of bytes. -pub trait TakeVecZnx { - fn take_vec_znx(&mut self, n: usize, cols: usize, size: usize) -> (VecZnx<&mut [u8]>, &mut Self); -} + fn take_vec_znx(&mut self, module: &Module, cols: usize, size: usize) -> (VecZnx<&mut [u8]>, &mut Self) { + let (take_slice, rem_slice) = self.take_slice(VecZnx::bytes_of(module.n(), cols, size)); + ( + VecZnx::from_data(take_slice, module.n(), cols, size), + rem_slice, + ) + } -/// Take a slice of bytes from a [Scratch], slices it into a vector of [VecZnx] aand returns it -/// as well as a new [Scratch] minus the taken array of bytes. -pub trait TakeVecZnxSlice { - fn take_vec_znx_slice(&mut self, len: usize, n: usize, cols: usize, size: usize) -> (Vec>, &mut Self); -} + fn take_vec_znx_big(&mut self, module: &Module, cols: usize, size: usize) -> (VecZnxBig<&mut [u8], B>, &mut Self) + where + Module: VecZnxBigBytesOf, + { + let (take_slice, rem_slice) = self.take_slice(module.bytes_of_vec_znx_big(cols, size)); + ( + VecZnxBig::from_data(take_slice, module.n(), cols, size), + rem_slice, + ) + } -/// Take a slice of bytes from a [Scratch], wraps it into a [VecZnxBig] and returns it -/// as well as a new [Scratch] minus the taken array of bytes. -pub trait TakeVecZnxBig { - fn take_vec_znx_big(&mut self, n: usize, cols: usize, size: usize) -> (VecZnxBig<&mut [u8], B>, &mut Self); -} + fn take_vec_znx_dft(&mut self, module: &Module, cols: usize, size: usize) -> (VecZnxDft<&mut [u8], B>, &mut Self) + where + Module: VecZnxDftBytesOf, + { + let (take_slice, rem_slice) = self.take_slice(module.bytes_of_vec_znx_dft(cols, size)); -/// Take a slice of bytes from a [Scratch], wraps it into a [VecZnxDft] and returns it -/// as well as a new [Scratch] minus the taken array of bytes. -pub trait TakeVecZnxDft { - fn take_vec_znx_dft(&mut self, n: usize, cols: usize, size: usize) -> (VecZnxDft<&mut [u8], B>, &mut Self); -} + ( + VecZnxDft::from_data(take_slice, module.n(), cols, size), + rem_slice, + ) + } -/// Take a slice of bytes from a [Scratch], slices it into a vector of [VecZnxDft] and returns it -/// as well as a new [Scratch] minus the taken array of bytes. -pub trait TakeVecZnxDftSlice { fn take_vec_znx_dft_slice( &mut self, + module: &Module, len: usize, - n: usize, cols: usize, size: usize, - ) -> (Vec>, &mut Self); -} + ) -> (Vec>, &mut Self) + where + Module: VecZnxDftBytesOf, + { + let mut scratch: &mut Self = self; + let mut slice: Vec> = Vec::with_capacity(len); + for _ in 0..len { + let (znx, new_scratch) = scratch.take_vec_znx_dft(module, cols, size); + scratch = new_scratch; + slice.push(znx); + } + (slice, scratch) + } + + fn take_vec_znx_slice( + &mut self, + module: &Module, + len: usize, + cols: usize, + size: usize, + ) -> (Vec>, &mut Self) { + let mut scratch: &mut Self = self; + let mut slice: Vec> = Vec::with_capacity(len); + for _ in 0..len { + let (znx, new_scratch) = scratch.take_vec_znx(module, cols, size); + scratch = new_scratch; + slice.push(znx); + } + (slice, scratch) + } -/// Take a slice of bytes from a [Scratch], wraps it into a [VmpPMat] and returns it -/// as well as a new [Scratch] minus the taken array of bytes. -pub trait TakeVmpPMat { fn take_vmp_pmat( &mut self, - n: usize, + module: &Module, rows: usize, cols_in: usize, cols_out: usize, size: usize, - ) -> (VmpPMat<&mut [u8], B>, &mut Self); -} + ) -> (VmpPMat<&mut [u8], B>, &mut Self) + where + Module: VmpPMatBytesOf, + { + let (take_slice, rem_slice) = self.take_slice(module.bytes_of_vmp_pmat(rows, cols_in, cols_out, size)); + ( + VmpPMat::from_data(take_slice, module.n(), rows, cols_in, cols_out, size), + rem_slice, + ) + } -/// Take a slice of bytes from a [Scratch], wraps it into a [MatZnx] and returns it -/// as well as a new [Scratch] minus the taken array of bytes. -pub trait TakeMatZnx { fn take_mat_znx( &mut self, - n: usize, + module: &Module, rows: usize, cols_in: usize, cols_out: usize, size: usize, - ) -> (MatZnx<&mut [u8]>, &mut Self); + ) -> (MatZnx<&mut [u8]>, &mut Self) { + let (take_slice, rem_slice) = self.take_slice(MatZnx::bytes_of(module.n(), rows, cols_in, cols_out, size)); + ( + MatZnx::from_data(take_slice, module.n(), rows, cols_in, cols_out, size), + rem_slice, + ) + } } diff --git a/poulpy-hal/src/api/svp_ppol.rs b/poulpy-hal/src/api/svp_ppol.rs index b1733cc..6678584 100644 --- a/poulpy-hal/src/api/svp_ppol.rs +++ b/poulpy-hal/src/api/svp_ppol.rs @@ -8,8 +8,8 @@ pub trait SvpPPolAlloc { } /// Returns the size in bytes to allocate a [crate::layouts::SvpPPol]. -pub trait SvpPPolAllocBytes { - fn svp_ppol_bytes_of(&self, cols: usize) -> usize; +pub trait SvpPPolBytesOf { + fn bytes_of_svp_ppol(&self, cols: usize) -> usize; } /// Consume a vector of bytes into a [crate::layouts::MatZnx]. diff --git a/poulpy-hal/src/api/vec_znx_big.rs b/poulpy-hal/src/api/vec_znx_big.rs index 52048a5..8cb5105 100644 --- a/poulpy-hal/src/api/vec_znx_big.rs +++ b/poulpy-hal/src/api/vec_znx_big.rs @@ -16,8 +16,8 @@ pub trait VecZnxBigAlloc { } /// Returns the size in bytes to allocate a [crate::layouts::VecZnxBig]. -pub trait VecZnxBigAllocBytes { - fn vec_znx_big_bytes_of(&self, cols: usize, size: usize) -> usize; +pub trait VecZnxBigBytesOf { + fn bytes_of_vec_znx_big(&self, cols: usize, size: usize) -> usize; } /// Consume a vector of bytes into a [crate::layouts::VecZnxBig]. diff --git a/poulpy-hal/src/api/vec_znx_dft.rs b/poulpy-hal/src/api/vec_znx_dft.rs index 621860c..3a003a9 100644 --- a/poulpy-hal/src/api/vec_znx_dft.rs +++ b/poulpy-hal/src/api/vec_znx_dft.rs @@ -10,8 +10,8 @@ pub trait VecZnxDftFromBytes { fn vec_znx_dft_from_bytes(&self, cols: usize, size: usize, bytes: Vec) -> VecZnxDftOwned; } -pub trait VecZnxDftAllocBytes { - fn vec_znx_dft_bytes_of(&self, cols: usize, size: usize) -> usize; +pub trait VecZnxDftBytesOf { + fn bytes_of_vec_znx_dft(&self, cols: usize, size: usize) -> usize; } pub trait VecZnxDftApply { diff --git a/poulpy-hal/src/api/vmp_pmat.rs b/poulpy-hal/src/api/vmp_pmat.rs index be749de..de3433a 100644 --- a/poulpy-hal/src/api/vmp_pmat.rs +++ b/poulpy-hal/src/api/vmp_pmat.rs @@ -6,8 +6,8 @@ pub trait VmpPMatAlloc { fn vmp_pmat_alloc(&self, rows: usize, cols_in: usize, cols_out: usize, size: usize) -> VmpPMatOwned; } -pub trait VmpPMatAllocBytes { - fn vmp_pmat_bytes_of(&self, rows: usize, cols_in: usize, cols_out: usize, size: usize) -> usize; +pub trait VmpPMatBytesOf { + fn bytes_of_vmp_pmat(&self, rows: usize, cols_in: usize, cols_out: usize, size: usize) -> usize; } pub trait VmpPMatFromBytes { diff --git a/poulpy-hal/src/delegates/scratch.rs b/poulpy-hal/src/delegates/scratch.rs index ac022e3..b91afbb 100644 --- a/poulpy-hal/src/delegates/scratch.rs +++ b/poulpy-hal/src/delegates/scratch.rs @@ -1,14 +1,7 @@ use crate::{ - api::{ - ScratchAvailable, ScratchFromBytes, ScratchOwnedAlloc, ScratchOwnedBorrow, TakeMatZnx, TakeScalarZnx, TakeSlice, - TakeSvpPPol, TakeVecZnx, TakeVecZnxBig, TakeVecZnxDft, TakeVecZnxDftSlice, TakeVecZnxSlice, TakeVmpPMat, - }, - layouts::{Backend, MatZnx, ScalarZnx, Scratch, ScratchOwned, SvpPPol, VecZnx, VecZnxBig, VecZnxDft, VmpPMat}, - oep::{ - ScratchAvailableImpl, ScratchFromBytesImpl, ScratchOwnedAllocImpl, ScratchOwnedBorrowImpl, TakeMatZnxImpl, - TakeScalarZnxImpl, TakeSliceImpl, TakeSvpPPolImpl, TakeVecZnxBigImpl, TakeVecZnxDftImpl, TakeVecZnxDftSliceImpl, - TakeVecZnxImpl, TakeVecZnxSliceImpl, TakeVmpPMatImpl, - }, + api::{ScratchAvailable, ScratchFromBytes, ScratchOwnedAlloc, ScratchOwnedBorrow, TakeSlice}, + layouts::{Backend, Scratch, ScratchOwned}, + oep::{ScratchAvailableImpl, ScratchFromBytesImpl, ScratchOwnedAllocImpl, ScratchOwnedBorrowImpl, TakeSliceImpl}, }; impl ScratchOwnedAlloc for ScratchOwned @@ -55,104 +48,3 @@ where B::take_slice_impl(self, len) } } - -impl TakeScalarZnx for Scratch -where - B: Backend + TakeScalarZnxImpl, -{ - fn take_scalar_znx(&mut self, n: usize, cols: usize) -> (ScalarZnx<&mut [u8]>, &mut Self) { - B::take_scalar_znx_impl(self, n, cols) - } -} - -impl TakeSvpPPol for Scratch -where - B: Backend + TakeSvpPPolImpl, -{ - fn take_svp_ppol(&mut self, n: usize, cols: usize) -> (SvpPPol<&mut [u8], B>, &mut Self) { - B::take_svp_ppol_impl(self, n, cols) - } -} - -impl TakeVecZnx for Scratch -where - B: Backend + TakeVecZnxImpl, -{ - fn take_vec_znx(&mut self, n: usize, cols: usize, size: usize) -> (VecZnx<&mut [u8]>, &mut Self) { - B::take_vec_znx_impl(self, n, cols, size) - } -} - -impl TakeVecZnxSlice for Scratch -where - B: Backend + TakeVecZnxSliceImpl, -{ - fn take_vec_znx_slice(&mut self, len: usize, n: usize, cols: usize, size: usize) -> (Vec>, &mut Self) { - B::take_vec_znx_slice_impl(self, len, n, cols, size) - } -} - -impl TakeVecZnxBig for Scratch -where - B: Backend + TakeVecZnxBigImpl, -{ - fn take_vec_znx_big(&mut self, n: usize, cols: usize, size: usize) -> (VecZnxBig<&mut [u8], B>, &mut Self) { - B::take_vec_znx_big_impl(self, n, cols, size) - } -} - -impl TakeVecZnxDft for Scratch -where - B: Backend + TakeVecZnxDftImpl, -{ - fn take_vec_znx_dft(&mut self, n: usize, cols: usize, size: usize) -> (VecZnxDft<&mut [u8], B>, &mut Self) { - B::take_vec_znx_dft_impl(self, n, cols, size) - } -} - -impl TakeVecZnxDftSlice for Scratch -where - B: Backend + TakeVecZnxDftSliceImpl, -{ - fn take_vec_znx_dft_slice( - &mut self, - len: usize, - n: usize, - cols: usize, - size: usize, - ) -> (Vec>, &mut Self) { - B::take_vec_znx_dft_slice_impl(self, len, n, cols, size) - } -} - -impl TakeVmpPMat for Scratch -where - B: Backend + TakeVmpPMatImpl, -{ - fn take_vmp_pmat( - &mut self, - n: usize, - rows: usize, - cols_in: usize, - cols_out: usize, - size: usize, - ) -> (VmpPMat<&mut [u8], B>, &mut Self) { - B::take_vmp_pmat_impl(self, n, rows, cols_in, cols_out, size) - } -} - -impl TakeMatZnx for Scratch -where - B: Backend + TakeMatZnxImpl, -{ - fn take_mat_znx( - &mut self, - n: usize, - rows: usize, - cols_in: usize, - cols_out: usize, - size: usize, - ) -> (MatZnx<&mut [u8]>, &mut Self) { - B::take_mat_znx_impl(self, n, rows, cols_in, cols_out, size) - } -} diff --git a/poulpy-hal/src/delegates/svp_ppol.rs b/poulpy-hal/src/delegates/svp_ppol.rs index aaa3954..de36fd0 100644 --- a/poulpy-hal/src/delegates/svp_ppol.rs +++ b/poulpy-hal/src/delegates/svp_ppol.rs @@ -1,6 +1,6 @@ use crate::{ api::{ - SvpApplyDft, SvpApplyDftToDft, SvpApplyDftToDftAdd, SvpApplyDftToDftInplace, SvpPPolAlloc, SvpPPolAllocBytes, + SvpApplyDft, SvpApplyDftToDft, SvpApplyDftToDftAdd, SvpApplyDftToDftInplace, SvpPPolAlloc, SvpPPolBytesOf, SvpPPolFromBytes, SvpPrepare, }, layouts::{ @@ -30,11 +30,11 @@ where } } -impl SvpPPolAllocBytes for Module +impl SvpPPolBytesOf for Module where B: Backend + SvpPPolAllocBytesImpl, { - fn svp_ppol_bytes_of(&self, cols: usize) -> usize { + fn bytes_of_svp_ppol(&self, cols: usize) -> usize { B::svp_ppol_bytes_of_impl(self.n(), cols) } } diff --git a/poulpy-hal/src/delegates/vec_znx_big.rs b/poulpy-hal/src/delegates/vec_znx_big.rs index d5c06f5..a1cc307 100644 --- a/poulpy-hal/src/delegates/vec_znx_big.rs +++ b/poulpy-hal/src/delegates/vec_znx_big.rs @@ -1,7 +1,7 @@ use crate::{ api::{ VecZnxBigAdd, VecZnxBigAddInplace, VecZnxBigAddNormal, VecZnxBigAddSmall, VecZnxBigAddSmallInplace, VecZnxBigAlloc, - VecZnxBigAllocBytes, VecZnxBigAutomorphism, VecZnxBigAutomorphismInplace, VecZnxBigAutomorphismInplaceTmpBytes, + VecZnxBigAutomorphism, VecZnxBigAutomorphismInplace, VecZnxBigAutomorphismInplaceTmpBytes, VecZnxBigBytesOf, VecZnxBigFromBytes, VecZnxBigFromSmall, VecZnxBigNegate, VecZnxBigNegateInplace, VecZnxBigNormalize, VecZnxBigNormalizeTmpBytes, VecZnxBigSub, VecZnxBigSubInplace, VecZnxBigSubNegateInplace, VecZnxBigSubSmallA, VecZnxBigSubSmallB, VecZnxBigSubSmallInplace, VecZnxBigSubSmallNegateInplace, @@ -49,11 +49,11 @@ where } } -impl VecZnxBigAllocBytes for Module +impl VecZnxBigBytesOf for Module where B: Backend + VecZnxBigAllocBytesImpl, { - fn vec_znx_big_bytes_of(&self, cols: usize, size: usize) -> usize { + fn bytes_of_vec_znx_big(&self, cols: usize, size: usize) -> usize { B::vec_znx_big_bytes_of_impl(self.n(), cols, size) } } diff --git a/poulpy-hal/src/delegates/vec_znx_dft.rs b/poulpy-hal/src/delegates/vec_znx_dft.rs index 650e657..16a583f 100644 --- a/poulpy-hal/src/delegates/vec_znx_dft.rs +++ b/poulpy-hal/src/delegates/vec_znx_dft.rs @@ -1,8 +1,8 @@ use crate::{ api::{ - VecZnxDftAdd, VecZnxDftAddInplace, VecZnxDftAlloc, VecZnxDftAllocBytes, VecZnxDftApply, VecZnxDftCopy, - VecZnxDftFromBytes, VecZnxDftSub, VecZnxDftSubInplace, VecZnxDftSubNegateInplace, VecZnxDftZero, VecZnxIdftApply, - VecZnxIdftApplyConsume, VecZnxIdftApplyTmpA, VecZnxIdftApplyTmpBytes, + VecZnxDftAdd, VecZnxDftAddInplace, VecZnxDftAlloc, VecZnxDftApply, VecZnxDftBytesOf, VecZnxDftCopy, VecZnxDftFromBytes, + VecZnxDftSub, VecZnxDftSubInplace, VecZnxDftSubNegateInplace, VecZnxDftZero, VecZnxIdftApply, VecZnxIdftApplyConsume, + VecZnxIdftApplyTmpA, VecZnxIdftApplyTmpBytes, }, layouts::{ Backend, Data, Module, Scratch, VecZnxBig, VecZnxBigToMut, VecZnxDft, VecZnxDftOwned, VecZnxDftToMut, VecZnxDftToRef, @@ -24,11 +24,11 @@ where } } -impl VecZnxDftAllocBytes for Module +impl VecZnxDftBytesOf for Module where B: Backend + VecZnxDftAllocBytesImpl, { - fn vec_znx_dft_bytes_of(&self, cols: usize, size: usize) -> usize { + fn bytes_of_vec_znx_dft(&self, cols: usize, size: usize) -> usize { B::vec_znx_dft_bytes_of_impl(self.n(), cols, size) } } diff --git a/poulpy-hal/src/delegates/vmp_pmat.rs b/poulpy-hal/src/delegates/vmp_pmat.rs index 2df0d4a..2c65508 100644 --- a/poulpy-hal/src/delegates/vmp_pmat.rs +++ b/poulpy-hal/src/delegates/vmp_pmat.rs @@ -1,7 +1,7 @@ use crate::{ api::{ VmpApplyDft, VmpApplyDftTmpBytes, VmpApplyDftToDft, VmpApplyDftToDftAdd, VmpApplyDftToDftAddTmpBytes, - VmpApplyDftToDftTmpBytes, VmpPMatAlloc, VmpPMatAllocBytes, VmpPMatFromBytes, VmpPrepare, VmpPrepareTmpBytes, + VmpApplyDftToDftTmpBytes, VmpPMatAlloc, VmpPMatBytesOf, VmpPMatFromBytes, VmpPrepare, VmpPrepareTmpBytes, }, layouts::{ Backend, MatZnxToRef, Module, Scratch, VecZnxDftToMut, VecZnxDftToRef, VecZnxToRef, VmpPMatOwned, VmpPMatToMut, @@ -23,11 +23,11 @@ where } } -impl VmpPMatAllocBytes for Module +impl VmpPMatBytesOf for Module where B: Backend + VmpPMatAllocBytesImpl, { - fn vmp_pmat_bytes_of(&self, rows: usize, cols_in: usize, cols_out: usize, size: usize) -> usize { + fn bytes_of_vmp_pmat(&self, rows: usize, cols_in: usize, cols_out: usize, size: usize) -> usize { B::vmp_pmat_bytes_of_impl(self.n(), rows, cols_in, cols_out, size) } } diff --git a/poulpy-hal/src/oep/scratch.rs b/poulpy-hal/src/oep/scratch.rs index 51a9c56..c973b04 100644 --- a/poulpy-hal/src/oep/scratch.rs +++ b/poulpy-hal/src/oep/scratch.rs @@ -1,4 +1,4 @@ -use crate::layouts::{Backend, MatZnx, ScalarZnx, Scratch, ScratchOwned, SvpPPol, VecZnx, VecZnxBig, VecZnxDft, VmpPMat}; +use crate::layouts::{Backend, Scratch, ScratchOwned}; /// # THIS TRAIT IS AN OPEN EXTENSION POINT (unsafe) /// * See the [poulpy-backend/src/cpu_fft64_ref/scratch.rs](https://github.com/phantomzone-org/poulpy/blob/main/poulpy-backend/src/cpu_fft64_ref/scratch.rs) reference implementation. @@ -39,111 +39,3 @@ pub unsafe trait ScratchAvailableImpl { pub unsafe trait TakeSliceImpl { fn take_slice_impl(scratch: &mut Scratch, len: usize) -> (&mut [T], &mut Scratch); } - -/// # THIS TRAIT IS AN OPEN EXTENSION POINT (unsafe) -/// * See the [poulpy-backend/src/cpu_fft64_ref/scratch.rs](https://github.com/phantomzone-org/poulpy/blob/main/poulpy-backend/src/cpu_fft64_ref/scratch.rs) reference implementation. -/// * See [crate::api::TakeScalarZnx] for corresponding public API. -/// # Safety [crate::doc::backend_safety] for safety contract. -pub unsafe trait TakeScalarZnxImpl { - fn take_scalar_znx_impl(scratch: &mut Scratch, n: usize, cols: usize) -> (ScalarZnx<&mut [u8]>, &mut Scratch); -} - -/// # THIS TRAIT IS AN OPEN EXTENSION POINT (unsafe) -/// * See the [poulpy-backend/src/cpu_fft64_ref/scratch.rs](https://github.com/phantomzone-org/poulpy/blob/main/poulpy-backend/src/cpu_fft64_ref/scratch.rs) reference implementation. -/// * See [crate::api::TakeSvpPPol] for corresponding public API. -/// # Safety [crate::doc::backend_safety] for safety contract. -pub unsafe trait TakeSvpPPolImpl { - fn take_svp_ppol_impl(scratch: &mut Scratch, n: usize, cols: usize) -> (SvpPPol<&mut [u8], B>, &mut Scratch); -} - -/// # THIS TRAIT IS AN OPEN EXTENSION POINT (unsafe) -/// * See the [poulpy-backend/src/cpu_fft64_ref/scratch.rs](https://github.com/phantomzone-org/poulpy/blob/main/poulpy-backend/src/cpu_fft64_ref/scratch.rs) reference implementation. -/// * See [crate::api::TakeVecZnx] for corresponding public API. -/// # Safety [crate::doc::backend_safety] for safety contract. -pub unsafe trait TakeVecZnxImpl { - fn take_vec_znx_impl(scratch: &mut Scratch, n: usize, cols: usize, size: usize) -> (VecZnx<&mut [u8]>, &mut Scratch); -} - -/// # THIS TRAIT IS AN OPEN EXTENSION POINT (unsafe) -/// * See the [poulpy-backend/src/cpu_fft64_ref/scratch.rs](https://github.com/phantomzone-org/poulpy/blob/main/poulpy-backend/src/cpu_fft64_ref/scratch.rs) reference implementation. -/// * See [crate::api::TakeVecZnxSlice] for corresponding public API. -/// # Safety [crate::doc::backend_safety] for safety contract. -pub unsafe trait TakeVecZnxSliceImpl { - fn take_vec_znx_slice_impl( - scratch: &mut Scratch, - len: usize, - n: usize, - cols: usize, - size: usize, - ) -> (Vec>, &mut Scratch); -} - -/// # THIS TRAIT IS AN OPEN EXTENSION POINT (unsafe) -/// * See the [poulpy-backend/src/cpu_fft64_ref/scratch.rs](https://github.com/phantomzone-org/poulpy/blob/main/poulpy-backend/src/cpu_fft64_ref/scratch.rs) reference implementation. -/// * See [crate::api::TakeVecZnxBig] for corresponding public API. -/// # Safety [crate::doc::backend_safety] for safety contract. -pub unsafe trait TakeVecZnxBigImpl { - fn take_vec_znx_big_impl( - scratch: &mut Scratch, - n: usize, - cols: usize, - size: usize, - ) -> (VecZnxBig<&mut [u8], B>, &mut Scratch); -} - -/// # THIS TRAIT IS AN OPEN EXTENSION POINT (unsafe) -/// * See the [poulpy-backend/src/cpu_fft64_ref/scratch.rs](https://github.com/phantomzone-org/poulpy/blob/main/poulpy-backend/src/cpu_fft64_ref/scratch.rs) reference implementation. -/// * See [crate::api::TakeVecZnxDft] for corresponding public API. -/// # Safety [crate::doc::backend_safety] for safety contract. -pub unsafe trait TakeVecZnxDftImpl { - fn take_vec_znx_dft_impl( - scratch: &mut Scratch, - n: usize, - cols: usize, - size: usize, - ) -> (VecZnxDft<&mut [u8], B>, &mut Scratch); -} - -/// # THIS TRAIT IS AN OPEN EXTENSION POINT (unsafe) -/// * See the [poulpy-backend/src/cpu_fft64_ref/scratch.rs](https://github.com/phantomzone-org/poulpy/blob/main/poulpy-backend/src/cpu_fft64_ref/scratch.rs) reference implementation. -/// * See [crate::api::TakeVecZnxDftSlice] for corresponding public API. -/// # Safety [crate::doc::backend_safety] for safety contract. -pub unsafe trait TakeVecZnxDftSliceImpl { - fn take_vec_znx_dft_slice_impl( - scratch: &mut Scratch, - len: usize, - n: usize, - cols: usize, - size: usize, - ) -> (Vec>, &mut Scratch); -} - -/// # THIS TRAIT IS AN OPEN EXTENSION POINT (unsafe) -/// * See the [poulpy-backend/src/cpu_fft64_ref/scratch.rs](https://github.com/phantomzone-org/poulpy/blob/main/poulpy-backend/src/cpu_fft64_ref/scratch.rs) reference implementation. -/// * See [crate::api::TakeVmpPMat] for corresponding public API. -/// # Safety [crate::doc::backend_safety] for safety contract. -pub unsafe trait TakeVmpPMatImpl { - fn take_vmp_pmat_impl( - scratch: &mut Scratch, - n: usize, - rows: usize, - cols_in: usize, - cols_out: usize, - size: usize, - ) -> (VmpPMat<&mut [u8], B>, &mut Scratch); -} - -/// # THIS TRAIT IS AN OPEN EXTENSION POINT (unsafe) -/// * See the [poulpy-backend/src/cpu_fft64_ref/scratch.rs](https://github.com/phantomzone-org/poulpy/blob/main/poulpy-backend/src/cpu_fft64_ref/scratch.rs) reference implementation. -/// * See [crate::api::TakeMatZnx] for corresponding public API. -/// # Safety [crate::doc::backend_safety] for safety contract. -pub unsafe trait TakeMatZnxImpl { - fn take_mat_znx_impl( - scratch: &mut Scratch, - n: usize, - rows: usize, - cols_in: usize, - cols_out: usize, - size: usize, - ) -> (MatZnx<&mut [u8]>, &mut Scratch); -} diff --git a/poulpy-schemes/benches/circuit_bootstrapping.rs b/poulpy-schemes/benches/circuit_bootstrapping.rs index cd86fa3..9005309 100644 --- a/poulpy-schemes/benches/circuit_bootstrapping.rs +++ b/poulpy-schemes/benches/circuit_bootstrapping.rs @@ -9,10 +9,10 @@ use poulpy_core::layouts::{ use poulpy_hal::{ api::{ ModuleNew, ScratchOwnedAlloc, ScratchOwnedBorrow, SvpApplyDftToDft, SvpApplyDftToDftInplace, SvpPPolAlloc, - SvpPPolAllocBytes, SvpPrepare, VecZnxAddInplace, VecZnxAddNormal, VecZnxAddScalarInplace, VecZnxAutomorphism, - VecZnxAutomorphismInplace, VecZnxBigAddInplace, VecZnxBigAddSmallInplace, VecZnxBigAlloc, VecZnxBigAllocBytes, - VecZnxBigAutomorphismInplace, VecZnxBigNormalize, VecZnxBigNormalizeTmpBytes, VecZnxBigSubSmallNegateInplace, VecZnxCopy, - VecZnxDftAddInplace, VecZnxDftAlloc, VecZnxDftAllocBytes, VecZnxDftApply, VecZnxDftCopy, VecZnxFillUniform, + SvpPPolBytesOf, SvpPrepare, VecZnxAddInplace, VecZnxAddNormal, VecZnxAddScalarInplace, VecZnxAutomorphism, + VecZnxAutomorphismInplace, VecZnxBigAddInplace, VecZnxBigAddSmallInplace, VecZnxBigAlloc, VecZnxBigAutomorphismInplace, + VecZnxBigBytesOf, VecZnxBigNormalize, VecZnxBigNormalizeTmpBytes, VecZnxBigSubSmallNegateInplace, VecZnxCopy, + VecZnxDftAddInplace, VecZnxDftAlloc, VecZnxDftApply, VecZnxDftBytesOf, VecZnxDftCopy, VecZnxFillUniform, VecZnxIdftApplyConsume, VecZnxIdftApplyTmpA, VecZnxNegateInplace, VecZnxNormalize, VecZnxNormalizeInplace, VecZnxNormalizeTmpBytes, VecZnxRotate, VecZnxRotateInplace, VecZnxRotateInplaceTmpBytes, VecZnxRshInplace, VecZnxSub, VecZnxSubInplace, VecZnxSwitchRing, VmpApplyDftToDft, VmpApplyDftToDftAdd, VmpApplyDftToDftTmpBytes, VmpPMatAlloc, @@ -42,7 +42,7 @@ where + VecZnxFillUniform + VecZnxAddNormal + VecZnxNormalizeInplace - + VecZnxDftAllocBytes + + VecZnxDftBytesOf + VecZnxBigNormalize + VecZnxDftApply + SvpApplyDftToDftInplace @@ -55,7 +55,7 @@ where + VecZnxAddScalarInplace + VecZnxAutomorphism + VecZnxSwitchRing - + VecZnxBigAllocBytes + + VecZnxBigBytesOf + VecZnxIdftApplyTmpA + SvpApplyDftToDft + VecZnxBigAddInplace @@ -70,7 +70,7 @@ where + VmpApplyDftToDftTmpBytes + VmpApplyDftToDft + VmpApplyDftToDftAdd - + SvpPPolAllocBytes + + SvpPPolBytesOf + VecZnxRotateInplace + VecZnxBigAutomorphismInplace + VecZnxRshInplace @@ -80,7 +80,7 @@ where + VecZnxAutomorphismInplace + VecZnxBigSubSmallNegateInplace + VecZnxRotateInplaceTmpBytes - + VecZnxBigAllocBytes + + VecZnxBigBytesOf + VecZnxDftAddInplace + VecZnxRotate + ZnFillUniform @@ -124,7 +124,7 @@ where + VecZnxFillUniform + VecZnxAddNormal + VecZnxNormalizeInplace - + VecZnxDftAllocBytes + + VecZnxDftBytesOf + VecZnxBigNormalize + VecZnxDftApply + SvpApplyDftToDftInplace @@ -137,7 +137,7 @@ where + VecZnxAddScalarInplace + VecZnxAutomorphism + VecZnxSwitchRing - + VecZnxBigAllocBytes + + VecZnxBigBytesOf + VecZnxIdftApplyTmpA + SvpApplyDftToDft + VecZnxBigAddInplace @@ -152,7 +152,7 @@ where + VmpApplyDftToDftTmpBytes + VmpApplyDftToDft + VmpApplyDftToDftAdd - + SvpPPolAllocBytes + + SvpPPolBytesOf + VecZnxRotateInplace + VecZnxBigAutomorphismInplace + VecZnxRshInplace @@ -162,7 +162,7 @@ where + VecZnxAutomorphismInplace + VecZnxBigSubSmallNegateInplace + VecZnxRotateInplaceTmpBytes - + VecZnxBigAllocBytes + + VecZnxBigBytesOf + VecZnxDftAddInplace + VecZnxRotate + ZnFillUniform diff --git a/poulpy-schemes/src/tfhe/bdd_arithmetic/ciphertexts/block.rs b/poulpy-schemes/src/tfhe/bdd_arithmetic/ciphertexts/block.rs index d579db2..70bd910 100644 --- a/poulpy-schemes/src/tfhe/bdd_arithmetic/ciphertexts/block.rs +++ b/poulpy-schemes/src/tfhe/bdd_arithmetic/ciphertexts/block.rs @@ -2,8 +2,8 @@ use std::marker::PhantomData; use poulpy_core::layouts::{Base2K, GLWE, GLWEInfos, GLWEPlaintextLayout, LWEInfos, Rank, TorusPrecision}; -use poulpy_core::{TakeGLWEPt, layouts::prepared::GLWESecretPrepared}; -use poulpy_hal::api::VecZnxBigAllocBytes; +use poulpy_core::{TakeGLWEPlaintext, layouts::prepared::GLWESecretPrepared}; +use poulpy_hal::api::VecZnxBigBytesOf; #[cfg(test)] use poulpy_hal::api::{ ScratchAvailable, TakeVecZnx, VecZnxAddInplace, VecZnxAddNormal, VecZnxFillUniform, VecZnxNormalize, VecZnxSub, @@ -12,8 +12,8 @@ use poulpy_hal::api::{ use poulpy_hal::source::Source; use poulpy_hal::{ api::{ - TakeVecZnxBig, TakeVecZnxDft, VecZnxBigAddInplace, VecZnxBigAddSmallInplace, VecZnxBigNormalize, VecZnxDftAllocBytes, - VecZnxDftApply, VecZnxIdftApplyConsume, VecZnxNormalizeTmpBytes, + TakeVecZnxBig, TakeVecZnxDft, VecZnxBigAddInplace, VecZnxBigAddSmallInplace, VecZnxBigNormalize, VecZnxDftApply, + VecZnxDftBytesOf, VecZnxIdftApplyConsume, VecZnxNormalizeTmpBytes, }, layouts::{Backend, Data, DataMut, DataRef, Module, Scratch}, }; @@ -83,7 +83,7 @@ impl FheUintBlocks { scratch: &mut Scratch, ) where S: DataRef, - Module: VecZnxDftAllocBytes + Module: VecZnxDftBytesOf + VecZnxBigNormalize + VecZnxDftApply + SvpApplyDftToDftInplace @@ -96,7 +96,7 @@ impl FheUintBlocks { + VecZnxAddNormal + VecZnxNormalize + VecZnxSub, - Scratch: TakeVecZnxDft + ScratchAvailable + TakeVecZnx + TakeGLWEPt, + Scratch: TakeVecZnxDft + ScratchAvailable + TakeVecZnx + TakeGLWEPlaintext, { use poulpy_core::layouts::GLWEPlaintextLayout; @@ -136,7 +136,7 @@ impl FheUintBlocks { + VecZnxBigAddInplace + VecZnxBigAddSmallInplace + VecZnxBigNormalize, - Scratch: TakeVecZnxDft + TakeVecZnxBig + TakeGLWEPt, + Scratch: TakeVecZnxDft + TakeVecZnxBig + TakeGLWEPlaintext, { #[cfg(debug_assertions)] { @@ -175,8 +175,8 @@ impl FheUintBlocks { scratch: &mut Scratch, ) -> Vec where - Module: VecZnxDftAllocBytes - + VecZnxBigAllocBytes + Module: VecZnxDftBytesOf + + VecZnxBigBytesOf + VecZnxDftApply + SvpApplyDftToDftInplace + VecZnxIdftApplyConsume @@ -186,7 +186,7 @@ impl FheUintBlocks { + VecZnxNormalizeTmpBytes + VecZnxSubInplace + VecZnxNormalizeInplace, - Scratch: TakeGLWEPt + TakeVecZnxDft + TakeVecZnxBig, + Scratch: TakeGLWEPlaintext + TakeVecZnxDft + TakeVecZnxBig, { #[cfg(debug_assertions)] { diff --git a/poulpy-schemes/src/tfhe/bdd_arithmetic/ciphertexts/block_prepared.rs b/poulpy-schemes/src/tfhe/bdd_arithmetic/ciphertexts/block_prepared.rs index 2571896..c0cd09f 100644 --- a/poulpy-schemes/src/tfhe/bdd_arithmetic/ciphertexts/block_prepared.rs +++ b/poulpy-schemes/src/tfhe/bdd_arithmetic/ciphertexts/block_prepared.rs @@ -14,8 +14,8 @@ use poulpy_hal::{ use poulpy_hal::{ api::{ ScratchAvailable, SvpApplyDftToDftInplace, TakeScalarZnx, TakeVecZnx, TakeVecZnxDft, VecZnxAddInplace, VecZnxAddNormal, - VecZnxAddScalarInplace, VecZnxBigAddInplace, VecZnxBigAddSmallInplace, VecZnxBigAlloc, VecZnxBigAllocBytes, - VecZnxBigNormalize, VecZnxBigNormalizeTmpBytes, VecZnxDftAlloc, VecZnxDftAllocBytes, VecZnxDftApply, VecZnxFillUniform, + VecZnxAddScalarInplace, VecZnxBigAddInplace, VecZnxBigAddSmallInplace, VecZnxBigAlloc, VecZnxBigBytesOf, + VecZnxBigNormalize, VecZnxBigNormalizeTmpBytes, VecZnxDftAlloc, VecZnxDftApply, VecZnxDftBytesOf, VecZnxFillUniform, VecZnxIdftApplyConsume, VecZnxIdftApplyTmpA, VecZnxNormalize, VecZnxNormalizeInplace, VecZnxNormalizeTmpBytes, VecZnxSub, VecZnxSubInplace, VmpPrepare, }, @@ -123,7 +123,7 @@ impl FheUintBlocksPrep: VecZnxAddScalarInplace - + VecZnxDftAllocBytes + + VecZnxDftBytesOf + VecZnxBigNormalize + VecZnxDftApply + SvpApplyDftToDftInplace @@ -190,8 +190,8 @@ impl FheUintBlocksPrepDebug { #[allow(dead_code)] pub(crate) fn noise(&self, module: &Module, sk: &GLWESecretPrepared, want: T) where - Module: VecZnxDftAllocBytes - + VecZnxBigAllocBytes + Module: VecZnxDftBytesOf + + VecZnxBigBytesOf + VecZnxDftApply + SvpApplyDftToDftInplace + VecZnxIdftApplyConsume diff --git a/poulpy-schemes/src/tfhe/bdd_arithmetic/ciphertexts/word.rs b/poulpy-schemes/src/tfhe/bdd_arithmetic/ciphertexts/word.rs index 5216611..a3a779a 100644 --- a/poulpy-schemes/src/tfhe/bdd_arithmetic/ciphertexts/word.rs +++ b/poulpy-schemes/src/tfhe/bdd_arithmetic/ciphertexts/word.rs @@ -1,6 +1,6 @@ use itertools::Itertools; use poulpy_core::{ - GLWEOperations, TakeGLWECtSlice, TakeGLWEPt, glwe_packing, + GLWEOperations, TakeGLWEPlaintext, TakeGLWESlice, glwe_packing, layouts::{ GLWE, GLWEInfos, GLWEPlaintextLayout, LWEInfos, TorusPrecision, prepared::{AutomorphismKeyPrepared, GLWESecretPrepared}, @@ -11,7 +11,7 @@ use poulpy_hal::{ ScratchAvailable, SvpApplyDftToDftInplace, TakeVecZnx, TakeVecZnxBig, TakeVecZnxDft, VecZnxAddInplace, VecZnxAddNormal, VecZnxAddScalarInplace, VecZnxAutomorphismInplace, VecZnxBigAddInplace, VecZnxBigAddSmallInplace, VecZnxBigAutomorphismInplace, VecZnxBigNormalize, VecZnxBigNormalizeTmpBytes, VecZnxBigSubSmallNegateInplace, VecZnxCopy, - VecZnxDftAllocBytes, VecZnxDftApply, VecZnxDftCopy, VecZnxFillUniform, VecZnxIdftApplyConsume, VecZnxIdftApplyTmpA, + VecZnxDftApply, VecZnxDftBytesOf, VecZnxDftCopy, VecZnxFillUniform, VecZnxIdftApplyConsume, VecZnxIdftApplyTmpA, VecZnxNegateInplace, VecZnxNormalize, VecZnxNormalizeInplace, VecZnxNormalizeTmpBytes, VecZnxRotate, VecZnxRotateInplace, VecZnxRshInplace, VecZnxSub, VecZnxSubInplace, VecZnxSwitchRing, VmpApplyDftToDft, VmpApplyDftToDftAdd, VmpApplyDftToDftTmpBytes, @@ -39,7 +39,7 @@ impl FheUintWord { Module: VecZnxSub + VecZnxCopy + VecZnxNegateInplace - + VecZnxDftAllocBytes + + VecZnxDftBytesOf + VecZnxAddInplace + VmpApplyDftToDftTmpBytes + VecZnxNormalizeTmpBytes @@ -62,7 +62,7 @@ impl FheUintWord { + VecZnxAutomorphismInplace + VecZnxBigSubSmallNegateInplace + VecZnxRotate, - Scratch: TakeVecZnxDft + ScratchAvailable + TakeVecZnx + TakeGLWECtSlice, + Scratch: TakeVecZnxDft + ScratchAvailable + TakeVecZnx + TakeGLWESlice, { // Repacks the GLWE ciphertexts bits let gap: usize = module.n() / T::WORD_SIZE; @@ -109,7 +109,7 @@ impl FheUintWord { scratch: &mut Scratch, ) where Module: VecZnxAddScalarInplace - + VecZnxDftAllocBytes + + VecZnxDftBytesOf + VecZnxBigNormalize + VecZnxDftApply + SvpApplyDftToDftInplace @@ -122,7 +122,7 @@ impl FheUintWord { + VecZnxAddNormal + VecZnxNormalize + VecZnxSub, - Scratch: TakeVecZnxDft + ScratchAvailable + TakeVecZnx + TakeGLWEPt, + Scratch: TakeVecZnxDft + ScratchAvailable + TakeVecZnx + TakeGLWEPlaintext, { #[cfg(debug_assertions)] { @@ -167,7 +167,7 @@ impl FheUintWord { + VecZnxBigAddInplace + VecZnxBigAddSmallInplace + VecZnxBigNormalize, - Scratch: TakeVecZnxDft + TakeVecZnxBig + TakeGLWEPt, + Scratch: TakeVecZnxDft + TakeVecZnxBig + TakeGLWEPlaintext, { #[cfg(debug_assertions)] { diff --git a/poulpy-schemes/src/tfhe/bdd_arithmetic/eval.rs b/poulpy-schemes/src/tfhe/bdd_arithmetic/eval.rs index 6eb72e7..7706237 100644 --- a/poulpy-schemes/src/tfhe/bdd_arithmetic/eval.rs +++ b/poulpy-schemes/src/tfhe/bdd_arithmetic/eval.rs @@ -1,6 +1,6 @@ use itertools::Itertools; use poulpy_core::{ - GLWEExternalProductInplace, GLWEOperations, TakeGLWECtSlice, + GLWEExternalProductInplace, GLWEOperations, TakeGLWESlice, layouts::{ GLWE, GLWEToMut, LWEInfos, prepared::{GGSWCiphertextPreparedToRef, GGSWPrepared}, @@ -49,7 +49,7 @@ impl Circuit where Self: GetBitCircuitInfo, Module: Cmux + VecZnxCopy, - Scratch: TakeGLWECtSlice, + Scratch: TakeGLWESlice, { fn execute( &self, diff --git a/poulpy-schemes/src/tfhe/bdd_arithmetic/key.rs b/poulpy-schemes/src/tfhe/bdd_arithmetic/key.rs index 260e8ba..fdcf5b3 100644 --- a/poulpy-schemes/src/tfhe/bdd_arithmetic/key.rs +++ b/poulpy-schemes/src/tfhe/bdd_arithmetic/key.rs @@ -9,7 +9,7 @@ use crate::tfhe::{ }, }; use poulpy_core::{ - TakeGGSW, TakeGLWECt, + TakeGGSW, TakeGLWE, layouts::{ GLWESecret, GLWEToLWEKeyLayout, GLWEToLWESwitchingKey, LWE, LWESecret, prepared::{GLWEToLWESwitchingKeyPrepared, Prepare, PrepareAlloc}, @@ -17,10 +17,10 @@ use poulpy_core::{ }; use poulpy_hal::{ api::{ - ScratchAvailable, SvpApplyDftToDft, SvpApplyDftToDftInplace, SvpPPolAlloc, SvpPPolAllocBytes, SvpPrepare, TakeScalarZnx, + ScratchAvailable, SvpApplyDftToDft, SvpApplyDftToDftInplace, SvpPPolAlloc, SvpPPolBytesOf, SvpPrepare, TakeScalarZnx, TakeSvpPPol, TakeVecZnx, TakeVecZnxBig, TakeVecZnxDft, VecZnxAddInplace, VecZnxAddNormal, VecZnxAddScalarInplace, VecZnxAutomorphism, VecZnxAutomorphismInplace, VecZnxBigAddSmallInplace, VecZnxBigNormalize, VecZnxBigNormalizeTmpBytes, - VecZnxDftAllocBytes, VecZnxDftApply, VecZnxFillUniform, VecZnxIdftApplyConsume, VecZnxIdftApplyTmpA, VecZnxNormalize, + VecZnxDftApply, VecZnxDftBytesOf, VecZnxFillUniform, VecZnxIdftApplyConsume, VecZnxIdftApplyTmpA, VecZnxNormalize, VecZnxNormalizeInplace, VecZnxNormalizeTmpBytes, VecZnxRotate, VecZnxSub, VecZnxSubInplace, VecZnxSwitchRing, VmpApplyDftToDft, VmpApplyDftToDftAdd, VmpApplyDftToDftTmpBytes, VmpPrepare, }, @@ -77,7 +77,7 @@ impl BDDKey, Vec, BRA> { Module: SvpApplyDftToDft + VecZnxIdftApplyTmpA + VecZnxAddScalarInplace - + VecZnxDftAllocBytes + + VecZnxDftBytesOf + VecZnxBigNormalize + VecZnxDftApply + SvpApplyDftToDftInplace @@ -92,7 +92,7 @@ impl BDDKey, Vec, BRA> { + VecZnxSub + SvpPrepare + VecZnxSwitchRing - + SvpPPolAllocBytes + + SvpPPolBytesOf + SvpPPolAlloc + VecZnxAutomorphism + VecZnxAutomorphismInplace, @@ -157,7 +157,7 @@ where BE: Backend, Module: VmpPrepare + VecZnxRotate - + VecZnxDftAllocBytes + + VecZnxDftBytesOf + VmpApplyDftToDftTmpBytes + VecZnxBigNormalizeTmpBytes + VmpApplyDftToDft @@ -168,7 +168,7 @@ where + VecZnxBigNormalize + VecZnxNormalize + VecZnxNormalizeTmpBytes, - Scratch: ScratchAvailable + TakeVecZnxDft + TakeGLWECt + TakeVecZnx + TakeGGSW, + Scratch: ScratchAvailable + TakeVecZnxDft + TakeGLWE + TakeVecZnx + TakeGGSW, CircuitBootstrappingKeyPrepared: CirtuitBootstrappingExecute, { fn prepare( @@ -206,7 +206,7 @@ where BE: Backend, Module: VmpPrepare + VecZnxRotate - + VecZnxDftAllocBytes + + VecZnxDftBytesOf + VmpApplyDftToDftTmpBytes + VecZnxBigNormalizeTmpBytes + VmpApplyDftToDft @@ -217,7 +217,7 @@ where + VecZnxBigNormalize + VecZnxNormalize + VecZnxNormalizeTmpBytes, - Scratch: ScratchAvailable + TakeVecZnxDft + TakeGLWECt + TakeVecZnx + TakeGGSW, + Scratch: ScratchAvailable + TakeVecZnxDft + TakeGLWE + TakeVecZnx + TakeGGSW, CircuitBootstrappingKeyPrepared: CirtuitBootstrappingExecute, { fn prepare( diff --git a/poulpy-schemes/src/tfhe/bdd_arithmetic/test.rs b/poulpy-schemes/src/tfhe/bdd_arithmetic/test.rs index 7b469c8..428ba95 100644 --- a/poulpy-schemes/src/tfhe/bdd_arithmetic/test.rs +++ b/poulpy-schemes/src/tfhe/bdd_arithmetic/test.rs @@ -2,7 +2,7 @@ use std::time::Instant; use poulpy_backend::FFT64Ref; use poulpy_core::{ - TakeGGSW, TakeGLWEPt, + TakeGGSW, TakeGLWEPlaintext, layouts::{ GGSWCiphertextLayout, GLWELayout, GLWESecret, LWEInfos, LWESecret, prepared::{GLWESecretPrepared, PrepareAlloc}, @@ -11,11 +11,11 @@ use poulpy_core::{ use poulpy_hal::{ api::{ ModuleNew, ScratchAvailable, ScratchOwnedAlloc, ScratchOwnedBorrow, SvpApplyDftToDft, SvpApplyDftToDftInplace, - SvpPPolAlloc, SvpPPolAllocBytes, SvpPrepare, TakeScalarZnx, TakeSlice, TakeVecZnx, TakeVecZnxBig, TakeVecZnxDft, + SvpPPolAlloc, SvpPPolBytesOf, SvpPrepare, TakeScalarZnx, TakeSlice, TakeVecZnx, TakeVecZnxBig, TakeVecZnxDft, VecZnxAddInplace, VecZnxAddNormal, VecZnxAddScalarInplace, VecZnxAutomorphism, VecZnxAutomorphismInplace, - VecZnxBigAddInplace, VecZnxBigAddSmallInplace, VecZnxBigAlloc, VecZnxBigAllocBytes, VecZnxBigAutomorphismInplace, + VecZnxBigAddInplace, VecZnxBigAddSmallInplace, VecZnxBigAlloc, VecZnxBigAutomorphismInplace, VecZnxBigBytesOf, VecZnxBigNormalize, VecZnxBigNormalizeTmpBytes, VecZnxBigSubSmallNegateInplace, VecZnxCopy, VecZnxDftAddInplace, - VecZnxDftAlloc, VecZnxDftAllocBytes, VecZnxDftApply, VecZnxDftCopy, VecZnxFillUniform, VecZnxIdftApplyConsume, + VecZnxDftAlloc, VecZnxDftApply, VecZnxDftBytesOf, VecZnxDftCopy, VecZnxFillUniform, VecZnxIdftApplyConsume, VecZnxIdftApplyTmpA, VecZnxNegateInplace, VecZnxNormalize, VecZnxNormalizeInplace, VecZnxNormalizeTmpBytes, VecZnxRotate, VecZnxRotateInplace, VecZnxRotateInplaceTmpBytes, VecZnxRshInplace, VecZnxSub, VecZnxSubInplace, VecZnxSwitchRing, VmpApplyDftToDft, VmpApplyDftToDftAdd, VmpApplyDftToDftTmpBytes, VmpPMatAlloc, VmpPrepare, ZnAddNormal, ZnFillUniform, @@ -51,7 +51,7 @@ where Module: ModuleNew + SvpPPolAlloc + SvpPrepare + VmpPMatAlloc, ScratchOwned: ScratchOwnedAlloc + ScratchOwnedBorrow, Module: VecZnxAddScalarInplace - + VecZnxDftAllocBytes + + VecZnxDftBytesOf + VecZnxBigNormalize + VecZnxDftApply + SvpApplyDftToDftInplace @@ -68,16 +68,16 @@ where Scratch: TakeVecZnxDft + ScratchAvailable + TakeVecZnx + TakeGGSW + TakeScalarZnx + TakeSlice, Module: VecZnxCopy + VecZnxNegateInplace + VmpApplyDftToDftTmpBytes + VmpApplyDftToDft + VmpApplyDftToDftAdd, Module: VecZnxBigAddInplace + VecZnxBigAddSmallInplace + VecZnxBigNormalize, - Scratch: TakeVecZnxDft + TakeVecZnxBig + TakeGLWEPt, + Scratch: TakeVecZnxDft + TakeVecZnxBig + TakeGLWEPlaintext, Module: VecZnxAutomorphism + VecZnxSwitchRing - + VecZnxBigAllocBytes + + VecZnxBigBytesOf + VecZnxIdftApplyTmpA + SvpApplyDftToDft + VecZnxBigAlloc + VecZnxDftAlloc + VecZnxBigNormalizeTmpBytes - + SvpPPolAllocBytes + + SvpPPolBytesOf + VecZnxRotateInplace + VecZnxBigAutomorphismInplace + VecZnxRshInplace @@ -85,7 +85,7 @@ where + VecZnxAutomorphismInplace + VecZnxBigSubSmallNegateInplace + VecZnxRotateInplaceTmpBytes - + VecZnxBigAllocBytes + + VecZnxBigBytesOf + VecZnxDftAddInplace + VecZnxRotate + ZnFillUniform diff --git a/poulpy-schemes/src/tfhe/blind_rotation/cggi_algo.rs b/poulpy-schemes/src/tfhe/blind_rotation/cggi_algo.rs index ca9415b..1c2ebff 100644 --- a/poulpy-schemes/src/tfhe/blind_rotation/cggi_algo.rs +++ b/poulpy-schemes/src/tfhe/blind_rotation/cggi_algo.rs @@ -1,9 +1,9 @@ use itertools::izip; use poulpy_hal::{ api::{ - ScratchAvailable, SvpApplyDftToDft, SvpPPolAllocBytes, TakeVecZnx, TakeVecZnxBig, TakeVecZnxDft, TakeVecZnxDftSlice, - TakeVecZnxSlice, VecZnxAddInplace, VecZnxBigAddSmallInplace, VecZnxBigAllocBytes, VecZnxBigNormalize, - VecZnxBigNormalizeTmpBytes, VecZnxCopy, VecZnxDftAdd, VecZnxDftAddInplace, VecZnxDftAllocBytes, VecZnxDftApply, + ScratchAvailable, SvpApplyDftToDft, SvpPPolBytesOf, TakeVecZnx, TakeVecZnxBig, TakeVecZnxDft, TakeVecZnxDftSlice, + TakeVecZnxSlice, VecZnxAddInplace, VecZnxBigAddSmallInplace, VecZnxBigBytesOf, VecZnxBigNormalize, + VecZnxBigNormalizeTmpBytes, VecZnxCopy, VecZnxDftAdd, VecZnxDftAddInplace, VecZnxDftApply, VecZnxDftBytesOf, VecZnxDftSubInplace, VecZnxDftZero, VecZnxIdftApply, VecZnxIdftApplyConsume, VecZnxIdftApplyTmpBytes, VecZnxMulXpMinusOneInplace, VecZnxNormalize, VecZnxNormalizeInplace, VecZnxNormalizeTmpBytes, VecZnxRotate, VecZnxSubInplace, VmpApplyDftToDft, VmpApplyDftToDftAdd, VmpApplyDftToDftTmpBytes, @@ -12,7 +12,7 @@ use poulpy_hal::{ }; use poulpy_core::{ - Distribution, GLWEOperations, TakeGLWECt, + Distribution, GLWEOperations, TakeGLWE, layouts::{GGSWInfos, GLWE, GLWEInfos, GLWEToMut, LWE, LWECiphertextToRef, LWEInfos}, }; @@ -31,10 +31,10 @@ pub fn cggi_blind_rotate_scratch_space( where OUT: GLWEInfos, GGSW: GGSWInfos, - Module: VecZnxDftAllocBytes + Module: VecZnxDftBytesOf + VmpApplyDftToDftTmpBytes + VecZnxNormalizeTmpBytes - + VecZnxBigAllocBytes + + VecZnxBigBytesOf + VecZnxIdftApplyTmpBytes + VecZnxBigNormalizeTmpBytes, { @@ -43,10 +43,10 @@ where if block_size > 1 { let cols: usize = (brk_infos.rank() + 1).into(); let dnum: usize = brk_infos.dnum().into(); - let acc_dft: usize = module.vec_znx_dft_bytes_of(cols, dnum) * extension_factor; - let acc_big: usize = module.vec_znx_big_bytes_of(1, brk_size); - let vmp_res: usize = module.vec_znx_dft_bytes_of(cols, brk_size) * extension_factor; - let vmp_xai: usize = module.vec_znx_dft_bytes_of(1, brk_size); + let acc_dft: usize = module.bytes_of_vec_znx_dft(cols, dnum) * extension_factor; + let acc_big: usize = module.bytes_of_vec_znx_big(1, brk_size); + let vmp_res: usize = module.bytes_of_vec_znx_dft(cols, brk_size) * extension_factor; + let vmp_xai: usize = module.bytes_of_vec_znx_dft(1, brk_size); let acc_dft_add: usize = vmp_res; let vmp: usize = module.vmp_apply_dft_to_dft_tmp_bytes(brk_size, dnum, dnum, 2, 2, brk_size); // GGSW product: (1 x 2) x (2 x 2) let acc: usize = if extension_factor > 1 { @@ -67,9 +67,9 @@ where impl BlincRotationExecute for BlindRotationKeyPrepared where - Module: VecZnxBigAllocBytes - + VecZnxDftAllocBytes - + SvpPPolAllocBytes + Module: VecZnxBigBytesOf + + VecZnxDftBytesOf + + SvpPPolBytesOf + VmpApplyDftToDftTmpBytes + VecZnxBigNormalizeTmpBytes + VecZnxIdftApplyTmpBytes @@ -129,9 +129,9 @@ fn execute_block_binary_extended( DataRes: DataMut, DataIn: DataRef, DataBrk: DataRef, - Module: VecZnxBigAllocBytes - + VecZnxDftAllocBytes - + SvpPPolAllocBytes + Module: VecZnxBigBytesOf + + VecZnxDftBytesOf + + SvpPPolBytesOf + VmpApplyDftToDftTmpBytes + VecZnxBigNormalizeTmpBytes + VecZnxIdftApplyTmpBytes @@ -296,9 +296,9 @@ fn execute_block_binary( DataRes: DataMut, DataIn: DataRef, DataBrk: DataRef, - Module: VecZnxBigAllocBytes - + VecZnxDftAllocBytes - + SvpPPolAllocBytes + Module: VecZnxBigBytesOf + + VecZnxDftBytesOf + + SvpPPolBytesOf + VmpApplyDftToDftTmpBytes + VecZnxBigNormalizeTmpBytes + VecZnxIdftApplyTmpBytes @@ -418,9 +418,9 @@ fn execute_standard( DataRes: DataMut, DataIn: DataRef, DataBrk: DataRef, - Module: VecZnxBigAllocBytes - + VecZnxDftAllocBytes - + SvpPPolAllocBytes + Module: VecZnxBigBytesOf + + VecZnxDftBytesOf + + SvpPPolBytesOf + VmpApplyDftToDftTmpBytes + VecZnxBigNormalizeTmpBytes + VecZnxIdftApplyTmpBytes diff --git a/poulpy-schemes/src/tfhe/blind_rotation/cggi_key.rs b/poulpy-schemes/src/tfhe/blind_rotation/cggi_key.rs index f0a0962..26c9721 100644 --- a/poulpy-schemes/src/tfhe/blind_rotation/cggi_key.rs +++ b/poulpy-schemes/src/tfhe/blind_rotation/cggi_key.rs @@ -1,9 +1,8 @@ use poulpy_hal::{ api::{ ScratchAvailable, SvpApplyDftToDftInplace, TakeVecZnx, TakeVecZnxDft, VecZnxAddInplace, VecZnxAddNormal, - VecZnxAddScalarInplace, VecZnxBigNormalize, VecZnxDftAllocBytes, VecZnxDftApply, VecZnxFillUniform, - VecZnxIdftApplyConsume, VecZnxNormalize, VecZnxNormalizeInplace, VecZnxNormalizeTmpBytes, VecZnxSub, VecZnxSubInplace, - VmpPMatAlloc, VmpPrepare, + VecZnxAddScalarInplace, VecZnxBigNormalize, VecZnxDftApply, VecZnxDftBytesOf, VecZnxFillUniform, VecZnxIdftApplyConsume, + VecZnxNormalize, VecZnxNormalizeInplace, VecZnxNormalizeTmpBytes, VecZnxSub, VecZnxSubInplace, VmpPMatAlloc, VmpPrepare, }, layouts::{Backend, DataMut, DataRef, Module, ScalarZnx, ScalarZnxToRef, Scratch, ZnxView, ZnxViewMut}, source::Source, @@ -47,7 +46,7 @@ impl BlindRotationKey, CGGI> { pub fn generate_from_sk_scratch_space(module: &Module, infos: &A) -> usize where A: GGSWInfos, - Module: VecZnxNormalizeTmpBytes + VecZnxDftAllocBytes, + Module: VecZnxNormalizeTmpBytes + VecZnxDftBytesOf, { GGSW::encrypt_sk_scratch_space(module, infos) } @@ -56,7 +55,7 @@ impl BlindRotationKey, CGGI> { impl BlindRotationKeyEncryptSk for BlindRotationKey where Module: VecZnxAddScalarInplace - + VecZnxDftAllocBytes + + VecZnxDftBytesOf + VecZnxBigNormalize + VecZnxDftApply + SvpApplyDftToDftInplace @@ -149,7 +148,7 @@ impl BlindRotationKeyCompressed, CGGI> { pub fn generate_from_sk_scratch_space(module: &Module, infos: &A) -> usize where A: GGSWInfos, - Module: VecZnxNormalizeTmpBytes + VecZnxDftAllocBytes, + Module: VecZnxNormalizeTmpBytes + VecZnxDftBytesOf, { GGSWCompressed::encrypt_sk_scratch_space(module, infos) } @@ -169,7 +168,7 @@ impl BlindRotationKeyCompressed { DataSkGLWE: DataRef, DataSkLWE: DataRef, Module: VecZnxAddScalarInplace - + VecZnxDftAllocBytes + + VecZnxDftBytesOf + VecZnxBigNormalize + VecZnxDftApply + SvpApplyDftToDftInplace diff --git a/poulpy-schemes/src/tfhe/blind_rotation/tests/generic_blind_rotation.rs b/poulpy-schemes/src/tfhe/blind_rotation/tests/generic_blind_rotation.rs index b09f975..9148df3 100644 --- a/poulpy-schemes/src/tfhe/blind_rotation/tests/generic_blind_rotation.rs +++ b/poulpy-schemes/src/tfhe/blind_rotation/tests/generic_blind_rotation.rs @@ -1,9 +1,9 @@ use poulpy_hal::{ api::{ - ScratchOwnedAlloc, ScratchOwnedBorrow, SvpApplyDftToDft, SvpApplyDftToDftInplace, SvpPPolAlloc, SvpPPolAllocBytes, + ScratchOwnedAlloc, ScratchOwnedBorrow, SvpApplyDftToDft, SvpApplyDftToDftInplace, SvpPPolAlloc, SvpPPolBytesOf, SvpPrepare, VecZnxAddInplace, VecZnxAddNormal, VecZnxAddScalarInplace, VecZnxBigAddInplace, VecZnxBigAddSmallInplace, - VecZnxBigAllocBytes, VecZnxBigNormalize, VecZnxBigNormalizeTmpBytes, VecZnxCopy, VecZnxDftAdd, VecZnxDftAddInplace, - VecZnxDftAllocBytes, VecZnxDftApply, VecZnxDftSubInplace, VecZnxDftZero, VecZnxFillUniform, VecZnxIdftApply, + VecZnxBigBytesOf, VecZnxBigNormalize, VecZnxBigNormalizeTmpBytes, VecZnxCopy, VecZnxDftAdd, VecZnxDftAddInplace, + VecZnxDftApply, VecZnxDftBytesOf, VecZnxDftSubInplace, VecZnxDftZero, VecZnxFillUniform, VecZnxIdftApply, VecZnxIdftApplyConsume, VecZnxIdftApplyTmpBytes, VecZnxMulXpMinusOneInplace, VecZnxNormalize, VecZnxNormalizeInplace, VecZnxNormalizeTmpBytes, VecZnxRotate, VecZnxRotateInplace, VecZnxRotateInplaceTmpBytes, VecZnxSub, VecZnxSubInplace, VecZnxSwitchRing, VmpApplyDftToDft, VmpApplyDftToDftAdd, VmpApplyDftToDftTmpBytes, VmpPMatAlloc, VmpPrepare, ZnAddNormal, @@ -29,9 +29,9 @@ use poulpy_core::layouts::{ pub fn test_blind_rotation(module: &Module, n_lwe: usize, block_size: usize, extension_factor: usize) where - Module: VecZnxBigAllocBytes - + VecZnxDftAllocBytes - + SvpPPolAllocBytes + Module: VecZnxBigBytesOf + + VecZnxDftBytesOf + + SvpPPolBytesOf + VmpApplyDftToDftTmpBytes + VecZnxBigNormalizeTmpBytes + VecZnxIdftApplyTmpBytes diff --git a/poulpy-schemes/src/tfhe/circuit_bootstrapping/circuit.rs b/poulpy-schemes/src/tfhe/circuit_bootstrapping/circuit.rs index 9e419fe..0704dff 100644 --- a/poulpy-schemes/src/tfhe/circuit_bootstrapping/circuit.rs +++ b/poulpy-schemes/src/tfhe/circuit_bootstrapping/circuit.rs @@ -3,9 +3,9 @@ use std::collections::HashMap; use poulpy_hal::{ api::{ ScratchAvailable, TakeMatZnx, TakeSlice, TakeVecZnx, TakeVecZnxBig, TakeVecZnxDft, TakeVecZnxDftSlice, TakeVecZnxSlice, - VecZnxAddInplace, VecZnxAutomorphismInplace, VecZnxBigAddSmallInplace, VecZnxBigAllocBytes, VecZnxBigAutomorphismInplace, + VecZnxAddInplace, VecZnxAutomorphismInplace, VecZnxBigAddSmallInplace, VecZnxBigAutomorphismInplace, VecZnxBigBytesOf, VecZnxBigNormalize, VecZnxBigNormalizeTmpBytes, VecZnxBigSubSmallNegateInplace, VecZnxCopy, VecZnxDftAddInplace, - VecZnxDftAllocBytes, VecZnxDftApply, VecZnxDftCopy, VecZnxIdftApplyConsume, VecZnxIdftApplyTmpA, VecZnxNegateInplace, + VecZnxDftApply, VecZnxDftBytesOf, VecZnxDftCopy, VecZnxIdftApplyConsume, VecZnxIdftApplyTmpA, VecZnxNegateInplace, VecZnxNormalize, VecZnxNormalizeInplace, VecZnxNormalizeTmpBytes, VecZnxRotate, VecZnxRotateInplace, VecZnxRotateInplaceTmpBytes, VecZnxRshInplace, VecZnxSub, VecZnxSubInplace, VecZnxSwitchRing, VmpApplyDftToDft, VmpApplyDftToDftAdd, VmpApplyDftToDftTmpBytes, @@ -15,7 +15,7 @@ use poulpy_hal::{ }; use poulpy_core::{ - GLWEOperations, TakeGGLWE, TakeGLWECt, + GLWEOperations, TakeGGLWE, TakeGLWE, layouts::{Dsize, GGLWECiphertextLayout, GGSWInfos, GLWEInfos, LWEInfos}, }; @@ -44,7 +44,7 @@ where + VecZnxNegateInplace + VecZnxCopy + VecZnxSubInplace - + VecZnxDftAllocBytes + + VecZnxDftBytesOf + VmpApplyDftToDftTmpBytes + VecZnxBigNormalizeTmpBytes + VmpApplyDftToDft @@ -56,7 +56,7 @@ where + VecZnxAutomorphismInplace + VecZnxBigSubSmallNegateInplace + VecZnxRotateInplaceTmpBytes - + VecZnxBigAllocBytes + + VecZnxBigBytesOf + VecZnxDftAddInplace + VecZnxRotate + VecZnxNormalize, @@ -145,7 +145,7 @@ pub fn circuit_bootstrap_core( + VecZnxNegateInplace + VecZnxCopy + VecZnxSubInplace - + VecZnxDftAllocBytes + + VecZnxDftBytesOf + VmpApplyDftToDftTmpBytes + VecZnxBigNormalizeTmpBytes + VmpApplyDftToDft @@ -156,7 +156,7 @@ pub fn circuit_bootstrap_core( + VecZnxBigNormalize + VecZnxAutomorphismInplace + VecZnxBigSubSmallNegateInplace - + VecZnxBigAllocBytes + + VecZnxBigBytesOf + VecZnxDftAddInplace + VecZnxRotateInplaceTmpBytes + VecZnxRotate @@ -286,7 +286,7 @@ fn post_process( + VecZnxNegateInplace + VecZnxCopy + VecZnxSubInplace - + VecZnxDftAllocBytes + + VecZnxDftBytesOf + VmpApplyDftToDftTmpBytes + VecZnxBigNormalizeTmpBytes + VmpApplyDftToDft diff --git a/poulpy-schemes/src/tfhe/circuit_bootstrapping/key.rs b/poulpy-schemes/src/tfhe/circuit_bootstrapping/key.rs index 0f1e468..1e52a76 100644 --- a/poulpy-schemes/src/tfhe/circuit_bootstrapping/key.rs +++ b/poulpy-schemes/src/tfhe/circuit_bootstrapping/key.rs @@ -7,9 +7,9 @@ use std::collections::HashMap; use poulpy_hal::{ api::{ - ScratchAvailable, SvpApplyDftToDft, SvpApplyDftToDftInplace, SvpPPolAlloc, SvpPPolAllocBytes, SvpPrepare, TakeScalarZnx, + ScratchAvailable, SvpApplyDftToDft, SvpApplyDftToDftInplace, SvpPPolAlloc, SvpPPolBytesOf, SvpPrepare, TakeScalarZnx, TakeSvpPPol, TakeVecZnx, TakeVecZnxBig, TakeVecZnxDft, VecZnxAddInplace, VecZnxAddNormal, VecZnxAddScalarInplace, - VecZnxAutomorphism, VecZnxBigNormalize, VecZnxDftAllocBytes, VecZnxDftApply, VecZnxFillUniform, VecZnxIdftApplyConsume, + VecZnxAutomorphism, VecZnxBigNormalize, VecZnxDftApply, VecZnxDftBytesOf, VecZnxFillUniform, VecZnxIdftApplyConsume, VecZnxIdftApplyTmpA, VecZnxNormalize, VecZnxNormalizeInplace, VecZnxNormalizeTmpBytes, VecZnxSub, VecZnxSubInplace, VecZnxSwitchRing, VmpPMatAlloc, VmpPrepare, }, @@ -78,7 +78,7 @@ where Module: SvpApplyDftToDft + VecZnxIdftApplyTmpA + VecZnxAddScalarInplace - + VecZnxDftAllocBytes + + VecZnxDftBytesOf + VecZnxBigNormalize + VecZnxDftApply + SvpApplyDftToDftInplace @@ -93,7 +93,7 @@ where + VecZnxSub + SvpPrepare + VecZnxSwitchRing - + SvpPPolAllocBytes + + SvpPPolBytesOf + SvpPPolAlloc + VecZnxAutomorphism, Scratch: TakeVecZnxDft + ScratchAvailable + TakeVecZnx + TakeScalarZnx + TakeSvpPPol + TakeVecZnxBig, diff --git a/poulpy-schemes/src/tfhe/circuit_bootstrapping/tests/circuit_bootstrapping.rs b/poulpy-schemes/src/tfhe/circuit_bootstrapping/tests/circuit_bootstrapping.rs index d94ac0c..c68e907 100644 --- a/poulpy-schemes/src/tfhe/circuit_bootstrapping/tests/circuit_bootstrapping.rs +++ b/poulpy-schemes/src/tfhe/circuit_bootstrapping/tests/circuit_bootstrapping.rs @@ -2,11 +2,11 @@ use std::time::Instant; use poulpy_hal::{ api::{ - ScratchOwnedAlloc, ScratchOwnedBorrow, SvpApplyDftToDft, SvpApplyDftToDftInplace, SvpPPolAlloc, SvpPPolAllocBytes, + ScratchOwnedAlloc, ScratchOwnedBorrow, SvpApplyDftToDft, SvpApplyDftToDftInplace, SvpPPolAlloc, SvpPPolBytesOf, SvpPrepare, VecZnxAddInplace, VecZnxAddNormal, VecZnxAddScalarInplace, VecZnxAutomorphism, VecZnxAutomorphismInplace, - VecZnxBigAddInplace, VecZnxBigAddSmallInplace, VecZnxBigAlloc, VecZnxBigAllocBytes, VecZnxBigAutomorphismInplace, + VecZnxBigAddInplace, VecZnxBigAddSmallInplace, VecZnxBigAlloc, VecZnxBigAutomorphismInplace, VecZnxBigBytesOf, VecZnxBigNormalize, VecZnxBigNormalizeTmpBytes, VecZnxBigSubSmallNegateInplace, VecZnxCopy, VecZnxDftAddInplace, - VecZnxDftAlloc, VecZnxDftAllocBytes, VecZnxDftApply, VecZnxDftCopy, VecZnxFillUniform, VecZnxIdftApplyConsume, + VecZnxDftAlloc, VecZnxDftApply, VecZnxDftBytesOf, VecZnxDftCopy, VecZnxFillUniform, VecZnxIdftApplyConsume, VecZnxIdftApplyTmpA, VecZnxNegateInplace, VecZnxNormalize, VecZnxNormalizeInplace, VecZnxNormalizeTmpBytes, VecZnxRotate, VecZnxRotateInplace, VecZnxRotateInplaceTmpBytes, VecZnxRshInplace, VecZnxSub, VecZnxSubInplace, VecZnxSwitchRing, VmpApplyDftToDft, VmpApplyDftToDftAdd, VmpApplyDftToDftTmpBytes, VmpPMatAlloc, VmpPrepare, ZnAddNormal, ZnFillUniform, @@ -45,7 +45,7 @@ where Module: VecZnxFillUniform + VecZnxAddNormal + VecZnxNormalizeInplace - + VecZnxDftAllocBytes + + VecZnxDftBytesOf + VecZnxBigNormalize + VecZnxDftApply + SvpApplyDftToDftInplace @@ -58,7 +58,7 @@ where + VecZnxAddScalarInplace + VecZnxAutomorphism + VecZnxSwitchRing - + VecZnxBigAllocBytes + + VecZnxBigBytesOf + VecZnxIdftApplyTmpA + SvpApplyDftToDft + VecZnxBigAddInplace @@ -73,7 +73,7 @@ where + VmpApplyDftToDftTmpBytes + VmpApplyDftToDft + VmpApplyDftToDftAdd - + SvpPPolAllocBytes + + SvpPPolBytesOf + VecZnxRotateInplace + VecZnxBigAutomorphismInplace + VecZnxRshInplace @@ -83,7 +83,7 @@ where + VecZnxAutomorphismInplace + VecZnxBigSubSmallNegateInplace + VecZnxRotateInplaceTmpBytes - + VecZnxBigAllocBytes + + VecZnxBigBytesOf + VecZnxDftAddInplace + VecZnxRotate + ZnFillUniform @@ -267,7 +267,7 @@ where Module: VecZnxFillUniform + VecZnxAddNormal + VecZnxNormalizeInplace - + VecZnxDftAllocBytes + + VecZnxDftBytesOf + VecZnxBigNormalize + VecZnxDftApply + SvpApplyDftToDftInplace @@ -280,7 +280,7 @@ where + VecZnxAddScalarInplace + VecZnxAutomorphism + VecZnxSwitchRing - + VecZnxBigAllocBytes + + VecZnxBigBytesOf + VecZnxIdftApplyTmpA + SvpApplyDftToDft + VecZnxBigAddInplace @@ -295,7 +295,7 @@ where + VmpApplyDftToDftTmpBytes + VmpApplyDftToDft + VmpApplyDftToDftAdd - + SvpPPolAllocBytes + + SvpPPolBytesOf + VecZnxRotateInplace + VecZnxBigAutomorphismInplace + VecZnxRotateInplaceTmpBytes @@ -305,7 +305,7 @@ where + VecZnxCopy + VecZnxAutomorphismInplace + VecZnxBigSubSmallNegateInplace - + VecZnxBigAllocBytes + + VecZnxBigBytesOf + VecZnxDftAddInplace + VecZnxRotate + ZnFillUniform