Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor attention_softmax #12295

Merged
merged 1 commit into from
Oct 30, 2024
Merged

refactor attention_softmax #12295

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion python/llm/src/ipex_llm/transformers/models/aquila.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ def aquila_attention_forward(
)

# upcast attention to fp32
attn_weights = attention_softmax(attn_weights, self.training)
attn_weights = attention_softmax(attn_weights)
attn_output = torch.matmul(attn_weights, value_states)

if attn_output.size() != (bsz, self.num_heads, q_len, self.head_dim):
Expand Down
4 changes: 2 additions & 2 deletions python/llm/src/ipex_llm/transformers/models/common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,8 @@ def mlp_gelu_forward(self, x: torch.Tensor):
return fuse_mlp_base(self, GELU, x)


def attention_softmax(attn_weights: torch.Tensor, training: bool):
if attn_weights.is_contiguous() and attn_weights.device.type == "xpu" and not training:
def attention_softmax(attn_weights: torch.Tensor):
if attn_weights.is_contiguous() and attn_weights.device.type == "xpu":
import xe_addons
xe_addons.attn_softmax_inplaced(attn_weights)
else:
Expand Down
2 changes: 1 addition & 1 deletion python/llm/src/ipex_llm/transformers/models/gemma.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ def gemma_attention_forward(
attn_weights = attn_weights + causal_mask

# upcast attention to fp32
attn_weights = attention_softmax(attn_weights, self.training)
attn_weights = attention_softmax(attn_weights)
attn_weights = nn.functional.dropout(attn_weights, p=self.attention_dropout,
training=self.training)
attn_output = torch.matmul(attn_weights, value_states)
Expand Down
2 changes: 1 addition & 1 deletion python/llm/src/ipex_llm/transformers/models/internlm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ def internlm_attention_forward(
attn_weights = attn_weights + attention_mask

# upcast attention to fp32
attn_weights = attention_softmax(attn_weights, self.training)
attn_weights = attention_softmax(attn_weights)
attn_output = torch.matmul(attn_weights, value_states)

attn_output = attn_output.transpose(1, 2)
Expand Down
2 changes: 1 addition & 1 deletion python/llm/src/ipex_llm/transformers/models/llama32.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ def llama_attention_forward(
attn_weights = attn_weights + causal_mask

# upcast attention to fp32
attn_weights = attention_softmax(attn_weights, self.training)
attn_weights = attention_softmax(attn_weights)
attn_output = torch.matmul(attn_weights, value_states)

attn_output = attn_output.transpose(1, 2).contiguous()
Expand Down
4 changes: 2 additions & 2 deletions python/llm/src/ipex_llm/transformers/models/minicpmv.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ def siglip_attention_forward(
if attention_mask is not None:
attn_weights = attn_weights + attention_mask

attn_weights = attention_softmax(attn_weights, self.training)
attn_weights = attention_softmax(attn_weights)

attn_weights = torch.nn.functional.dropout(attn_weights, p=self.dropout, training=self.training)
attn_output = torch.matmul(attn_weights, value_states)
Expand Down Expand Up @@ -161,7 +161,7 @@ def vision_transformer_attention_forward(self, x: torch.Tensor) -> torch.Tensor:
query_states, key_states, value_states = qkv.chunk(3, dim=1)

attn_weights = torch.matmul(query_states * self.scale, key_states.transpose(2, 3))
attn_weights = attention_softmax(attn_weights, self.training)
attn_weights = attention_softmax(attn_weights)
attn_weights = self.attn_drop(attn_weights)
attn_output = torch.matmul(attn_weights, value_states)

Expand Down
4 changes: 2 additions & 2 deletions python/llm/src/ipex_llm/transformers/models/mllama.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ def mllama_vision_attention_forward(

# upcast attention to fp32
from ipex_llm.transformers.models.common import attention_softmax
attn_weights = attention_softmax(attn_weights, False)
attn_weights = attention_softmax(attn_weights)

attn_output = torch.matmul(attn_weights, value)

Expand Down Expand Up @@ -311,7 +311,7 @@ def mllama_cross_attention_forward(
attn_weights = attn_weights + causal_mask

# upcast attention to fp32
attn_weights = attention_softmax(attn_weights, self.training)
attn_weights = attention_softmax(attn_weights)
attn_output = torch.matmul(attn_weights, value_states)

attn_output = attn_output.transpose(1, 2).contiguous()
Expand Down
2 changes: 1 addition & 1 deletion python/llm/src/ipex_llm/transformers/models/phi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ def attention_forward(
attn_weights = attn_weights + attention_mask

# upcast attention to fp32
attn_weights = attention_softmax(attn_weights, self.training).to(hidden_states.dtype)
attn_weights = attention_softmax(attn_weights).to(hidden_states.dtype)
attn_weights = torch.nn.functional.dropout(attn_weights, p=self.attention_dropout,
training=self.training)

Expand Down
2 changes: 1 addition & 1 deletion python/llm/src/ipex_llm/transformers/models/phi3.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ def attention_forward(
attn_weights.div_(math.sqrt(self.head_dim))
if attention_mask is not None:
attn_weights.add_(attention_mask)
attn_weights = attention_softmax(attn_weights, self.training)
attn_weights = attention_softmax(attn_weights)

attn_weights = torch.nn.functional.dropout(attn_weights, p=self.attention_dropout,
training=self.training)
Expand Down
4 changes: 2 additions & 2 deletions python/llm/src/ipex_llm/transformers/models/qwen2_vl.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ def qwen2_vision_attention_forward(
attn_weights = torch.matmul(q, k.transpose(1, 2)) / math.sqrt(self.head_dim)
if attention_mask is not None:
attn_weights = attn_weights + attention_mask
attn_weights = attention_softmax(attn_weights, False)
attn_weights = attention_softmax(attn_weights)
attn_output = torch.matmul(attn_weights, v)
attn_output = attn_output.transpose(0, 1)
attn_output = attn_output.reshape(seq_length, -1)
Expand Down Expand Up @@ -298,7 +298,7 @@ def qwen2_vl_attention_forward(
attn_weights = attn_weights + causal_mask

# upcast attention to fp32
attn_weights = attention_softmax(attn_weights, self.training)
attn_weights = attention_softmax(attn_weights)
attn_output = torch.matmul(attn_weights, value_states)

attn_output = attn_output.transpose(1, 2).contiguous()
Expand Down
2 changes: 1 addition & 1 deletion python/llm/src/ipex_llm/transformers/models/sd15.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ def __call__(
attn_weights = torch.matmul(query * scale, key.transpose(-1, -2))
if attention_mask is not None:
attn_weights = attn_weights + attention_mask
attn_weights = attention_softmax(attn_weights, False)
attn_weights = attention_softmax(attn_weights)
hidden_states = torch.matmul(attn_weights, value)
# IPEX-LLM changes end

Expand Down
2 changes: 1 addition & 1 deletion python/llm/src/ipex_llm/transformers/models/stablelm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ def stablelm_attention_forward(
attn_weights = attn_weights + attention_mask

# upcast attention to fp32
attn_weights = attention_softmax(attn_weights, self.training)
attn_weights = attention_softmax(attn_weights)
attn_weights = self.attention_dropout(attn_weights)
attn_output = torch.matmul(attn_weights, value_states)

Expand Down
2 changes: 1 addition & 1 deletion python/llm/src/ipex_llm/transformers/models/starcoder2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ def attention_forward(
attn_weights = attn_weights + attention_mask

# upcast attention to fp32
attn_weights = attention_softmax(attn_weights, self.training)
attn_weights = attention_softmax(attn_weights)
attn_weights = torch.nn.functional.dropout(attn_weights, p=self.attention_dropout,
training=self.training)
attn_output = torch.matmul(attn_weights, value_states)
Expand Down
2 changes: 1 addition & 1 deletion python/llm/src/ipex_llm/transformers/models/yuan.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ def yuan_attention_forward(
if attention_mask is not None:
attn_weights = attn_weights + attention_mask
# upcast attention to fp32
attn_weights = attention_softmax(attn_weights, self.training)
attn_weights = attention_softmax(attn_weights)
attn_output = torch.matmul(attn_weights, value_states)

attn_output = attn_output.transpose(1, 2)
Expand Down
Loading