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
5159edbf
Commit
5159edbf
authored
Aug 20, 2023
by
Uminosachi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Store base_vae and loaded_vae_file in sd_model
parent
042e1d5d
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
16 deletions
+8
-16
modules/sd_models.py
modules/sd_models.py
+8
-16
No files found.
modules/sd_models.py
View file @
5159edbf
...
...
@@ -462,7 +462,6 @@ class SdModelData:
def
__init__
(
self
):
self
.
sd_model
=
None
self
.
loaded_sd_models
=
[]
self
.
loaded_vae_states
=
{}
self
.
was_loaded_at_least_once
=
False
self
.
lock
=
threading
.
Lock
()
...
...
@@ -489,24 +488,19 @@ class SdModelData:
def
set_sd_model
(
self
,
v
,
already_loaded
=
False
):
self
.
sd_model
=
v
if
already_loaded
:
sd_vae_state
=
self
.
loaded_vae_states
.
get
(
v
.
sd_model_hash
,
{})
sd_vae
.
base_vae
=
sd_vae_state
.
get
(
"base_vae"
,
None
)
sd_vae
.
loaded_vae_file
=
sd_vae_state
.
get
(
"loaded_vae_file"
,
None
)
sd_vae
.
checkpoint_info
=
sd_vae_state
.
get
(
"checkpoint_info"
,
None
)
sd_vae
.
base_vae
=
getattr
(
v
,
"base_vae"
,
None
)
sd_vae
.
loaded_vae_file
=
getattr
(
v
,
"loaded_vae_file"
,
None
)
sd_vae
.
checkpoint_info
=
v
.
sd_checkpoint_info
try
:
self
.
loaded_sd_models
.
remove
(
v
)
self
.
loaded_vae_states
.
pop
(
v
.
sd_model_hash
,
{})
.
clear
()
except
ValueError
:
pass
if
v
is
not
None
:
setattr
(
v
,
"base_vae"
,
sd_vae
.
base_vae
)
setattr
(
v
,
"loaded_vae_file"
,
sd_vae
.
loaded_vae_file
)
self
.
loaded_sd_models
.
insert
(
0
,
v
)
self
.
loaded_vae_states
[
v
.
sd_model_hash
]
=
dict
(
base_vae
=
sd_vae
.
base_vae
,
loaded_vae_file
=
sd_vae
.
loaded_vae_file
,
checkpoint_info
=
sd_vae
.
checkpoint_info
,
)
model_data
=
SdModelData
()
...
...
@@ -661,7 +655,6 @@ def reuse_model_from_already_loaded(sd_model, checkpoint_info, timer):
if
len
(
model_data
.
loaded_sd_models
)
>
shared
.
opts
.
sd_checkpoints_limit
>
0
:
print
(
f
"Unloading model {len(model_data.loaded_sd_models)} over the limit of {shared.opts.sd_checkpoints_limit}: {loaded_model.sd_checkpoint_info.title}"
)
model_data
.
loaded_sd_models
.
pop
()
model_data
.
loaded_vae_states
.
pop
(
loaded_model
.
sd_model_hash
,
{})
.
clear
()
send_model_to_trash
(
loaded_model
)
timer
.
record
(
"send model to trash"
)
...
...
@@ -691,10 +684,9 @@ def reuse_model_from_already_loaded(sd_model, checkpoint_info, timer):
sd_model
=
model_data
.
loaded_sd_models
.
pop
()
model_data
.
sd_model
=
sd_model
sd_vae_state
=
model_data
.
loaded_vae_states
.
pop
(
sd_model
.
sd_model_hash
,
{})
sd_vae
.
base_vae
=
sd_vae_state
.
get
(
"base_vae"
,
None
)
sd_vae
.
loaded_vae_file
=
sd_vae_state
.
get
(
"loaded_vae_file"
,
None
)
sd_vae
.
checkpoint_info
=
sd_vae_state
.
get
(
"checkpoint_info"
,
None
)
sd_vae
.
base_vae
=
getattr
(
sd_model
,
"base_vae"
,
None
)
sd_vae
.
loaded_vae_file
=
getattr
(
sd_model
,
"loaded_vae_file"
,
None
)
sd_vae
.
checkpoint_info
=
sd_model
.
sd_checkpoint_info
print
(
f
"Reusing loaded model {sd_model.sd_checkpoint_info.title} to load {checkpoint_info.title}"
)
return
sd_model
...
...
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