From 76123892a8591cd34dc588eb55af8a2574efa415 Mon Sep 17 00:00:00 2001 From: Nicolas Sarlin Date: Wed, 13 Aug 2025 11:09:10 +0200 Subject: [PATCH] fix(core): use of deprecated rayon repeatn --- Cargo.toml | 2 +- tfhe-csprng/src/generators/aes_ctr/parallel.rs | 2 +- .../commons/traits/contiguous_entity_container.rs | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index dbe8b4191..51fe8a14c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -23,7 +23,7 @@ itertools = "0.14" num-complex = "0.4" pulp = { version = ">=0.21, <0.21.5", default-features = false } rand = "0.8" -rayon = "1" +rayon = "1.11" serde = { version = "1.0", default-features = false } wasm-bindgen = "0.2.100" diff --git a/tfhe-csprng/src/generators/aes_ctr/parallel.rs b/tfhe-csprng/src/generators/aes_ctr/parallel.rs index 073f2747f..b66f9e918 100644 --- a/tfhe-csprng/src/generators/aes_ctr/parallel.rs +++ b/tfhe-csprng/src/generators/aes_ctr/parallel.rs @@ -43,7 +43,7 @@ impl AesCtrGenerator { let first_index = self.state.table_index().incremented(); let output = (0..n_children.0) .into_par_iter() - .zip(rayon::iter::repeatn( + .zip(rayon::iter::repeat_n( (self.block_cipher.clone(), first_index, n_bytes), n_children.0, )) diff --git a/tfhe/src/core_crypto/commons/traits/contiguous_entity_container.rs b/tfhe/src/core_crypto/commons/traits/contiguous_entity_container.rs index 89e83d9c3..21eddae73 100644 --- a/tfhe/src/core_crypto/commons/traits/contiguous_entity_container.rs +++ b/tfhe/src/core_crypto/commons/traits/contiguous_entity_container.rs @@ -257,7 +257,7 @@ pub trait ContiguousEntityContainer: AsRef<[Self::Element]> { let entity_view_pod_size = self.get_entity_view_pod_size(); self.as_ref() .par_chunks_exact(entity_view_pod_size) - .zip(rayon::iter::repeatn(meta, entity_count)) + .zip(rayon::iter::repeat_n(meta, entity_count)) .map(|(elt, meta)| Self::EntityView::<'this>::create_from(elt, meta)) } @@ -278,7 +278,7 @@ pub trait ContiguousEntityContainer: AsRef<[Self::Element]> { let meta = self.get_self_view_creation_metadata(); self.as_ref() .par_chunks(pod_chunk_size) - .zip(rayon::iter::repeatn(meta, entity_count)) + .zip(rayon::iter::repeat_n(meta, entity_count)) .map(|(elt, meta)| Self::SelfView::<'_>::create_from(elt, meta)) } @@ -304,7 +304,7 @@ pub trait ContiguousEntityContainer: AsRef<[Self::Element]> { let meta = self.get_self_view_creation_metadata(); self.as_ref() .par_chunks_exact(pod_chunk_size) - .zip(rayon::iter::repeatn(meta, entity_count)) + .zip(rayon::iter::repeat_n(meta, entity_count)) .map(|(elt, meta)| Self::SelfView::<'_>::create_from(elt, meta)) } } @@ -471,7 +471,7 @@ pub trait ContiguousEntityContainerMut: ContiguousEntityContainer + AsMut<[Self: let entity_view_pod_size = self.get_entity_view_pod_size(); self.as_mut() .par_chunks_exact_mut(entity_view_pod_size) - .zip(rayon::iter::repeatn(meta, entity_count)) + .zip(rayon::iter::repeat_n(meta, entity_count)) .map(|(elt, meta)| Self::EntityMutView::<'this>::create_from(elt, meta)) } @@ -492,7 +492,7 @@ pub trait ContiguousEntityContainerMut: ContiguousEntityContainer + AsMut<[Self: let meta = self.get_self_view_creation_metadata(); self.as_mut() .par_chunks_mut(pod_chunk_size) - .zip(rayon::iter::repeatn(meta, entity_count)) + .zip(rayon::iter::repeat_n(meta, entity_count)) .map(|(elt, meta)| Self::SelfMutView::<'_>::create_from(elt, meta)) } @@ -518,7 +518,7 @@ pub trait ContiguousEntityContainerMut: ContiguousEntityContainer + AsMut<[Self: let meta = self.get_self_view_creation_metadata(); self.as_mut() .par_chunks_exact_mut(pod_chunk_size) - .zip(rayon::iter::repeatn(meta, entity_count)) + .zip(rayon::iter::repeat_n(meta, entity_count)) .map(|(elt, meta)| Self::SelfMutView::<'_>::create_from(elt, meta)) } }