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

Avoid using the attn mask when not necessary.

Browse Source
This commit is contained in:
laurent
2024-03-24 18:55:56 +01:00
parent e2b4829531
commit 8c0db87992
1 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
candle-transformers/src/models/quantized_llama.rs
View File

@ -181,7 +181,12 @@ impl LayerWeights {
Ok(rope) Ok(rope)
} }
fn forward_attn(&mut self, x: &Tensor, mask: &Tensor, index_pos: usize) -> Result<Tensor> { fn forward_attn(
&mut self,
x: &Tensor,
mask: Option<&Tensor>,
index_pos: usize,
) -> Result<Tensor> {
let _enter = self.span_attn.enter(); let _enter = self.span_attn.enter();
let (b_sz, seq_len, n_embd) = x.dims3()?; let (b_sz, seq_len, n_embd) = x.dims3()?;
let q = self.attention_wq.forward(x)?; let q = self.attention_wq.forward(x)?;
@ -220,8 +225,13 @@ impl LayerWeights {
let v = self.repeat_kv(v)?; let v = self.repeat_kv(v)?;
let att = (q.matmul(&k.t()?)? / (self.head_dim as f64).sqrt())?; let att = (q.matmul(&k.t()?)? / (self.head_dim as f64).sqrt())?;
let att = match mask {
None => att,
Some(mask) => {
let mask = mask.broadcast_as(att.shape())?; let mask = mask.broadcast_as(att.shape())?;
let att = masked_fill(&att, &mask, &self.neg_inf)?; masked_fill(&att, &mask, &self.neg_inf)?
}
};
let att = candle_nn::ops::softmax_last_dim(&att)?; let att = candle_nn::ops::softmax_last_dim(&att)?;
// Convert to contiguous as matmul doesn't support strided vs for now. // Convert to contiguous as matmul doesn't support strided vs for now.
let y = att.matmul(&v.contiguous()?)?; let y = att.matmul(&v.contiguous()?)?;
@ -474,14 +484,18 @@ impl ModelWeights {
pub fn forward(&mut self, x: &Tensor, index_pos: usize) -> Result<Tensor> { pub fn forward(&mut self, x: &Tensor, index_pos: usize) -> Result<Tensor> {
let (_b_sz, seq_len) = x.dims2()?; let (_b_sz, seq_len) = x.dims2()?;
let mask = self.mask(seq_len, x.device())?; let mask = if seq_len == 1 {
None
} else {
Some(self.mask(seq_len, x.device())?)
};
let _enter = self.span.enter(); let _enter = self.span.enter();
let mut layer_in = self.tok_embeddings.forward(x)?; let mut layer_in = self.tok_embeddings.forward(x)?;
for layer in self.layers.iter_mut() { for layer in self.layers.iter_mut() {
let x = layer_in; let x = layer_in;
let residual = &x; let residual = &x;
let x = layer.attention_norm.forward(&x)?; let x = layer.attention_norm.forward(&x)?;
let attn = layer.forward_attn(&x, &mask, index_pos)?; let attn = layer.forward_attn(&x, mask.as_ref(), index_pos)?;
let x = (attn + residual)?; let x = (attn + residual)?;
// MLP // MLP