From d7788760100b0fd0c49fd7a9b97b9d4c5293d496 Mon Sep 17 00:00:00 2001 From: Vladimir Mandic Date: Wed, 26 Jul 2023 19:48:36 -0400 Subject: [PATCH] minor css fixes --- TODO.md | 1 + javascript/amethyst-nightfall.css | 2 +- javascript/black-orange.css | 2 +- modules/textual_inversion/textual_inversion.py | 4 ++-- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/TODO.md b/TODO.md index f27aba3c0..8f771ec39 100644 --- a/TODO.md +++ b/TODO.md @@ -22,6 +22,7 @@ Stuff to be added, in no particular order... - Redo Prompt parser for diffusers - Add unCLIP model - Add ToMe support + - Add Training support - Technical debt: - Port **A1111** stuff - Port `p.all_hr_prompts` diff --git a/javascript/amethyst-nightfall.css b/javascript/amethyst-nightfall.css index 950d593b2..e209356c7 100644 --- a/javascript/amethyst-nightfall.css +++ b/javascript/amethyst-nightfall.css @@ -105,7 +105,7 @@ svg.feather.feather-image, .feather .feather-image { display: none } #txt2img_checkboxes, #img2img_checkboxes { background-color: transparent; } #txt2img_checkboxes, #img2img_checkboxes { margin-bottom: 0.2em; } #txt2img_gallery, #img2img_gallery, #extras_gallery { padding: 0; margin: 0; object-fit: contain; box-shadow: none; min-height: 0; } -#txt2img_actions_column, #img2img_actions_column { display: -webkit-box; -webkit-box-pack: justify; } +#txt2img_actions_column, #img2img_actions_column { flex-flow: wrap; justify-content: space-between; } #txt2img_enqueue_wrapper, #img2img_enqueue_wrapper { min-width: unset; width: 48%; } #txt2img_generate_box, #img2img_generate_box { min-width: unset; width: 48%; } diff --git a/javascript/black-orange.css b/javascript/black-orange.css index a4a1ace2c..8e4a520c2 100644 --- a/javascript/black-orange.css +++ b/javascript/black-orange.css @@ -103,7 +103,7 @@ svg.feather.feather-image, .feather .feather-image { display: none } #txt2img_checkboxes, #img2img_checkboxes { background-color: transparent; } #txt2img_checkboxes, #img2img_checkboxes { margin-bottom: 0.2em; } #txt2img_gallery, #img2img_gallery, #extras_gallery { padding: 0; margin: 0; object-fit: contain; box-shadow: none; min-height: 0; } -#txt2img_actions_column, #img2img_actions_column { display: -webkit-box; -webkit-box-pack: justify; } +#txt2img_actions_column, #img2img_actions_column { flex-flow: wrap; justify-content: space-between; } #txt2img_enqueue_wrapper, #img2img_enqueue_wrapper { min-width: unset; width: 48%; } #txt2img_generate_box, #img2img_generate_box { min-width: unset; width: 48%; } diff --git a/modules/textual_inversion/textual_inversion.py b/modules/textual_inversion/textual_inversion.py index ee4ae45f0..41c2f8de9 100644 --- a/modules/textual_inversion/textual_inversion.py +++ b/modules/textual_inversion/textual_inversion.py @@ -358,8 +358,6 @@ def validate_train_inputs(model_name, learn_rate, batch_size, gradient_step, dat assert save_model_every >= 0, "Save {name} must be positive or 0" assert isinstance(create_image_every, int), "Create image must be integer" assert create_image_every >= 0, "Create image must be positive or 0" - if save_model_every or create_image_every: - assert log_directory, "Log directory is empty" def train_embedding(id_task, embedding_name, learn_rate, batch_size, gradient_step, data_root, log_directory, training_width, training_height, varsize, steps, clip_grad_mode, clip_grad_value, shuffle_tags, tag_drop_out, latent_sampling_method, use_weight, create_image_every, save_embedding_every, template_filename, save_image_with_stored_embedding, preview_from_txt2img, preview_prompt, preview_negative_prompt, preview_steps, preview_sampler_index, preview_cfg_scale, preview_seed, preview_width, preview_height): # pylint: disable=unused-argument @@ -369,6 +367,8 @@ def train_embedding(id_task, embedding_name, learn_rate, batch_size, gradient_st create_image_every = create_image_every or 0 template_file = textual_inversion_templates.get(template_filename, None) validate_train_inputs(embedding_name, learn_rate, batch_size, gradient_step, data_root, template_file, template_filename, steps, save_embedding_every, create_image_every, log_directory, name="embedding") + if log_directory is None or log_directory == '': + log_directory = f"{os.path.join(shared.cmd_opts.data_dir, 'train/log/embeddings')}" template_file = template_file.path shared.state.job = "train-embedding"