Merge branch 'main' into patch-1

This commit is contained in:
Lincoln Stein 2023-01-17 14:57:17 -05:00 committed by GitHub
commit 529b19f8f6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 1 deletions

View File

@ -119,6 +119,7 @@ jobs:
run: >
configure_invokeai.py
--yes
--default_only
--full-precision # can't use fp16 weights without a GPU
- name: Run the tests

View File

@ -197,6 +197,14 @@ def recommended_datasets()->dict:
datasets[ds]=True
return datasets
#---------------------------------------------
def default_dataset()->dict:
datasets = dict()
for ds in Datasets.keys():
if Datasets[ds].get('default',False):
datasets[ds]=True
return datasets
#---------------------------------------------
def all_datasets()->dict:
datasets = dict()
@ -646,7 +654,7 @@ def download_weights(opt:dict) -> Union[str, None]:
precision = 'float32' if opt.full_precision else choose_precision(torch.device(choose_torch_device()))
if opt.yes_to_all:
models = recommended_datasets()
models = default_dataset() if opt.default_only else recommended_datasets()
access_token = authenticate(opt.yes_to_all)
if len(models)>0:
successfully_downloaded = download_weight_datasets(models, access_token, precision=precision)
@ -808,6 +816,9 @@ def main():
dest='yes_to_all',
action='store_true',
help='answer "yes" to all prompts')
parser.add_argument('--default_only',
action='store_true',
help='when --yes specified, only install the default model')
parser.add_argument('--config_file',
'-c',
dest='config_file',