github/tfhe-rs
1
1
Fork 0
mirror of https://github.com/zama-ai/tfhe-rs.git synced 2026-01-10 07:08:03 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix(gpu): build with hpu and zk features

Browse Source
This commit is contained in:
Nicolas Sarlin
2025-05-23 13:38:27 +02:00
committed by Nicolas Sarlin
parent 52bc778629
commit 14e1ee5bd3
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@@ -315,7 +315,7 @@ clippy_hpu: install_rs_check_toolchain
.PHONY: clippy_gpu_hpu # Run clippy lints on tfhe with "gpu" and "hpu" enabled
clippy_gpu_hpu: install_rs_check_toolchain
RUSTFLAGS="$(RUSTFLAGS)" cargo "$(CARGO_RS_CHECK_TOOLCHAIN)" clippy \
--features=boolean,shortint,integer,internal-keycache,gpu,hpu,pbs-stats,extended-types \
--features=boolean,shortint,integer,internal-keycache,gpu,hpu,pbs-stats,extended-types,zk-pok \
--all-targets \
-p $(TFHE_SPEC) -- --no-deps -D warnings

13
tfhe/src/high_level_api/compact_list.rs
View File

@@ -276,7 +276,8 @@ mod zk {
}
}
fn move_to_device(&mut self, device: crate::Device) {
#[allow(clippy::unnecessary_wraps)] // Method can return an error if hpu is enabled
fn move_to_device(&mut self, device: crate::Device) -> Result<(), crate::Error> {
let new_value = match (&self, device) {
(Self::Cpu(_), crate::Device::Cpu) => None,
#[cfg(feature = "gpu")]
@@ -303,11 +304,18 @@ mod zk {
});
Some(Self::Cuda(cuda_ct))
}
#[cfg(feature = "hpu")]
(_, crate::Device::Hpu) => {
return Err(crate::error!(
"Hpu does not support ProvenCompactCiphertextList"
))
}
};
if let Some(v) = new_value {
*self = v;
}
Ok(())
}
}
@@ -330,7 +338,8 @@ mod zk {
.map(Self::Cpu)?;
if let Some(device) = device_of_internal_keys() {
new.move_to_device(device);
new.move_to_device(device)
.map_err(serde::de::Error::custom)?;
}
Ok(new)