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
59544321
Commit
59544321
authored
Sep 11, 2023
by
AUTOMATIC1111
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
initial work on sd_unet for SDXL
parent
92464233
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
7 deletions
+14
-7
modules/sd_hijack.py
modules/sd_hijack.py
+12
-5
modules/sd_unet.py
modules/sd_unet.py
+2
-2
No files found.
modules/sd_hijack.py
View file @
59544321
...
...
@@ -2,7 +2,7 @@ import torch
from
torch.nn.functional
import
silu
from
types
import
MethodType
from
modules
import
devices
,
sd_hijack_optimizations
,
shared
,
script_callbacks
,
errors
,
sd_unet
from
modules
import
devices
,
sd_hijack_optimizations
,
shared
,
script_callbacks
,
errors
,
sd_unet
,
patches
from
modules.hypernetworks
import
hypernetwork
from
modules.shared
import
cmd_opts
from
modules
import
sd_hijack_clip
,
sd_hijack_open_clip
,
sd_hijack_unet
,
sd_hijack_xlmr
,
xlmr
...
...
@@ -10,6 +10,7 @@ from modules import sd_hijack_clip, sd_hijack_open_clip, sd_hijack_unet, sd_hija
import
ldm.modules.attention
import
ldm.modules.diffusionmodules.model
import
ldm.modules.diffusionmodules.openaimodel
import
ldm.models.diffusion.ddpm
import
ldm.models.diffusion.ddim
import
ldm.models.diffusion.plms
import
ldm.modules.encoders.modules
...
...
@@ -37,6 +38,8 @@ ldm.models.diffusion.ddpm.print = shared.ldm_print
optimizers
=
[]
current_optimizer
:
sd_hijack_optimizations
.
SdOptimization
=
None
ldm_original_forward
=
patches
.
patch
(
__file__
,
ldm
.
modules
.
diffusionmodules
.
openaimodel
.
UNetModel
,
"forward"
,
sd_unet
.
UNetModel_forward
)
sgm_original_forward
=
patches
.
patch
(
__file__
,
sgm
.
modules
.
diffusionmodules
.
openaimodel
.
UNetModel
,
"forward"
,
sd_unet
.
UNetModel_forward
)
def
list_optimizers
():
new_optimizers
=
script_callbacks
.
list_optimizers_callback
()
...
...
@@ -239,10 +242,13 @@ class StableDiffusionModelHijack:
self
.
layers
=
flatten
(
m
)
if
not
hasattr
(
ldm
.
modules
.
diffusionmodules
.
openaimodel
,
'copy_of_UNetModel_forward_for_webui'
):
ldm
.
modules
.
diffusionmodules
.
openaimodel
.
copy_of_UNetModel_forward_for_webui
=
ldm
.
modules
.
diffusionmodules
.
openaimodel
.
UNetModel
.
forward
if
isinstance
(
m
,
ldm
.
models
.
diffusion
.
ddpm
.
LatentDiffusion
):
sd_unet
.
original_forward
=
ldm_original_forward
elif
isinstance
(
m
,
sgm
.
models
.
diffusion
.
DiffusionEngine
):
sd_unet
.
original_forward
=
sgm_original_forward
else
:
sd_unet
.
original_forward
=
None
ldm
.
modules
.
diffusionmodules
.
openaimodel
.
UNetModel
.
forward
=
sd_unet
.
UNetModel_forward
def
undo_hijack
(
self
,
m
):
conditioner
=
getattr
(
m
,
'conditioner'
,
None
)
...
...
@@ -279,7 +285,8 @@ class StableDiffusionModelHijack:
self
.
layers
=
None
self
.
clip
=
None
ldm
.
modules
.
diffusionmodules
.
openaimodel
.
UNetModel
.
forward
=
ldm
.
modules
.
diffusionmodules
.
openaimodel
.
copy_of_UNetModel_forward_for_webui
sd_unet
.
original_forward
=
None
def
apply_circular
(
self
,
enable
):
if
self
.
circular_enabled
==
enable
:
...
...
modules/sd_unet.py
View file @
59544321
import
torch.nn
import
ldm.modules.diffusionmodules.openaimodel
from
modules
import
script_callbacks
,
shared
,
devices
unet_options
=
[]
current_unet_option
=
None
current_unet
=
None
original_forward
=
None
def
list_unets
():
...
...
@@ -88,5 +88,5 @@ def UNetModel_forward(self, x, timesteps=None, context=None, *args, **kwargs):
if
current_unet
is
not
None
:
return
current_unet
.
forward
(
x
,
timesteps
,
context
,
*
args
,
**
kwargs
)
return
ldm
.
modules
.
diffusionmodules
.
openaimodel
.
copy_of_UNetModel_forward_for_webui
(
self
,
x
,
timesteps
,
context
,
*
args
,
**
kwargs
)
return
original_forward
(
self
,
x
,
timesteps
,
context
,
*
args
,
**
kwargs
)
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