github/tfhe-rs
1
1
Fork 0
mirror of https://github.com/zama-ai/tfhe-rs.git synced 2026-01-09 22:57:59 -05:00
Code Issues Packages Projects Releases Wiki Activity

chore(gpu): add better panic when calling old compression functions

Browse Source
This commit is contained in:
Agnes Leroy
2025-11-20 11:29:14 +01:00
committed by Agnès Leroy
parent 58378b7972
commit 0f5e538f9a
3 changed files with 102 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
tfhe/src/high_level_api/booleans/compressed.rs
View File

@@ -2,7 +2,8 @@ use crate::backward_compatibility::booleans::{
CompressedFheBoolVersions, InnerCompressedFheBoolVersions,
};
use crate::conformance::ParameterSetConformant;
use crate::high_level_api::global_state::with_cpu_internal_keys;
use crate::high_level_api::global_state;
use crate::high_level_api::keys::InternalServerKey;
use crate::high_level_api::re_randomization::ReRandomizationMetadata;
use crate::high_level_api::traits::Tagged;
use crate::integer::BooleanBlock;
@@ -74,7 +75,19 @@ impl CompressedFheBool {
let ciphertext = BooleanBlock::new_unchecked(match &self.inner {
InnerCompressedFheBool::Seeded(seeded) => seeded.decompress(),
InnerCompressedFheBool::ModulusSwitched(modulus_switched) => {
with_cpu_internal_keys(|sk| sk.pbs_key().key.decompress(modulus_switched))
global_state::with_internal_keys(|keys| match keys {
InternalServerKey::Cpu(cpu_key) => {
cpu_key.pbs_key().key.decompress(modulus_switched)
}
#[cfg(feature = "gpu")]
InternalServerKey::Cuda(_) => {
panic!("decompress() on FheBool is not supported on GPU, use a CompressedCiphertextList instead");
}
#[cfg(feature = "hpu")]
InternalServerKey::Hpu(_) => {
panic!("decompress() on FheBool is not supported on HPU devices");
}
})
}
});
let mut ciphertext = FheBool::new(
@@ -82,9 +95,7 @@ impl CompressedFheBool {
self.tag.clone(),
ReRandomizationMetadata::default(),
);
ciphertext.ciphertext.move_to_device_of_server_key_if_set();
ciphertext
}
}
@@ -117,16 +128,26 @@ impl Named for CompressedFheBool {
impl FheBool {
pub fn compress(&self) -> CompressedFheBool {
with_cpu_internal_keys(|sk| {
let inner = InnerCompressedFheBool::ModulusSwitched(
sk.pbs_key()
.key
.switch_modulus_and_compress(&self.ciphertext.on_cpu().0),
);
CompressedFheBool {
inner,
tag: sk.tag.clone(),
global_state::with_internal_keys(|keys| match keys {
InternalServerKey::Cpu(cpu_key) => {
let inner = InnerCompressedFheBool::ModulusSwitched(
cpu_key
.pbs_key()
.key
.switch_modulus_and_compress(&self.ciphertext.on_cpu().0),
);
CompressedFheBool {
inner,
tag: cpu_key.tag.clone(),
}
}
#[cfg(feature = "gpu")]
InternalServerKey::Cuda(_) => {
panic!("compress() on FheBool is not supported on GPU, use a CompressedCiphertextList instead");
}
#[cfg(feature = "hpu")]
InternalServerKey::Hpu(_) => {
panic!("compress() on FheBool is not supported on HPU devices");
}
})
}

44
tfhe/src/high_level_api/integers/signed/compressed.rs
View File

@@ -5,9 +5,10 @@ use crate::backward_compatibility::integers::{
};
use crate::conformance::ParameterSetConformant;
use crate::core_crypto::prelude::SignedNumeric;
use crate::high_level_api::global_state::with_cpu_internal_keys;
use crate::high_level_api::global_state;
use crate::high_level_api::integers::signed::base::FheIntConformanceParams;
use crate::high_level_api::integers::{FheInt, FheIntId};
use crate::high_level_api::keys::InternalServerKey;
use crate::high_level_api::re_randomization::ReRandomizationMetadata;
use crate::high_level_api::traits::Tagged;
use crate::integer::block_decomposition::DecomposableInto;
@@ -111,7 +112,19 @@ where
let ciphertext = match &self.ciphertext {
CompressedSignedRadixCiphertext::Seeded(ct) => ct.decompress(),
CompressedSignedRadixCiphertext::ModulusSwitched(ct) => {
with_cpu_internal_keys(|sk| sk.pbs_key().decompress_signed_parallelized(ct))
global_state::with_internal_keys(|keys| match keys {
InternalServerKey::Cpu(cpu_key) => {
cpu_key.pbs_key().decompress_signed_parallelized(ct)
}
#[cfg(feature = "gpu")]
InternalServerKey::Cuda(_) => {
panic!("decompress() on FheInt is not supported on GPU, use a CompressedCiphertextList instead");
}
#[cfg(feature = "hpu")]
InternalServerKey::Hpu(_) => {
panic!("decompress() on FheInt is not supported on HPU devices");
}
})
}
};
FheInt::new(
@@ -180,14 +193,25 @@ where
Id: FheIntId,
{
pub fn compress(&self) -> CompressedFheInt<Id> {
let a = with_cpu_internal_keys(|sk| {
sk.pbs_key()
.switch_modulus_and_compress_signed_parallelized(&self.ciphertext.on_cpu())
});
global_state::with_internal_keys(|keys| match keys {
InternalServerKey::Cpu(cpu_key) => {
let a = cpu_key
.pbs_key()
.switch_modulus_and_compress_signed_parallelized(&self.ciphertext.on_cpu());
CompressedFheInt::new(
CompressedSignedRadixCiphertext::ModulusSwitched(a),
self.tag.clone(),
)
CompressedFheInt::new(
CompressedSignedRadixCiphertext::ModulusSwitched(a),
self.tag.clone(),
)
}
#[cfg(feature = "gpu")]
InternalServerKey::Cuda(_) => {
panic!("compress() on FheInt is not supported on GPU, use a CompressedCiphertextList instead");
}
#[cfg(feature = "hpu")]
InternalServerKey::Hpu(_) => {
panic!("compress() on FheInt is not supported on HPU devices");
}
})
}
}

41
tfhe/src/high_level_api/integers/unsigned/compressed.rs
View File

@@ -5,13 +5,13 @@ use crate::backward_compatibility::integers::{
};
use crate::conformance::ParameterSetConformant;
use crate::core_crypto::prelude::UnsignedNumeric;
use crate::high_level_api::global_state::with_cpu_internal_keys;
use crate::high_level_api::integers::unsigned::base::{
FheUint, FheUintConformanceParams, FheUintId,
};
use crate::high_level_api::keys::InternalServerKey;
use crate::high_level_api::re_randomization::ReRandomizationMetadata;
use crate::high_level_api::traits::{FheTryEncrypt, Tagged};
use crate::high_level_api::ClientKey;
use crate::high_level_api::{global_state, ClientKey};
use crate::integer::block_decomposition::DecomposableInto;
use crate::integer::ciphertext::{
CompressedModulusSwitchedRadixCiphertext,
@@ -108,7 +108,19 @@ where
let inner = match &self.ciphertext {
CompressedRadixCiphertext::Seeded(ct) => ct.decompress(),
CompressedRadixCiphertext::ModulusSwitched(ct) => {
with_cpu_internal_keys(|sk| sk.pbs_key().decompress_parallelized(ct))
global_state::with_internal_keys(|keys| match keys {
InternalServerKey::Cpu(cpu_key) => {
cpu_key.pbs_key().decompress_parallelized(ct)
}
#[cfg(feature = "gpu")]
InternalServerKey::Cuda(_) => {
panic!("decompress() on FheUint is not supported on GPU, use a CompressedCiphertextList instead");
}
#[cfg(feature = "hpu")]
InternalServerKey::Hpu(_) => {
panic!("decompress() on FheUint is not supported on HPU devices");
}
})
}
};
@@ -179,11 +191,24 @@ where
Id: FheUintId,
{
pub fn compress(&self) -> CompressedFheUint<Id> {
let ciphertext = CompressedRadixCiphertext::ModulusSwitched(with_cpu_internal_keys(|sk| {
sk.pbs_key()
.switch_modulus_and_compress_parallelized(&self.ciphertext.on_cpu())
}));
CompressedFheUint::new(ciphertext, self.tag.clone())
global_state::with_internal_keys(|keys| match keys {
InternalServerKey::Cpu(cpu_key) => {
let ciphertext = CompressedRadixCiphertext::ModulusSwitched(
cpu_key
.pbs_key()
.switch_modulus_and_compress_parallelized(&self.ciphertext.on_cpu()),
);
CompressedFheUint::new(ciphertext, self.tag.clone())
}
#[cfg(feature = "gpu")]
InternalServerKey::Cuda(_) => {
panic!("compress() on FheUint is not supported on GPU, use a CompressedCiphertextList instead");
}
#[cfg(feature = "hpu")]
InternalServerKey::Hpu(_) => {
panic!("compress() on FheUint is not supported on HPU devices");
}
})
}
}