Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
S
stable-diffusion-webui
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
stable-diffusion-webui
Commits
526f0aa5
Unverified
Commit
526f0aa5
authored
Nov 12, 2022
by
AUTOMATIC1111
Committed by
GitHub
Nov 12, 2022
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #4623 from fumiama/mps
Fix wrong mps fallback
parents
7ba3923d
1130d5df
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
3 deletions
+10
-3
devices.py
modules/devices.py
+10
-3
No files found.
modules/devices.py
View file @
526f0aa5
...
@@ -3,8 +3,15 @@ import contextlib
...
@@ -3,8 +3,15 @@ import contextlib
import
torch
import
torch
from
modules
import
errors
from
modules
import
errors
# has_mps is only available in nightly pytorch (for now), `getattr` for compatibility
# has_mps is only available in nightly pytorch (for now) and MasOS 12.3+.
has_mps
=
getattr
(
torch
,
'has_mps'
,
False
)
# check `getattr` and try it for compatibility
def
has_mps
()
->
bool
:
if
not
getattr
(
torch
,
'has_mps'
,
False
):
return
False
try
:
torch
.
zeros
(
1
)
.
to
(
torch
.
device
(
"mps"
))
return
True
except
Exception
:
return
False
cpu
=
torch
.
device
(
"cpu"
)
cpu
=
torch
.
device
(
"cpu"
)
...
@@ -25,7 +32,7 @@ def get_optimal_device():
...
@@ -25,7 +32,7 @@ def get_optimal_device():
else
:
else
:
return
torch
.
device
(
"cuda"
)
return
torch
.
device
(
"cuda"
)
if
has_mps
:
if
has_mps
()
:
return
torch
.
device
(
"mps"
)
return
torch
.
device
(
"mps"
)
return
cpu
return
cpu
...
...
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