Skip to content

Commit

Permalink
Merge branch 'opinion-based' into beta
Browse files Browse the repository at this point in the history
  • Loading branch information
jn-jairo committed Nov 30, 2023
2 parents 0ae78aa + 94ed8ee commit 718cc46
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions comfy/ldm/modules/attention.py
Original file line number Diff line number Diff line change
Expand Up @@ -264,14 +264,14 @@ def attention_split(q, k, v, heads, mask=None):
model_management.soft_empty_cache(True)
if cleared_cache == False:
cleared_cache = True
print("out of memory error, emptying cache and trying again")
# print("out of memory error, emptying cache and trying again")
continue
steps += 1
while (q.shape[1] % steps) != 0 and steps < max_steps:
steps += 1
if steps > max_steps:
raise e
print("out of memory error, increasing steps and trying again", steps)
# print("out of memory error, increasing steps and trying again", steps)
else:
raise e

Expand Down
2 changes: 1 addition & 1 deletion comfy/ldm/modules/diffusionmodules/model.py
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ def slice_attention(q, k, v):
steps += 1
if steps > max_steps:
raise e
print("out of memory error, increasing steps and trying again", steps)
# print("out of memory error, increasing steps and trying again", steps)

return r1

Expand Down

0 comments on commit 718cc46

Please sign in to comment.