Merge branch 'main' into bugfix/ignore-dot-directories-on-model-scan

This commit is contained in:
Lincoln Stein
2023-10-14 10:37:55 -04:00
committed by GitHub
53 changed files with 3472 additions and 878 deletions

View File

@ -662,7 +662,7 @@ def default_ramcache() -> float:
def default_startup_options(init_file: Path) -> Namespace:
opts = InvokeAIAppConfig.get_config()
opts.ram = default_ramcache()
opts.ram = opts.ram or default_ramcache()
return opts