huggingface/candle
1
0
Fork 0
mirror of https://github.com/huggingface/candle.git synced 2025-06-15 18:28:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for clippy 1.87. (#2956)

Browse Source
This commit is contained in:
Laurent Mazare
2025-05-15 21:50:27 +02:00
committed by GitHub
parent 9ce4fe6194
commit 92106c8762
6 changed files with 35 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
candle-transformers/src/models/deepseek2.rs
View File

@ -869,8 +869,8 @@ impl Moe {
}
enum MoeOrMlp {
Moe(Moe),
Mlp(Mlp),
Moe(Box<Moe>),
Mlp(Box<Mlp>),
}
impl MoeOrMlp {
@ -908,14 +908,17 @@ impl DecoderLayer {
&& layer_idx >= cfg.first_k_dense_replace
&& layer_idx % cfg.moe_layer_freq == 0
{
MoeOrMlp::Moe(Moe::new(
cfg,
vb.pp("mlp"),
cfg.n_shared_experts,
cfg.n_routed_experts.unwrap(),
)?)
MoeOrMlp::Moe(
Moe::new(
cfg,
vb.pp("mlp"),
cfg.n_shared_experts,
cfg.n_routed_experts.unwrap(),
)?
.into(),
)
} else {
MoeOrMlp::Mlp(Mlp::new(cfg, vb.pp("mlp"), None, None)?)
MoeOrMlp::Mlp(Mlp::new(cfg, vb.pp("mlp"), None, None)?.into())
};
Ok(Self {

8
candle-transformers/src/models/segment_anything/sam.rs
View File

@ -17,8 +17,8 @@ const CROP_NMS_THRESH: f32 = 0.7;
#[derive(Debug)]
enum ImageEncoder {
Original(ImageEncoderViT),
TinyViT(TinyViT),
Original(Box<ImageEncoderViT>),
TinyViT(Box<TinyViT>),
}
impl Module for ImageEncoder {
@ -83,7 +83,7 @@ impl Sam {
let pixel_std =
Tensor::new(&[58.395f32, 57.12, 57.375], vb.device())?.reshape((3, 1, 1))?;
Ok(Self {
image_encoder: ImageEncoder::Original(image_encoder),
image_encoder: ImageEncoder::Original(image_encoder.into()),
prompt_encoder,
mask_decoder,
pixel_std,
@ -114,7 +114,7 @@ impl Sam {
let pixel_std =
Tensor::new(&[58.395f32, 57.12, 57.375], vb.device())?.reshape((3, 1, 1))?;
Ok(Self {
image_encoder: ImageEncoder::TinyViT(image_encoder),
image_encoder: ImageEncoder::TinyViT(image_encoder.into()),
prompt_encoder,
mask_decoder,
pixel_std,

7
candle-transformers/src/models/stable_diffusion/ddim.rs
View File

@ -134,12 +134,7 @@ impl Scheduler for DDIMScheduler {
timestep
};
// https://github.com/huggingface/diffusers/blob/6e099e2c8ce4c4f5c7318e970a8c093dc5c7046e/src/diffusers/schedulers/scheduling_ddim.py#L195
let prev_timestep = if timestep > self.step_ratio {
timestep - self.step_ratio
} else {
0
};
let prev_timestep = timestep.saturating_sub(self.step_ratio);
let alpha_prod_t = self.alphas_cumprod[timestep];
let alpha_prod_t_prev = self.alphas_cumprod[prev_timestep];
let beta_prod_t = 1. - alpha_prod_t;