happyz
/
Fooocus
mirror of https://github.com/lllyasviel/Fooocus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/add-preset-selection' 

# Conflicts:
#	launch.py
#	webui.py
This commit is contained in:
Manuel Schmid 2024-02-19 00:10:42 +01:00
parent 78e75fd040 6d9e0e6f95
commit 17285c63e5
No known key found for this signature in database
GPG Key ID: 32C4F7569B40B84B
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
launch.py
View File

@ -77,7 +77,6 @@ prepare_environment()
build_launcher()
args = ini_args()
if args.gpu_device_id is not None:
os.environ['CUDA_VISIBLE_DEVICES'] = str(args.gpu_device_id)
print("Set device to:", args.gpu_device_id)

13
webui.py
View File

@ -632,15 +632,18 @@ with shared.gradio_root:
preset_content = modules.config.try_get_preset_content(preset) if preset != 'initial' else {}
preset_prepared = modules.meta_parser.parse_meta_from_preset(preset_content)
default_model = preset_prepared['base_model']
previous_default_models = preset_prepared['previous_default_models']
checkpoint_downloads = preset_prepared['checkpoint_downloads']
embeddings_downloads = preset_prepared['embeddings_downloads']
lora_downloads = preset_prepared['lora_downloads']
default_model = preset_prepared.get('base_model')
previous_default_models = preset_prepared.get('previous_default_models', [])
checkpoint_downloads = preset_prepared.get('checkpoint_downloads', {})
embeddings_downloads = preset_prepared.get('embeddings_downloads', {})
lora_downloads = preset_prepared.get('lora_downloads', {})
preset_prepared['base_model'], preset_prepared['lora_downloads'] = launch.download_models(
default_model, previous_default_models, checkpoint_downloads, embeddings_downloads, lora_downloads)
if 'prompt' in preset_prepared and preset_prepared.get('prompt') == '':
del preset_prepared['prompt']
return modules.meta_parser.load_parameter_button_click(json.dumps(preset_prepared), is_generating)
preset_selection.change(preset_selection_change, inputs=[preset_selection, state_is_generating], outputs=load_data_outputs, queue=False, show_progress=True) \