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
96ee3eff
Commit
96ee3eff
authored
Nov 05, 2023
by
AUTOMATIC1111
Committed by
GitHub
Nov 05, 2023
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #13865 from Gothos/master
Add support for SSD-1B
parents
c3699d4f
ff805d8d
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
26 additions
and
3 deletions
+26
-3
CHANGELOG.md
CHANGELOG.md
+5
-0
modules/sd_hijack.py
modules/sd_hijack.py
+12
-0
modules/sd_models.py
modules/sd_models.py
+5
-2
modules/sd_models_types.py
modules/sd_models_types.py
+4
-1
No files found.
CHANGELOG.md
View file @
96ee3eff
## 1.6.1
### Bug Fixes:
*
fix an error causing the webui to fail to start (
[
#13839
](
https://github.com/AUTOMATIC1111/stable-diffusion-webui/pull/13839
)
)
## 1.6.0
### Features:
...
...
modules/sd_hijack.py
View file @
96ee3eff
...
...
@@ -183,6 +183,18 @@ class StableDiffusionModelHijack:
except
Exception
as
e
:
errors
.
display
(
e
,
"applying cross attention optimization"
)
undo_optimizations
()
def
conv_ssd
(
self
,
m
):
delattr
(
m
.
model
.
diffusion_model
.
middle_block
,
'1'
)
delattr
(
m
.
model
.
diffusion_model
.
middle_block
,
'2'
)
for
i
in
[
'9'
,
'8'
,
'7'
,
'6'
,
'5'
,
'4'
]:
delattr
(
m
.
model
.
diffusion_model
.
input_blocks
[
7
][
1
]
.
transformer_blocks
,
i
)
delattr
(
m
.
model
.
diffusion_model
.
input_blocks
[
8
][
1
]
.
transformer_blocks
,
i
)
delattr
(
m
.
model
.
diffusion_model
.
output_blocks
[
0
][
1
]
.
transformer_blocks
,
i
)
delattr
(
m
.
model
.
diffusion_model
.
output_blocks
[
1
][
1
]
.
transformer_blocks
,
i
)
delattr
(
m
.
model
.
diffusion_model
.
output_blocks
[
4
][
1
]
.
transformer_blocks
,
'1'
)
delattr
(
m
.
model
.
diffusion_model
.
output_blocks
[
5
][
1
]
.
transformer_blocks
,
'1'
)
devices
.
torch_gc
()
def
hijack
(
self
,
m
):
conditioner
=
getattr
(
m
,
'conditioner'
,
None
)
...
...
modules/sd_models.py
View file @
96ee3eff
...
...
@@ -352,10 +352,13 @@ def load_model_weights(model, checkpoint_info: CheckpointInfo, state_dict, timer
model
.
is_sdxl
=
hasattr
(
model
,
'conditioner'
)
model
.
is_sd2
=
not
model
.
is_sdxl
and
hasattr
(
model
.
cond_stage_model
,
'model'
)
model
.
is_sd1
=
not
model
.
is_sdxl
and
not
model
.
is_sd2
model
.
is_ssd
=
model
.
is_sdxl
and
'model.diffusion_model.middle_block.1.transformer_blocks.0.attn1.to_q.weight'
not
in
state_dict
.
keys
()
if
model
.
is_sdxl
:
sd_models_xl
.
extend_sdxl
(
model
)
if
model
.
is_ssd
:
sd_hijack
.
model_hijack
.
conv_ssd
(
model
)
if
shared
.
opts
.
sd_checkpoint_cache
>
0
:
# cache newly loaded model
checkpoints_loaded
[
checkpoint_info
]
=
state_dict
.
copy
()
...
...
modules/sd_models_types.py
View file @
96ee3eff
...
...
@@ -22,7 +22,10 @@ class WebuiSdModel(LatentDiffusion):
"""structure with additional information about the file with model's weights"""
is_sdxl
:
bool
"""True if the model's architecture is SDXL"""
"""True if the model's architecture is SDXL or SSD"""
is_ssd
:
bool
"""True if the model is SSD"""
is_sd2
:
bool
"""True if the model's architecture is SD 2.x"""
...
...
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