update transformers version, update causal mask code

This commit is contained in:
Caleb O'Leary
2024-08-06 09:40:56 -05:00
parent 130c7ab7c7
commit 4d3972841a
2 changed files with 16 additions and 4 deletions
+15 -3
View File
@@ -2,7 +2,7 @@ import torch
from transformers import CLIPTextModel
from typing import Any, Callable, Dict, Optional, Tuple, Union, List
from transformers.modeling_outputs import BaseModelOutputWithPooling
from transformers.models.clip.modeling_clip import _make_causal_mask, _expand_mask
from transformers.modeling_attn_mask_utils import AttentionMaskConverter
class CLIPTextModelWrapper(CLIPTextModel):
@@ -41,11 +41,23 @@ class CLIPTextModelWrapper(CLIPTextModel):
# CLIP's text model uses causal mask, prepare it here.
# https://github.com/openai/CLIP/blob/cfcffb90e69f37bf2ff1e988237a0fbe41f33c04/clip/model.py#L324
causal_attention_mask = _make_causal_mask(input_shape, hidden_states.dtype, device=hidden_states.device)
attn_mask_converter = AttentionMaskConverter(is_causal=True)
causal_attention_mask = attn_mask_converter.to_causal_4d(
batch_size=input_shape[0],
query_length=input_shape[1],
key_value_length=input_shape[1],
dtype=hidden_states.dtype,
device=hidden_states.device
)
# expand attention_mask
if attention_mask is not None:
# [bsz, seq_len] -> [bsz, 1, tgt_seq_len, src_seq_len]
attention_mask = _expand_mask(attention_mask, hidden_states.dtype)
attention_mask = attn_mask_converter.to_4d(
attention_mask,
input_shape[1],
key_value_length=input_shape[1],
dtype=hidden_states.dtype
)
encoder_outputs = self.text_model.encoder(
inputs_embeds=hidden_states,
+1 -1
View File
@@ -2,4 +2,4 @@ insightface>=0.7.3
diffusers>=0.19.3
opencv-python>=4.5.0
onnxruntime>=1.12.0
transformers==4.34.1
transformers>=4.36.0