Move pulp to workspace and drop num-complex patch (#282)

Author: tlepoint

Cargo.lock

@@ -14,7 +14,7 @@ rust-version = "1.73"
 
 [workspace.dependencies]
 clap = { version = "^4.5.4", features = ["derive"] }
-concrete-ntt = "^0.1.2"
+tfhe-ntt = "^0.6.0"
 console = "^0.15.8"
 criterion = "^0.5.1"
 doc-comment = "^0.3.3"
@@ -28,12 +28,15 @@ ndarray = "^0.15.6"
 num-bigint = "^0.4.4"
 num-bigint-dig = "^0.8.4"
 num-traits = "^0.2.18"
+num-complex = { version = "^0.4.6", features = ["libm"] }
 proptest = "^1.4.0"
 prost = "^0.12.4"
 prost-build = "^0.12.3"
+pulp = "^0.21.5"
 rand = "^0.8.5"
 rand_chacha = "^0.3.1"
 sha2 = "^0.10.8"
 thiserror = "^1.0.58"
 zeroize = "^1.8.0"
 zeroize_derive = "^1.4.2"
+

Cargo.toml

@@ -13,14 +13,14 @@ rust-version.workspace = true
 bench = false  # Disable default bench (we use criterion)
 
 [features]
-concrete-ntt = []
-concrete-ntt-nightly = ["concrete-ntt/nightly"]
+tfhe-ntt = []
+tfhe-ntt-nightly = ["tfhe-ntt/nightly"]
 
 [dependencies]
 fhe-traits = { version = "^0.1.0-beta.8", path = "../fhe-traits" }
 fhe-util = { version = "^0.1.0-beta.8", path = "../fhe-util" }
 
-concrete-ntt.workspace = true
+tfhe-ntt.workspace = true
 derivative = "^2.2.0"
 ethnum.workspace = true
 fastdiv.workspace = true
@@ -30,13 +30,14 @@ num-bigint.workspace = true
 num-bigint-dig.workspace = true
 num-traits.workspace = true
 prost.workspace = true
-pulp = "^0.18.9"
+pulp.workspace = true
 rand.workspace = true
 rand_chacha.workspace = true
 thiserror.workspace = true
 zeroize.workspace = true
 zeroize_derive.workspace = true
 sha2.workspace = true
+num-complex.workspace = true
 
 [build-dependencies]
 prost-build.workspace = true

crates/fhe-math/Cargo.toml

@@ -4,13 +4,13 @@ use fhe_util::is_prime;
 
 mod native;
 
-#[cfg(any(feature = "concrete-ntt", feature = "concrete-ntt-nightly"))]
-mod concrete;
+#[cfg(any(feature = "tfhe-ntt", feature = "tfhe-ntt-nightly"))]
+mod tfhe;
 
-#[cfg(any(feature = "concrete-ntt", feature = "concrete-ntt-nightly"))]
-pub use concrete::NttOperator;
-#[cfg(not(any(feature = "concrete-ntt", feature = "concrete-ntt-nightly")))]
+#[cfg(not(any(feature = "tfhe-ntt", feature = "tfhe-ntt-nightly")))]
 pub use native::NttOperator;
+#[cfg(any(feature = "tfhe-ntt", feature = "tfhe-ntt-nightly"))]
+pub use tfhe::NttOperator;
 
 /// Returns whether a modulus p is prime and supports the Number Theoretic
 /// Transform of size n.