minor fixes

This commit is contained in:
Vladimir Mandic
2023-05-17 06:15:18 -04:00
parent 5250ba4be3
commit f6f1a73b39
5 changed files with 10 additions and 5 deletions
+3 -1
View File
@@ -236,7 +236,9 @@ def check_torch():
xformers_package = os.environ.get('XFORMERS_PACKAGE', 'none')
else:
machine = platform.machine()
if allow_directml and ('arm' not in machine and 'aarch' not in machine and args.use_directml):
if sys.platform == 'darwin':
torch_command = os.environ.get('TORCH_COMMAND', 'torch==2.0.0 torchvision==0.15.1')
elif allow_directml and args.use_directml and ('arm' not in machine and 'aarch' not in machine):
log.info('Using DirectML Backend')
torch_command = os.environ.get('TORCH_COMMAND', 'torch-directml')
xformers_package = os.environ.get('XFORMERS_PACKAGE', 'none')
+3 -1
View File
@@ -81,7 +81,9 @@ svg.feather.feather-image, .feather .feather-image { display: none }
#quicksettings .gr-button-tool { font-size: 1.6rem; box-shadow: none; margin-left: -20px; margin-top: -2px; height: 2.4em; }
#quicksettings > div, #quicksettings > fieldset { min-width: 24em; max-width: 26em; line-height: 2em; }
#refresh_sd_model_checkpoint { height: 48px; margin-left: -14px; background: #333333; box-shadow: none; }
#refresh_txt2img_styles, #refresh_img2img_styles, #open_folder_txt2img, #open_folder_img2img, #open_folder_extras, #footer, #style_pos_col, #style_neg_col, #roll_col, #extras_upscaler_2, #extras_upscaler_2_visibility, #txt2img_seed_resize_from_w, #txt2img_seed_resize_from_h { display: none; }
#open_folder_extras, #footer, #style_pos_col, #style_neg_col, #roll_col, #extras_upscaler_2, #extras_upscaler_2_visibility, #txt2img_seed_resize_from_w, #txt2img_seed_resize_from_h { display: none; }
#refresh_txt2img_styles, #refresh_img2img_styles { height: 40px; }
#open_folder_txt2img, #open_folder_img2img { }
#save-animation { border-radius: 0 !important; margin-bottom: 16px; background-color: #111111; }
#script_list { padding: 4px; margin-top: 20px; margin-bottom: 20px; }
#settings > div.flex-wrap { width: 15em; }
+1 -1
View File
@@ -11,8 +11,8 @@ sys.argv += shlex.split(commandline_args)
import installer
installer.add_args()
installer.ensure_base_requirements()
installer.extensions_preload(force=False)
installer.parse_args()
installer.extensions_preload(force=False)
import modules.cmd_args
args, _ = modules.cmd_args.parser.parse_known_args()
+2 -1
View File
@@ -86,7 +86,8 @@ def compatibility_args(opts, args):
group.add_argument("--sub-quad-chunk-threshold", help=argparse.SUPPRESS, default=opts.sub_quad_chunk_threshold)
group.add_argument("--lora-dir", help=argparse.SUPPRESS, default=opts.lora_dir)
group.add_argument("--lyco-dir", help=argparse.SUPPRESS, default=opts.lyco_dir)
group.add_argument("--enable-console-prompts", help=argparse.SUPPRESS, default=False)
group.add_argument("--enable-console-prompts", help=argparse.SUPPRESS, action='store_true', default=False)
group.add_argument("--safe", help=argparse.SUPPRESS, action='store_true', default=False)
# removed opts are added here with fixed values for compatibility reasons
opts.use_old_emphasis_implementation = False