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
c9c8485b
Commit
c9c8485b
authored
Aug 23, 2023
by
AUTOMATIC1111
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'release_candidate'
parents
68f336bd
31f2be3d
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
19 additions
and
5 deletions
+19
-5
CHANGELOG.md
CHANGELOG.md
+7
-0
modules/call_queue.py
modules/call_queue.py
+3
-1
modules/errors.py
modules/errors.py
+2
-1
modules/sd_hijack_optimizations.py
modules/sd_hijack_optimizations.py
+2
-2
modules/sysinfo.py
modules/sysinfo.py
+5
-1
No files found.
CHANGELOG.md
View file @
c9c8485b
## 1.5.2
### Bug Fixes:
*
fix memory leak when generation fails
*
update doggettx cross attention optimization to not use an unreasonable amount of memory in some edge cases -- suggestion by MorkTheOrk
## 1.5.1
### Minor:
...
...
modules/call_queue.py
View file @
c9c8485b
...
...
@@ -3,7 +3,7 @@ import html
import
threading
import
time
from
modules
import
shared
,
progress
,
errors
from
modules
import
shared
,
progress
,
errors
,
devices
queue_lock
=
threading
.
Lock
()
...
...
@@ -75,6 +75,8 @@ def wrap_gradio_call(func, extra_outputs=None, add_stats=False):
error_message
=
f
'{type(e).__name__}: {e}'
res
=
extra_outputs_array
+
[
f
"<div class='error'>{html.escape(error_message)}</div>"
]
devices
.
torch_gc
()
shared
.
state
.
skipped
=
False
shared
.
state
.
interrupted
=
False
shared
.
state
.
job_count
=
0
...
...
modules/errors.py
View file @
c9c8485b
...
...
@@ -14,7 +14,8 @@ def record_exception():
if
exception_records
and
exception_records
[
-
1
]
==
e
:
return
exception_records
.
append
((
e
,
tb
))
from
modules
import
sysinfo
exception_records
.
append
(
sysinfo
.
format_exception
(
e
,
tb
))
if
len
(
exception_records
)
>
5
:
exception_records
.
pop
(
0
)
...
...
modules/sd_hijack_optimizations.py
View file @
c9c8485b
...
...
@@ -256,9 +256,9 @@ def split_cross_attention_forward(self, x, context=None, mask=None, **kwargs):
raise
RuntimeError
(
f
'Not enough memory, use lower resolution (max approx. {max_res}x{max_res}). '
f
'Need: {mem_required / 64 / gb:0.1f}GB free, Have:{mem_free_total / gb:0.1f}GB free'
)
slice_size
=
q
.
shape
[
1
]
//
steps
if
(
q
.
shape
[
1
]
%
steps
)
==
0
else
q
.
shape
[
1
]
slice_size
=
q
.
shape
[
1
]
//
steps
for
i
in
range
(
0
,
q
.
shape
[
1
],
slice_size
):
end
=
i
+
slice_size
end
=
min
(
i
+
slice_size
,
q
.
shape
[
1
])
s1
=
einsum
(
'b i d, b j d -> b i j'
,
q
[:,
i
:
end
],
k
)
s2
=
s1
.
softmax
(
dim
=-
1
,
dtype
=
q
.
dtype
)
...
...
modules/sysinfo.py
View file @
c9c8485b
...
...
@@ -109,11 +109,15 @@ def format_traceback(tb):
return
[[
f
"{x.filename}, line {x.lineno}, {x.name}"
,
x
.
line
]
for
x
in
traceback
.
extract_tb
(
tb
)]
def
format_exception
(
e
,
tb
):
return
{
"exception"
:
str
(
e
),
"traceback"
:
format_traceback
(
tb
)}
def
get_exceptions
():
try
:
from
modules
import
errors
return
[{
"exception"
:
str
(
e
),
"traceback"
:
format_traceback
(
tb
)}
for
e
,
tb
in
reversed
(
errors
.
exception_records
)]
return
list
(
reversed
(
errors
.
exception_records
))
except
Exception
as
e
:
return
str
(
e
)
...
...
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