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
7ba3923d
Commit
7ba3923d
authored
Nov 11, 2022
by
AUTOMATIC
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
move DDIM/PLMS fix for OSX out of the file with inpainting code.
parent
bb2e2c82
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
24 additions
and
17 deletions
+24
-17
modules/sd_hijack.py
modules/sd_hijack.py
+23
-0
modules/sd_hijack_inpainting.py
modules/sd_hijack_inpainting.py
+1
-17
No files found.
modules/sd_hijack.py
View file @
7ba3923d
...
...
@@ -14,6 +14,8 @@ from modules.sd_hijack_optimizations import invokeAI_mps_available
import
ldm.modules.attention
import
ldm.modules.diffusionmodules.model
import
ldm.models.diffusion.ddim
import
ldm.models.diffusion.plms
attention_CrossAttention_forward
=
ldm
.
modules
.
attention
.
CrossAttention
.
forward
diffusionmodules_model_nonlinearity
=
ldm
.
modules
.
diffusionmodules
.
model
.
nonlinearity
...
...
@@ -406,3 +408,24 @@ def add_circular_option_to_conv_2d():
model_hijack
=
StableDiffusionModelHijack
()
def
register_buffer
(
self
,
name
,
attr
):
"""
Fix register buffer bug for Mac OS.
"""
if
type
(
attr
)
==
torch
.
Tensor
:
if
attr
.
device
!=
devices
.
device
:
# would this not break cuda when torch adds has_mps() to main version?
if
getattr
(
torch
,
'has_mps'
,
False
):
attr
=
attr
.
to
(
device
=
"mps"
,
dtype
=
torch
.
float32
)
else
:
attr
=
attr
.
to
(
devices
.
device
)
setattr
(
self
,
name
,
attr
)
ldm
.
models
.
diffusion
.
ddim
.
DDIMSampler
.
register_buffer
=
register_buffer
ldm
.
models
.
diffusion
.
plms
.
PLMSSampler
.
register_buffer
=
register_buffer
modules/sd_hijack_inpainting.py
View file @
7ba3923d
import
torch
import
modules.devices
as
devices
from
einops
import
repeat
from
omegaconf
import
ListConfig
...
...
@@ -315,20 +314,6 @@ class LatentInpaintDiffusion(LatentDiffusion):
self
.
masked_image_key
=
masked_image_key
assert
self
.
masked_image_key
in
concat_keys
self
.
concat_keys
=
concat_keys
# =================================================================================================
# Fix register buffer bug for Mac OS, Viktor Tabori, viktor.doklist.com/start-here
# =================================================================================================
def
register_buffer
(
self
,
name
,
attr
):
if
type
(
attr
)
==
torch
.
Tensor
:
optimal_type
=
devices
.
get_optimal_device
()
if
attr
.
device
!=
optimal_type
:
if
getattr
(
torch
,
'has_mps'
,
False
):
attr
=
attr
.
to
(
device
=
"mps"
,
dtype
=
torch
.
float32
)
else
:
attr
=
attr
.
to
(
optimal_type
)
setattr
(
self
,
name
,
attr
)
def
should_hijack_inpainting
(
checkpoint_info
):
...
...
@@ -341,8 +326,7 @@ def do_inpainting_hijack():
ldm
.
models
.
diffusion
.
ddim
.
DDIMSampler
.
p_sample_ddim
=
p_sample_ddim
ldm
.
models
.
diffusion
.
ddim
.
DDIMSampler
.
sample
=
sample_ddim
ldm
.
models
.
diffusion
.
ddim
.
DDIMSampler
.
register_buffer
=
register_buffer
ldm
.
models
.
diffusion
.
plms
.
PLMSSampler
.
p_sample_plms
=
p_sample_plms
ldm
.
models
.
diffusion
.
plms
.
PLMSSampler
.
sample
=
sample_plms
ldm
.
models
.
diffusion
.
plms
.
PLMSSampler
.
register_buffer
=
register_buffer
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