Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
S
Stable Diffusion Webui
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Packages
Packages
List
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issues
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
novelai-storage
Stable Diffusion Webui
Commits
98fd5cde
Commit
98fd5cde
authored
Oct 10, 2022
by
brkirch
Committed by
AUTOMATIC1111
Oct 11, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add check for psutil
parent
c0484f1b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
23 additions
and
6 deletions
+23
-6
modules/sd_hijack.py
modules/sd_hijack.py
+8
-2
modules/sd_hijack_optimizations.py
modules/sd_hijack_optimizations.py
+15
-4
No files found.
modules/sd_hijack.py
View file @
98fd5cde
...
@@ -10,6 +10,7 @@ from torch.nn.functional import silu
...
@@ -10,6 +10,7 @@ from torch.nn.functional import silu
import
modules.textual_inversion.textual_inversion
import
modules.textual_inversion.textual_inversion
from
modules
import
prompt_parser
,
devices
,
sd_hijack_optimizations
,
shared
from
modules
import
prompt_parser
,
devices
,
sd_hijack_optimizations
,
shared
from
modules.shared
import
opts
,
device
,
cmd_opts
from
modules.shared
import
opts
,
device
,
cmd_opts
from
modules.sd_hijack_optimizations
import
invokeAI_mps_available
import
ldm.modules.attention
import
ldm.modules.attention
import
ldm.modules.diffusionmodules.model
import
ldm.modules.diffusionmodules.model
...
@@ -31,8 +32,13 @@ def apply_optimizations():
...
@@ -31,8 +32,13 @@ def apply_optimizations():
print
(
"Applying v1 cross attention optimization."
)
print
(
"Applying v1 cross attention optimization."
)
ldm
.
modules
.
attention
.
CrossAttention
.
forward
=
sd_hijack_optimizations
.
split_cross_attention_forward_v1
ldm
.
modules
.
attention
.
CrossAttention
.
forward
=
sd_hijack_optimizations
.
split_cross_attention_forward_v1
elif
not
cmd_opts
.
disable_opt_split_attention
and
(
cmd_opts
.
opt_split_attention_invokeai
or
not
torch
.
cuda
.
is_available
()):
elif
not
cmd_opts
.
disable_opt_split_attention
and
(
cmd_opts
.
opt_split_attention_invokeai
or
not
torch
.
cuda
.
is_available
()):
print
(
"Applying cross attention optimization (InvokeAI)."
)
if
not
invokeAI_mps_available
and
shared
.
device
.
type
==
'mps'
:
ldm
.
modules
.
attention
.
CrossAttention
.
forward
=
sd_hijack_optimizations
.
split_cross_attention_forward_invokeAI
print
(
"The InvokeAI cross attention optimization for MPS requires the psutil package which is not installed."
)
print
(
"Applying v1 cross attention optimization."
)
ldm
.
modules
.
attention
.
CrossAttention
.
forward
=
sd_hijack_optimizations
.
split_cross_attention_forward_v1
else
:
print
(
"Applying cross attention optimization (InvokeAI)."
)
ldm
.
modules
.
attention
.
CrossAttention
.
forward
=
sd_hijack_optimizations
.
split_cross_attention_forward_invokeAI
elif
not
cmd_opts
.
disable_opt_split_attention
and
(
cmd_opts
.
opt_split_attention
or
torch
.
cuda
.
is_available
()):
elif
not
cmd_opts
.
disable_opt_split_attention
and
(
cmd_opts
.
opt_split_attention
or
torch
.
cuda
.
is_available
()):
print
(
"Applying cross attention optimization (Doggettx)."
)
print
(
"Applying cross attention optimization (Doggettx)."
)
ldm
.
modules
.
attention
.
CrossAttention
.
forward
=
sd_hijack_optimizations
.
split_cross_attention_forward
ldm
.
modules
.
attention
.
CrossAttention
.
forward
=
sd_hijack_optimizations
.
split_cross_attention_forward
...
...
modules/sd_hijack_optimizations.py
View file @
98fd5cde
import
math
import
math
import
sys
import
sys
import
traceback
import
traceback
import
psutil
import
importlib
import
torch
import
torch
from
torch
import
einsum
from
torch
import
einsum
...
@@ -117,9 +117,20 @@ def split_cross_attention_forward(self, x, context=None, mask=None):
...
@@ -117,9 +117,20 @@ def split_cross_attention_forward(self, x, context=None, mask=None):
return
self
.
to_out
(
r2
)
return
self
.
to_out
(
r2
)
# -- From https://github.com/invoke-ai/InvokeAI/blob/main/ldm/modules/attention.py (with hypernetworks support added) --
mem_total_gb
=
psutil
.
virtual_memory
()
.
total
//
(
1
<<
30
)
def
check_for_psutil
():
try
:
spec
=
importlib
.
util
.
find_spec
(
'psutil'
)
return
spec
is
not
None
except
ModuleNotFoundError
:
return
False
invokeAI_mps_available
=
check_for_psutil
()
# -- Taken from https://github.com/invoke-ai/InvokeAI --
if
invokeAI_mps_available
:
import
psutil
mem_total_gb
=
psutil
.
virtual_memory
()
.
total
//
(
1
<<
30
)
def
einsum_op_compvis
(
q
,
k
,
v
):
def
einsum_op_compvis
(
q
,
k
,
v
):
s
=
einsum
(
'b i d, b j d -> b i j'
,
q
,
k
)
s
=
einsum
(
'b i d, b j d -> b i j'
,
q
,
k
)
...
@@ -193,7 +204,7 @@ def split_cross_attention_forward_invokeAI(self, x, context=None, mask=None):
...
@@ -193,7 +204,7 @@ def split_cross_attention_forward_invokeAI(self, x, context=None, mask=None):
r
=
einsum_op
(
q
,
k
,
v
)
r
=
einsum_op
(
q
,
k
,
v
)
return
self
.
to_out
(
rearrange
(
r
,
'(b h) n d -> b n (h d)'
,
h
=
h
))
return
self
.
to_out
(
rearrange
(
r
,
'(b h) n d -> b n (h d)'
,
h
=
h
))
# -- End of code from https://github.com/invoke-ai/InvokeAI
/blob/main/ldm/modules/attention.py
--
# -- End of code from https://github.com/invoke-ai/InvokeAI --
def
xformers_attention_forward
(
self
,
x
,
context
=
None
,
mask
=
None
):
def
xformers_attention_forward
(
self
,
x
,
context
=
None
,
mask
=
None
):
h
=
self
.
heads
h
=
self
.
heads
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment