Skip to content

Fix incorrect calc_word_indecies when used loras #32

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
kruall wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix incorrect calc_word_indecies when used loras #32

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
8 changes: 4 additions & 4 deletions scripts/daam/trace.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,10 @@ def _forward(hk_self, self, *args, **kwargs):


class HeatMap:
def __init__(self, prompt_analyzer: PromptAnalyzer, prompt: str, heat_maps: torch.Tensor):
self.prompt_analyzer = prompt_analyzer.create(prompt)
def __init__(self, prompt_analyzer: PromptAnalyzer, heat_maps: torch.Tensor):
self.prompt_analyzer = prompt_analyzer
self.heat_maps = heat_maps
self.prompt = prompt
self.prompt = prompt_analyzer.prompt

def compute_word_heat_map(self, word: str, word_idx: int = None) -> torch.Tensor:
merge_idxs, _ = self.prompt_analyzer.calc_word_indecies(word)
Expand Down Expand Up @@ -182,7 +182,7 @@ def compute_global_heat_map(self, prompt_analyzer, prompt, batch_index, time_wei
maps = torch.stack([torch.stack(x, 0) for x in all_merges], dim=0)
maps = maps.sum(0).to(device).sum(2).sum(0)

return HeatMap(prompt_analyzer, prompt, maps)
return HeatMap(prompt_analyzer, maps)


class UNetCrossAttentionHooker(ObjectHooker[CrossAttention]):
Expand Down
2 changes: 2 additions & 0 deletions scripts/daam/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
from pathlib import Path
import random
import re
import sys
from typing import Union

from PIL import Image, ImageFont, ImageDraw
Expand Down Expand Up @@ -276,6 +277,7 @@ def __init__(self, clip : Union[FrozenCLIPEmbedderWithCustomWordsBase, GeneralCo
self.used_custom_terms = []
self.hijack_comments = []

self.prompt = text
chunks, token_count = self.tokenize_line(text)

self.token_count = token_count
Expand Down