arnaucube/poulpy
1
0
Fork 0
mirror of https://github.com/arnaucube/poulpy.git synced 2026-02-10 05:06:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

refactoring

Browse Source
This commit is contained in:
Jean-Philippe Bossuat
2025-01-27 16:23:23 +01:00
parent c30f598776
commit 1ac719ce7e
21 changed files with 113 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@@ -1,3 +1,6 @@
[submodule "spqlios/spqlios-arithmetic"]
path = spqlios/spqlios-arithmetic
url = https://github.com/tfhe/spqlios-arithmetic
[submodule "base2k/spqlios-arithmetic"]
path = base2k/spqlios-arithmetic
url = https://github.com/tfhe/spqlios-arithmetic

63
Cargo.lock generated
View File

@@ -49,6 +49,20 @@ version = "1.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
[[package]]
name = "base2k"
version = "0.1.0"
dependencies = [
"bindgen",
"criterion",
"itertools 0.14.0",
"rand",
"rand_core",
"rand_distr",
"sampling",
"utils",
]
[[package]]
name = "bindgen"
version = "0.71.1"
@@ -362,24 +376,6 @@ version = "0.4.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
[[package]]
name = "math"
version = "0.1.0"
dependencies = [
"criterion",
"itertools 0.14.0",
"num",
"num-bigint",
"num-integer",
"num-traits",
"primality-test",
"prime_factorization",
"rand_distr",
"sampling",
"sprs",
"utils",
]
[[package]]
name = "matrixmultiply"
version = "0.3.9"
@@ -725,6 +721,24 @@ version = "0.8.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
[[package]]
name = "rns"
version = "0.1.0"
dependencies = [
"criterion",
"itertools 0.14.0",
"num",
"num-bigint",
"num-integer",
"num-traits",
"primality-test",
"prime_factorization",
"rand_distr",
"sampling",
"sprs",
"utils",
]
[[package]]
name = "rustc-hash"
version = "2.1.0"
@@ -798,19 +812,6 @@ version = "1.13.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
[[package]]
name = "spqlios"
version = "0.1.0"
dependencies = [
"bindgen",
"criterion",
"itertools 0.14.0",
"rand",
"rand_core",
"rand_distr",
"sampling",
]
[[package]]
name = "sprs"
version = "0.11.2"

9
Cargo.toml
View File

@@ -1,2 +1,11 @@
[workspace]
members = ["base2k", "rns", "sampling", "utils"]
[workspace.dependencies]
rand = "0.8.4"
rand_chacha = "0.3.1"
rand_core = "0.6.4"
rand_distr = "0.4.3"
itertools = "0.14.0"
criterion = "0.5.1"

13
base2k/Cargo.toml
View File

@@ -1,15 +1,16 @@
[package]
name = "spqlios"
name = "base2k"
version = "0.1.0"
edition = "2021"
[dependencies]
rand = "0.8.5"
rand_core = "0.6.4"
itertools = "0.14.0"
criterion = "0.5.1"
rand_distr = "0.4.3"
criterion = {workspace = true}
itertools = {workspace = true}
rand = {workspace = true}
rand_distr = {workspace = true}
rand_core = {workspace = true}
sampling = { path = "../sampling" }
utils = { path = "../utils" }
[build-dependencies]
bindgen ="0.71.1"

4
base2k/benches/fft.rs
View File

