Mirrored_Repos/InvokeAI
1
0
Fork 0
mirror of https://github.com/invoke-ai/InvokeAI synced 2024-08-30 20:32:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

correct solution to crash

Browse Source
This commit is contained in:
Lincoln Stein 2023-08-24 21:01:47 -04:00 committed by Kent Keirsey
parent 8114fc7bc2
commit 0bf5fee1b2
2 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
invokeai/backend/install/invokeai_configure.py
View File

@ -50,7 +50,6 @@ from invokeai.frontend.install.model_install import addModelsForm, process_and_e
# TO DO - Move all the frontend code into invokeai.frontend.install # TO DO - Move all the frontend code into invokeai.frontend.install
from invokeai.frontend.install.widgets import ( from invokeai.frontend.install.widgets import (
SingleSelectColumns,
SingleSelectColumnsSimple, SingleSelectColumnsSimple,
MultiSelectColumns, MultiSelectColumns,
CenteredButtonPress, CenteredButtonPress,
@ -409,7 +408,7 @@ Use cursor arrows to make a checkbox selection, and space to toggle.
SingleSelectColumnsSimple, SingleSelectColumnsSimple,
columns=len(DEVICE_CHOICES), columns=len(DEVICE_CHOICES),
values=DEVICE_CHOICES, values=DEVICE_CHOICES,
value=DEVICE_CHOICES.index(device), value=[DEVICE_CHOICES.index(device)],
begin_entry_at=3, begin_entry_at=3,
relx=30, relx=30,
max_height=2, max_height=2,
@ -429,7 +428,7 @@ Use cursor arrows to make a checkbox selection, and space to toggle.
SingleSelectColumnsSimple, SingleSelectColumnsSimple,
columns=len(ATTENTION_CHOICES), columns=len(ATTENTION_CHOICES),
values=ATTENTION_CHOICES, values=ATTENTION_CHOICES,
value=ATTENTION_CHOICES.index(attention_type), value=[ATTENTION_CHOICES.index(attention_type)],
begin_entry_at=3, begin_entry_at=3,
max_height=2, max_height=2,
relx=30, relx=30,
@ -451,14 +450,13 @@ Use cursor arrows to make a checkbox selection, and space to toggle.
SingleSelectColumnsSimple, SingleSelectColumnsSimple,
columns=len(ATTENTION_SLICE_CHOICES), columns=len(ATTENTION_SLICE_CHOICES),
values=ATTENTION_SLICE_CHOICES, values=ATTENTION_SLICE_CHOICES,
value=ATTENTION_SLICE_CHOICES.index(attention_slice_size), value=[ATTENTION_SLICE_CHOICES.index(attention_slice_size)],
relx=30, relx=30,
hidden=attention_type != "sliced", hidden=attention_type != "sliced",
max_height=2, max_height=2,
max_width=110, max_width=110,
scroll_exit=True, scroll_exit=True,
) )
self.add_widget_intelligent( self.add_widget_intelligent(
npyscreen.TitleFixedText, npyscreen.TitleFixedText,
name="Model RAM cache size (GB). Make this at least large enough to hold a single full model.", name="Model RAM cache size (GB). Make this at least large enough to hold a single full model.",
@ -609,13 +607,7 @@ https://huggingface.co/stabilityai/stable-diffusion-xl-base-1.0/blob/main/LICENS
new_opts.precision = PRECISION_CHOICES[self.precision.value[0]] new_opts.precision = PRECISION_CHOICES[self.precision.value[0]]
new_opts.device = DEVICE_CHOICES[self.device.value[0]] new_opts.device = DEVICE_CHOICES[self.device.value[0]]
new_opts.attention_type = ATTENTION_CHOICES[self.attention_type.value[0]] new_opts.attention_type = ATTENTION_CHOICES[self.attention_type.value[0]]
new_opts.attention_slice_size = ATTENTION_SLICE_CHOICES[self.attention_slice_size.value[0]]
# some sort of bug in npyscreen?
attention_slice_value = self.attention_slice_size.value
if type(attention_slice_value) == list:
attention_slice_value = attention_slice_value[0]
new_opts.attention_slice_size = ATTENTION_SLICE_CHOICES[attention_slice_value]
generation_options = [GENERATION_OPT_CHOICES[x] for x in self.generation_options.value] generation_options = [GENERATION_OPT_CHOICES[x] for x in self.generation_options.value]
for v in GENERATION_OPT_CHOICES: for v in GENERATION_OPT_CHOICES:
setattr(new_opts, v, v in generation_options) setattr(new_opts, v, v in generation_options)

7
invokeai/frontend/install/widgets.py
View File

@ -264,6 +264,8 @@ class SingleSelectWithChanged(npyscreen.SelectOne):
class SingleSelectColumnsSimple(SelectColumnBase, SingleSelectWithChanged): class SingleSelectColumnsSimple(SelectColumnBase, SingleSelectWithChanged):
"""Row of radio buttons. Spacebar to select."""
def __init__(self, screen, columns: int = 1, values: list = [], **keywords): def __init__(self, screen, columns: int = 1, values: list = [], **keywords):
self.columns = columns self.columns = columns
self.value_cnt = len(values) self.value_cnt = len(values)
@ -271,9 +273,6 @@ class SingleSelectColumnsSimple(SelectColumnBase, SingleSelectWithChanged):
self.on_changed = None self.on_changed = None
super().__init__(screen, values=values, **keywords) super().__init__(screen, values=values, **keywords)
def when_value_edited(self):
self.h_select(self.cursor_line)
def h_cursor_line_right(self, ch): def h_cursor_line_right(self, ch):
self.h_exit_down("bye bye") self.h_exit_down("bye bye")
@ -282,6 +281,8 @@ class SingleSelectColumnsSimple(SelectColumnBase, SingleSelectWithChanged):
class SingleSelectColumns(SingleSelectColumnsSimple): class SingleSelectColumns(SingleSelectColumnsSimple):
"""Row of radio buttons. When tabbing over a selection, it is auto selected."""
def when_cursor_moved(self): def when_cursor_moved(self):
self.h_select(self.cursor_line) self.h_select(self.cursor_line)