Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion backends/candle/src/layers/linear.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ use serde::Deserialize;
pub enum HiddenAct {
Gelu,
Relu,
#[serde(alias = "silu")]
Silu,
Swiglu,
}

Expand All @@ -16,6 +16,7 @@ impl HiddenAct {
match self {
Self::Gelu => x.gelu(),
Self::Relu => x.relu(),
Self::Silu => x.silu(),
Self::Swiglu => candle_nn::ops::swiglu(x),
}
}
Expand Down Expand Up @@ -80,6 +81,7 @@ impl Linear {
match act {
HiddenAct::Gelu => x.gelu(),
HiddenAct::Relu => x.relu(),
HiddenAct::Silu => x.silu(),
HiddenAct::Swiglu => candle_nn::ops::swiglu(&x),
}
} else {
Expand Down
6 changes: 1 addition & 5 deletions backends/candle/src/models/flash_jina.rs
Original file line number Diff line number Diff line change
Expand Up @@ -176,11 +176,7 @@ impl JinaBertLayer {

let hidden_states = self.gated.forward(&hidden_states)?;
let gated = hidden_states.narrow(1, 0, self.intermediate_size)?;
let gated = match self.act {
HiddenAct::Gelu => gated.gelu(),
HiddenAct::Relu => gated.relu(),
HiddenAct::Swiglu => gated.silu(),
}?;
let gated = self.act.forward(&gated)?;

let non_gated = hidden_states.narrow(1, self.intermediate_size, self.intermediate_size)?;
let hidden_states = (gated * non_gated)?;
Expand Down
6 changes: 1 addition & 5 deletions backends/candle/src/models/flash_jina_code.rs
Original file line number Diff line number Diff line change
Expand Up @@ -230,11 +230,7 @@ impl JinaCodeBertLayer {
let hidden_states = self.up_gated_layer.forward(&hidden_states)?;
let non_gated = hidden_states.narrow(1, 0, self.intermediate_size)?;
let gated = hidden_states.narrow(1, self.intermediate_size, self.intermediate_size)?;
let gated = match self.act {
HiddenAct::Gelu => gated.gelu(),
HiddenAct::Relu => gated.relu(),
HiddenAct::Swiglu => gated.silu(),
}?;
let gated = self.act.forward(&gated)?;
let hidden_states = (non_gated * gated)?;
let hidden_states = self.down_layer.forward(&hidden_states)?;

Expand Down
6 changes: 1 addition & 5 deletions backends/candle/src/models/flash_mistral.rs
Original file line number Diff line number Diff line change
Expand Up @@ -159,11 +159,7 @@ impl MistralMLP {
let gate_states = gate_up_states.narrow(1, 0, self.intermediate_size)?;
let up_states = gate_up_states.narrow(1, self.intermediate_size, self.intermediate_size)?;

let gate_states = match self.act {
HiddenAct::Gelu => gate_states.gelu(),
HiddenAct::Relu => gate_states.relu(),
HiddenAct::Swiglu => gate_states.silu(),
}?;
let gate_states = self.act.forward(&gate_states)?;
let r = self.down_proj.forward(&(gate_states * up_states)?);
r
}
Expand Down
6 changes: 1 addition & 5 deletions backends/candle/src/models/flash_qwen2.rs
Original file line number Diff line number Diff line change
Expand Up @@ -167,11 +167,7 @@ impl Qwen2MLP {
let gate_states = gate_up_states.narrow(1, 0, self.intermediate_size)?;
let up_states = gate_up_states.narrow(1, self.intermediate_size, self.intermediate_size)?;

let gate_states = match self.act {
HiddenAct::Gelu => gate_states.gelu(),
HiddenAct::Relu => gate_states.relu(),
HiddenAct::Swiglu => gate_states.silu(),
}?;
let gate_states = self.act.forward(&gate_states)?;
let r = self.down_proj.forward(&(gate_states * up_states)?);
r
}
Expand Down
6 changes: 1 addition & 5 deletions backends/candle/src/models/jina.rs
Original file line number Diff line number Diff line change
Expand Up @@ -294,11 +294,7 @@ impl JinaBertLayer {

let hidden_states = self.gated.forward(&hidden_states)?;
let gated = hidden_states.i((.., .., 0..self.intermediate_size))?;
let gated = match self.act {
HiddenAct::Gelu => gated.gelu(),
HiddenAct::Relu => gated.relu(),
HiddenAct::Swiglu => gated.silu(),
}?;
let gated = self.act.forward(&gated)?;

let non_gated = hidden_states.i((.., .., self.intermediate_size..))?;
let hidden_states = (gated * non_gated)?;
Expand Down
6 changes: 1 addition & 5 deletions backends/candle/src/models/jina_code.rs
Original file line number Diff line number Diff line change
Expand Up @@ -284,11 +284,7 @@ impl JinaCodeBertLayer {
let hidden_states = self.up_gated_layer.forward(&hidden_states)?;
let non_gated = hidden_states.i((.., .., 0..self.intermediate_size))?;
let gated = hidden_states.i((.., .., self.intermediate_size..))?;
let gated = match self.act {
HiddenAct::Gelu => gated.gelu(),
HiddenAct::Relu => gated.relu(),
HiddenAct::Swiglu => gated.silu(),
}?;
let gated = self.act.forward(&gated)?;
let hidden_states = (non_gated * gated)?;
let hidden_states = self.down_layer.forward(&hidden_states)?;

Expand Down
6 changes: 1 addition & 5 deletions backends/candle/src/models/modernbert.rs
Original file line number Diff line number Diff line change
Expand Up @@ -120,11 +120,7 @@ impl ModernBertMLP {
hidden_states.narrow(D::Minus1, self.intermediate_size, self.intermediate_size)?;

let input = if let Some(activation) = &self.activation {
match activation {
HiddenAct::Gelu => input.gelu(),
HiddenAct::Relu => input.relu(),
HiddenAct::Swiglu => input.silu(),
}
activation.forward(&input)
} else {
Ok(input)
};
Expand Down
Loading