@@ -1,9 +1,9 @@
use criterion::{criterion_group, criterion_main, BenchmarkId, Criterion};
use spqlios::bindings::{
use base2k::bindings::{
new_reim_fft_precomp, new_reim_ifft_precomp, reim_fft, reim_fft_precomp,
reim_fft_precomp_get_buffer, reim_from_znx64_simple, reim_ifft, reim_ifft_precomp,
reim_ifft_precomp_get_buffer,
};
use criterion::{criterion_group, criterion_main, BenchmarkId, Criterion};
use std::ffi::c_void;
fn fft(c: &mut Criterion) {

11
base2k/build.rs
View File

@@ -7,9 +7,9 @@ use std::time::SystemTime;
fn main() {
// Path to the C header file
let header_paths = [
"lib/spqlios/coeffs/coeffs_arithmetic.h",
"lib/spqlios/arithmetic/vec_znx_arithmetic.h",
let header_paths: [&str; 2] = [
"spqlios-arithmetic/spqlios/coeffs/coeffs_arithmetic.h",
"spqlios-arithmetic/spqlios/arithmetic/vec_znx_arithmetic.h",
];
let out_path: PathBuf = PathBuf::from(env::var("OUT_DIR").unwrap());
@@ -46,7 +46,10 @@ fn main() {
println!(
"cargo:rustc-link-search=native={}",
absolute("./lib/build/spqlios").unwrap().to_str().unwrap()
absolute("./spqlios-arithmetic/build/spqlios")
.unwrap()
.to_str()
.unwrap()
);
println!("cargo:rustc-link-lib=static=spqlios"); //"cargo:rustc-link-lib=dylib=spqlios"
}

7
base2k/examples/fft.rs
View File

@@ -1,8 +1,11 @@
use base2k::bindings::{
new_reim_fft_precomp, new_reim_ifft_precomp, reim_fft, reim_fft_precomp_get_buffer,
reim_fftvec_mul_simple, reim_from_znx64_simple, reim_ifft, reim_ifft_precomp_get_buffer,
reim_to_znx64_simple,
};
use std::ffi::c_void;
use std::time::Instant;
use spqlios::bindings::*;
fn main() {
let log_bound: usize = 19;

12
base2k/examples/rlwe_encrypt.rs
View File

@@ -1,8 +1,8 @@
use base2k::module::{Module, FFT64};
use base2k::scalar::Scalar;
use base2k::vector::Vector;
use itertools::izip;
use sampling::source::Source;
use spqlios::module::{Module, FFT64};
use spqlios::scalar::Scalar;
use spqlios::vector::Vector;
fn main() {
let n: usize = 16;
@@ -23,7 +23,7 @@ fn main() {
s.fill_ternary_prob(0.5, &mut source);
// Buffer to store s in the DFT domain
let mut s_ppol: spqlios::module::SVPPOL = module.svp_new_ppol();
let mut s_ppol: base2k::module::SVPPOL = module.svp_new_ppol();
// s_ppol <- DFT(s)
module.svp_prepare(&mut s_ppol, &s);
@@ -33,13 +33,13 @@ fn main() {
a.fill_uniform(&mut source);
// Scratch space for DFT values
let mut buf_dft: spqlios::module::VECZNXDFT = module.new_vec_znx_dft(a.limbs());
let mut buf_dft: base2k::module::VECZNXDFT = module.new_vec_znx_dft(a.limbs());
// Applies buf_dft <- s * a
module.svp_apply_dft(&mut buf_dft, &s_ppol, &a);
// Alias scratch space
let mut buf_big: spqlios::module::VECZNXBIG = buf_dft.as_vec_znx_big();
let mut buf_big: base2k::module::VECZNXBIG = buf_dft.as_vec_znx_big();
// buf_big <- IDFT(buf_dft) (not normalized)
module.vec_znx_idft_tmp_a(&mut buf_big, &mut buf_dft, a.limbs());

6
base2k/src/lib.rs
View File

@@ -14,14 +14,20 @@ pub mod bindings {
}
pub mod vec_znx_arithmetic;
#[allow(unused_imports)]
pub use vec_znx_arithmetic::*;
pub mod vec_znx_big_arithmetic;
#[allow(unused_imports)]
pub use vec_znx_big_arithmetic::*;
pub mod vec_znx_dft;
#[allow(unused_imports)]
pub use vec_znx_dft::*;
pub mod scalar_vector_product;
#[allow(unused_imports)]
pub use scalar_vector_product::*;
#[allow(dead_code)]
fn cast_mut_u64_to_mut_u8_slice(data: &mut [u64]) -> &mut [u8] {
let ptr: *mut u8 = data.as_mut_ptr() as *mut u8;
let len: usize = data.len() * std::mem::size_of::<u64>();

2
base2k/src/scalar.rs
View File

@@ -1,6 +1,6 @@
use rand::distributions::{Distribution, WeightedIndex};
use rand::seq::SliceRandom;
use rand_core::RngCore;
use rand_distr::{Distribution, WeightedIndex};
use sampling::source::Source;
pub struct Scalar(pub Vec<i64>);

9
rns/Cargo.toml
View File

@@ -1,5 +1,5 @@
[package]
name = "math"
name = "rns"
version = "0.1.0"
edition = "2021"
@@ -10,11 +10,10 @@ num-bigint = "0.4.6"
num-traits = "0.2.19"
num-integer ="0.1.46"
prime_factorization = "1.0.5"
itertools = "0.14.0"
criterion = "0.5.1"
rand_distr = "0.4.3"
sprs = "0.11.2"
criterion = {workspace = true}
itertools = {workspace = true}
rand_distr = {workspace = true}
sampling = { path = "../sampling" }
utils = { path = "../utils" }

6
rns/benches/ntt.rs
View File

@@ -1,7 +1,7 @@
use criterion::{criterion_group, criterion_main, BenchmarkId, Criterion};
use math::modulus::WordOps;
use math::poly::Poly;
use math::ring::Ring;
use rns::modulus::WordOps;
use rns::poly::Poly;
use rns::ring::Ring;
fn ntt(c: &mut Criterion) {
fn runner<'a, const INPLACE: bool, const LAZY: bool>(

8
rns/benches/operations.rs
View File

@@ -1,8 +1,8 @@
use criterion::{criterion_group, criterion_main, BenchmarkId, Criterion};
use math::modulus::montgomery::Montgomery;
use math::modulus::{WordOps, ONCE};
use math::poly::Poly;
use math::ring::Ring;
use rns::modulus::montgomery::Montgomery;
use rns::modulus::{WordOps, ONCE};
use rns::poly::Poly;
use rns::ring::Ring;
fn a_add_b_into_b(c: &mut Criterion) {
fn runner(ring: Ring<u64>) -> Box<dyn FnMut()> {

6
rns/benches/ring_rns.rs
View File

@@ -1,11 +1,11 @@
use criterion::{criterion_group, criterion_main, Criterion};
use math::poly::PolyRNS;
use math::ring::RingRNS;
use rns::poly::PolyRNS;
use rns::ring::RingRNS;
fn div_floor_by_last_modulus_ntt_true(c: &mut Criterion) {
fn runner(r: RingRNS<u64>) -> Box<dyn FnMut()> {
let a: PolyRNS<u64> = r.new_polyrns();
let mut b: [math::poly::Poly<u64>; 2] = [r.new_poly(), r.new_poly()];
let mut b: [rns::poly::Poly<u64>; 2] = [r.new_poly(), r.new_poly()];
let mut c: PolyRNS<u64> = r.new_polyrns();
Box::new(move || r.div_by_last_modulus::<false, true>(&a, &mut b, &mut c))

4
rns/benches/sampling.rs
View File

@@ -1,6 +1,6 @@
use criterion::{criterion_group, criterion_main, Criterion};
use math::poly::PolyRNS;
use math::ring::RingRNS;
use rns::poly::PolyRNS;
use rns::ring::RingRNS;
use sampling::source::Source;
fn fill_uniform(c: &mut Criterion) {

10
rns/examples/main.rs
View File

@@ -1,6 +1,6 @@
use math::dft::ntt::Table;
use math::modulus::prime::Prime;
use math::ring::Ring;
use rns::dft::ntt::Table;
use rns::modulus::prime::Prime;
use rns::ring::Ring;
fn main() {
// Example usage of `Prime<u64>`
@@ -37,8 +37,8 @@ fn main() {
let r: Ring<u64> = Ring::<u64>::new(n as usize, q_base, q_power);
let mut p0: math::poly::Poly<u64> = r.new_poly();
let mut p1: math::poly::Poly<u64> = r.new_poly();
let mut p0: rns::poly::Poly<u64> = r.new_poly();
let mut p1: rns::poly::Poly<u64> = r.new_poly();
for i in 0..p0.n() {
p0.0[i] = i as u64

6
rns/tests/automorphism.rs
View File

@@ -1,7 +1,7 @@
use itertools::izip;
use math::automorphism::AutoPerm;
use math::poly::Poly;
use math::ring::Ring;
use rns::automorphism::AutoPerm;
use rns::poly::Poly;
use rns::ring::Ring;
#[test]
fn automorphism_u64() {

6
rns/tests/digit_decomposition.rs
View File

@@ -1,7 +1,7 @@
use itertools::izip;
use math::modulus::{WordOps, ONCE};
use math::poly::Poly;
use math::ring::Ring;
use rns::modulus::{WordOps, ONCE};
use rns::poly::Poly;
use rns::ring::Ring;
use sampling::source::Source;
#[test]

6
rns/tests/rescaling_rns.rs
View File

@@ -1,8 +1,8 @@
use itertools::izip;
use math::num_bigint::Div;
use math::poly::{Poly, PolyRNS};
use math::ring::RingRNS;
use num_bigint::BigInt;
use rns::num_bigint::Div;
use rns::poly::{Poly, PolyRNS};
use rns::ring::RingRNS;
use sampling::source::Source;
#[test]

4
rns/tests/ring_switch.rs
View File

@@ -1,5 +1,5 @@
use math::poly::Poly;
use math::ring::Ring;
use rns::poly::Poly;
use rns::ring::Ring;
#[test]
fn ring_switch_u64() {

4
sampling/Cargo.toml
View File

@@ -4,5 +4,5 @@ version = "0.1.0"
edition = "2021"
[dependencies]
rand_chacha = "0.3.1"
rand_core = "0.6.4"
rand_chacha = { workspace = true }
rand_core = { workspace = true }