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
ea05ddfe
Commit
ea05ddfe
authored
May 09, 2023
by
AUTOMATIC1111
Committed by
GitHub
May 09, 2023
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #10201 from brkirch/mps-nan-fixes
Fix MPS on PyTorch 2.0.1, Intel Macs
parents
2b96a7b6
de401d8f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
2 deletions
+10
-2
modules/mac_specific.py
modules/mac_specific.py
+7
-2
modules/sd_hijack_optimizations.py
modules/sd_hijack_optimizations.py
+3
-0
No files found.
modules/mac_specific.py
View file @
ea05ddfe
...
...
@@ -54,6 +54,11 @@ if has_mps:
CondFunc
(
'torch.cumsum'
,
cumsum_fix_func
,
None
)
CondFunc
(
'torch.Tensor.cumsum'
,
cumsum_fix_func
,
None
)
CondFunc
(
'torch.narrow'
,
lambda
orig_func
,
*
args
,
**
kwargs
:
orig_func
(
*
args
,
**
kwargs
)
.
clone
(),
None
)
if
version
.
parse
(
torch
.
__version__
)
==
version
.
parse
(
"2.0"
):
# MPS workaround for https://github.com/pytorch/pytorch/issues/96113
CondFunc
(
'torch.nn.functional.layer_norm'
,
lambda
orig_func
,
x
,
normalized_shape
,
weight
,
bias
,
eps
,
**
kwargs
:
orig_func
(
x
.
float
(),
normalized_shape
,
weight
.
float
()
if
weight
is
not
None
else
None
,
bias
.
float
()
if
bias
is
not
None
else
bias
,
eps
)
.
to
(
x
.
dtype
),
lambda
*
args
,
**
kwargs
:
len
(
args
)
==
6
)
CondFunc
(
'torch.nn.functional.layer_norm'
,
lambda
orig_func
,
x
,
normalized_shape
,
weight
,
bias
,
eps
,
**
kwargs
:
orig_func
(
x
.
float
(),
normalized_shape
,
weight
.
float
()
if
weight
is
not
None
else
None
,
bias
.
float
()
if
bias
is
not
None
else
bias
,
eps
)
.
to
(
x
.
dtype
),
lambda
_
,
input
,
*
args
,
**
kwargs
:
len
(
args
)
==
4
and
input
.
device
.
type
==
'mps'
)
# MPS workaround for https://github.com/pytorch/pytorch/issues/92311
if
platform
.
processor
()
==
'i386'
:
for
funcName
in
[
'torch.argmax'
,
'torch.Tensor.argmax'
]:
CondFunc
(
funcName
,
lambda
_
,
input
,
*
args
,
**
kwargs
:
torch
.
max
(
input
.
float
()
if
input
.
dtype
==
torch
.
int64
else
input
,
*
args
,
**
kwargs
)[
1
],
lambda
_
,
input
,
*
args
,
**
kwargs
:
input
.
device
.
type
==
'mps'
)
\ No newline at end of file
modules/sd_hijack_optimizations.py
View file @
ea05ddfe
...
...
@@ -256,6 +256,9 @@ def sub_quad_attention_forward(self, x, context=None, mask=None):
k
=
k
.
unflatten
(
-
1
,
(
h
,
-
1
))
.
transpose
(
1
,
2
)
.
flatten
(
end_dim
=
1
)
v
=
v
.
unflatten
(
-
1
,
(
h
,
-
1
))
.
transpose
(
1
,
2
)
.
flatten
(
end_dim
=
1
)
if
q
.
device
.
type
==
'mps'
:
q
,
k
,
v
=
q
.
contiguous
(),
k
.
contiguous
(),
v
.
contiguous
()
dtype
=
q
.
dtype
if
shared
.
opts
.
upcast_attn
:
q
,
k
=
q
.
float
(),
k
.
float
()
...
...
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