diff --git a/frontends/concrete-python/tests/tfhers-utils/Cargo.lock b/frontends/concrete-python/tests/tfhers-utils/Cargo.lock index f20387324..d1f9c44a3 100644 --- a/frontends/concrete-python/tests/tfhers-utils/Cargo.lock +++ b/frontends/concrete-python/tests/tfhers-utils/Cargo.lock @@ -172,7 +172,8 @@ checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0" [[package]] name = "concrete-csprng" version = "0.4.1" -source = "git+https://github.com/zama-ai/tfhe-rs.git?rev=cfb9532f6336c7e8fec754d2dbe2e1195b9c0de7#cfb9532f6336c7e8fec754d2dbe2e1195b9c0de7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90518357249582c16a6b64d7410243dfb3109d5bf0ad1665c058c9a59f2fc4cc" dependencies = [ "aes", "libc", @@ -507,8 +508,9 @@ dependencies = [ [[package]] name = "tfhe" -version = "0.8.0-alpha.3" -source = "git+https://github.com/zama-ai/tfhe-rs.git?rev=cfb9532f6336c7e8fec754d2dbe2e1195b9c0de7#cfb9532f6336c7e8fec754d2dbe2e1195b9c0de7" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81923c2433f461e35f3d0b933696335e4f03b874438c844c576eab99e302fe00" dependencies = [ "aligned-vec", "bincode", @@ -529,8 +531,9 @@ dependencies = [ [[package]] name = "tfhe-versionable" -version = "0.2.1" -source = "git+https://github.com/zama-ai/tfhe-rs.git?rev=cfb9532f6336c7e8fec754d2dbe2e1195b9c0de7#cfb9532f6336c7e8fec754d2dbe2e1195b9c0de7" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d09ede610a0eac494ab832533415d4cb4f103b716901a11da84ccfeb287d08bf" dependencies = [ "aligned-vec", "num-complex", @@ -540,8 +543,9 @@ dependencies = [ [[package]] name = "tfhe-versionable-derive" -version = "0.2.1" -source = "git+https://github.com/zama-ai/tfhe-rs.git?rev=cfb9532f6336c7e8fec754d2dbe2e1195b9c0de7#cfb9532f6336c7e8fec754d2dbe2e1195b9c0de7" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d92c0fe0b3e42c45ac7ef98092e60c09db69aeaeb821429a1754aef28ea575c" dependencies = [ "proc-macro2", "quote", diff --git a/frontends/concrete-python/tests/tfhers-utils/Cargo.toml b/frontends/concrete-python/tests/tfhers-utils/Cargo.toml index 75e4b217e..df1c5ffd8 100644 --- a/frontends/concrete-python/tests/tfhers-utils/Cargo.toml +++ b/frontends/concrete-python/tests/tfhers-utils/Cargo.toml @@ -8,13 +8,13 @@ edition = "2021" bincode = "1.3.3" clap = { version = "4.5.16", features = ["derive"] } -tfhe = { git = "https://github.com/zama-ai/tfhe-rs.git", rev = "cfb9532f6336c7e8fec754d2dbe2e1195b9c0de7", features = ["integer"] } +tfhe = { version = "0.8.0", features = ["integer"] } [target.x86_64-unknown-linux-gnu.dependencies] -tfhe = { git = "https://github.com/zama-ai/tfhe-rs.git", rev = "cfb9532f6336c7e8fec754d2dbe2e1195b9c0de7", features = ["integer", "x86_64-unix"] } +tfhe = { version = "0.8.0", features = ["integer", "x86_64-unix"] } [target.aarch64-unknown-linux-gnu.dependencies] -tfhe = { git = "https://github.com/zama-ai/tfhe-rs.git", rev = "cfb9532f6336c7e8fec754d2dbe2e1195b9c0de7", features = ["integer", "aarch64-unix"] } +tfhe = { version = "0.8.0", features = ["integer", "aarch64-unix"] } [target.x86_64-pc-windows-gnu.dependencies] -tfhe = { git = "https://github.com/zama-ai/tfhe-rs.git", rev = "cfb9532f6336c7e8fec754d2dbe2e1195b9c0de7", features = ["integer", "x86_64"] } +tfhe = { version = "0.8.0", features = ["integer", "x86_64"] } diff --git a/frontends/concrete-python/tests/tfhers-utils/src/main.rs b/frontends/concrete-python/tests/tfhers-utils/src/main.rs index e38c4b19e..bc620a549 100644 --- a/frontends/concrete-python/tests/tfhers-utils/src/main.rs +++ b/frontends/concrete-python/tests/tfhers-utils/src/main.rs @@ -1,4 +1,3 @@ -use bincode; use clap::{Arg, ArgAction, Command}; use core::panic; use std::fs; @@ -79,7 +78,7 @@ fn decrypt_with_key( } fn sum(cts_paths: Vec<&String>, out_ct_path: &String) -> Result<(), Box> { - if cts_paths.len() == 0 { + if cts_paths.is_empty() { panic!("can't call sum with 0 ciphertexts"); } let mut acc = deserialize_fheuint8(cts_paths[0]); @@ -133,7 +132,7 @@ fn keygen( let config = ConfigBuilder::with_custom_parameters(BLOCK_PARAMS).build(); let (client_key, server_key) = generate_keys(config); - let (integer_ck, _, _) = client_key.clone().into_raw_parts(); + let (integer_ck, _, _, _) = client_key.clone().into_raw_parts(); let shortint_ck = integer_ck.into_raw_parts(); assert!(BLOCK_PARAMS.encryption_key_choice == EncryptionKeyChoice::Big); let (glwe_secret_key, _, _) = shortint_ck.into_raw_parts(); @@ -155,8 +154,7 @@ fn keygen_from_lwe(lwe_sk_path: &String) -> ClientKey { let shortint_key = tfhe::shortint::ClientKey::try_from_lwe_encryption_key(lwe_sk, BLOCK_PARAMS).unwrap(); - let client_key = ClientKey::from_raw_parts(shortint_key.into(), None, None); - client_key + ClientKey::from_raw_parts(shortint_key.into(), None, None, tfhe::Tag::default()) } fn main() -> Result<(), Box> { @@ -325,7 +323,7 @@ fn main() -> Result<(), Box> { match matches.subcommand() { Some(("encrypt-with-key", encrypt_matches)) => { let value_str = encrypt_matches.get_one::("value").unwrap(); - let value = u8::from_str_radix(value_str, 10).unwrap(); + let value: u8 = value_str.parse().unwrap(); let ciphertext_path = encrypt_matches.get_one::("ciphertext").unwrap(); let client_key: ClientKey;