Skip to content

Fix: Wrong initialization of variable modality in X-InstructBLIP's generate() within use_cues statement of joint_video_audio #780

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

Open
globc wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fix: Wrong initialization of variable modality in X-InstructBLIP's generate() within use_cues statement of joint_video_audio #780

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
17a4219
Move modality loop outside use_cues flag in X-InstructBLIP generate()…
globc Jan 7, 2025
ab3f319
Missing continue in X-InstructBLIP's forward
globc Jan 11, 2025
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
11 changes: 6 additions & 5 deletions lavis/models/blip2_models/blip2_vicuna_xinstruct.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -768,6 +768,7 @@ def forward(self, samples):
if self.prefix and self.clean_tokenization:
att_list.extend([self.att_cue[modality][:,1:].repeat(bs, 1).to(self.device), atts_llm[modality]])
inp_list.extend([self.emb_cue[modality][:,1:].repeat(bs, 1, 1).to(self.device), inputs_llm[modality]])
continue
att_list.extend([self.att_cue[modality].repeat(bs, 1).to(self.device), atts_llm[modality]])
inp_list.extend([self.emb_cue[modality].repeat(bs, 1, 1).to(self.device), inputs_llm[modality]])
else:
Expand Down Expand Up @@ -1434,18 +1435,18 @@ def generate(
enumeration_atts_llm = enumeration_pos.attention_mask.to(self.device)
inp_list.extend([enumeration_inputs_llm])
att_list.extend([enumeration_atts_llm])
if self.use_cues:
for modality in ['video', 'audio']:
for modality in ['video', 'audio']:
if self.use_cues:
if self.clean_tokenization:
if self.prefix or pos > 1 or self.enumerate_inputs or modality == 'audio':
att_list.extend([torch.tensor(self.tokenized_cue[modality].attention_mask[:,1:]).to(self.device).repeat(atts_llm[modality].shape[0], 1), atts_llm[modality].view(bs, num[modality], self.num_query_token)[:, pos, :]])
inp_list.extend([self.emb_cue[modality][:,1:].to(self.device).repeat(inputs_llm[modality].shape[0], 1, 1), inputs_llm[modality].view(bs, num[modality], self.num_query_token, -1)[:, pos, :, :]])
continue
att_list.extend([torch.tensor(self.tokenized_cue[modality].attention_mask).to(self.device).repeat(atts_llm[modality].shape[0], 1), atts_llm[modality].view(bs, num[modality], self.num_query_token)[:, pos, :]])
inp_list.extend([self.emb_cue[modality].to(self.device).repeat(inputs_llm[modality].shape[0], 1, 1), inputs_llm[modality].view(bs, num[modality], self.num_query_token, -1)[:, pos, :, :]])
else:
att_list.extend([atts_llm[modality].view(bs, num[modality], self.num_query_token)[:, pos, :]])
inp_list.extend([inputs_llm[modality].view(bs, num[modality], self.num_query_token, -1)[:, pos, :, :]])
else:
att_list.extend([atts_llm[modality].view(bs, num[modality], self.num_query_token)[:, pos, :]])
inp_list.extend([inputs_llm[modality].view(bs, num[modality], self.num_query_token, -1)[:, pos, :, :]])
else:
for modality in curr_modalities:
if self.enumerate_inputs:
Expand Down