From c869e9c99225c40d251be6b396222e9930d1d94e Mon Sep 17 00:00:00 2001 From: Vladimir Mandic Date: Thu, 14 Sep 2023 08:46:09 -0400 Subject: [PATCH] fix small grids --- modules/processing.py | 2 +- modules/sd_models.py | 2 +- modules/textual_inversion/autocrop.py | 4 +--- scripts/xyz_grid.py | 8 ++++---- 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/modules/processing.py b/modules/processing.py index b7bd2af1a..b5e437097 100644 --- a/modules/processing.py +++ b/modules/processing.py @@ -858,7 +858,7 @@ def process_images_inner(p: StableDiffusionProcessing) -> Processed: p.color_corrections = None index_of_first_image = 0 - if (shared.opts.return_grid or shared.opts.grid_save) and not p.do_not_save_grid and len(output_images) > 2: + if (shared.opts.return_grid or shared.opts.grid_save) and not p.do_not_save_grid and len(output_images) > 1: if images.check_grid_size(output_images): grid = images.image_grid(output_images, p.batch_size) if shared.opts.return_grid: diff --git a/modules/sd_models.py b/modules/sd_models.py index 8fba59aa1..01292eddc 100644 --- a/modules/sd_models.py +++ b/modules/sd_models.py @@ -131,7 +131,7 @@ class NoWatermark: def setup_model(): if not os.path.exists(model_path): - os.makedirs(model_path) + os.makedirs(model_path, exist_ok=True) list_models() enable_midas_autodownload() diff --git a/modules/textual_inversion/autocrop.py b/modules/textual_inversion/autocrop.py index 31abd782d..bac4e618e 100644 --- a/modules/textual_inversion/autocrop.py +++ b/modules/textual_inversion/autocrop.py @@ -295,10 +295,8 @@ def is_square(w, h): def download_and_cache_models(dirname): download_url = 'https://github.com/opencv/opencv_zoo/blob/91fb0290f50896f38a0ab1e558b74b16bc009428/models/face_detection_yunet/face_detection_yunet_2022mar.onnx?raw=true' model_file_name = 'face_detection_yunet.onnx' - if not os.path.exists(dirname): - os.makedirs(dirname) - + os.makedirs(dirname, exist_ok=True) cache_file = os.path.join(dirname, model_file_name) if not os.path.exists(cache_file): print(f"downloading face detection model from '{download_url}' to '{cache_file}'") diff --git a/scripts/xyz_grid.py b/scripts/xyz_grid.py index 4168d6790..28c46a999 100644 --- a/scripts/xyz_grid.py +++ b/scripts/xyz_grid.py @@ -400,10 +400,10 @@ class Script(scripts.Script): fill_z_button = ToolButton(value=symbols.fill, elem_id="xyz_grid_fill_z_tool_button", visible=False) with gr.Row(variant="compact", elem_id="axis_options"): draw_legend = gr.Checkbox(label='Draw legend', value=True, elem_id=self.elem_id("draw_legend")) - no_fixed_seeds = gr.Checkbox(label='Keep random for seeds', value=False, elem_id=self.elem_id("no_fixed_seeds")) - no_grid = gr.Checkbox(label='Do not create grid', value=False, elem_id=self.elem_id("no_xyz_grid")) - include_lone_images = gr.Checkbox(label='Include Sub Images', value=False, elem_id=self.elem_id("include_lone_images")) - include_sub_grids = gr.Checkbox(label='Include Sub Grids', value=False, elem_id=self.elem_id("include_sub_grids")) + no_fixed_seeds = gr.Checkbox(label='Keep random seeds', value=False, elem_id=self.elem_id("no_fixed_seeds")) + no_grid = gr.Checkbox(label='Skip grid', value=False, elem_id=self.elem_id("no_xyz_grid")) + include_lone_images = gr.Checkbox(label='Include sub images', value=False, elem_id=self.elem_id("include_lone_images")) + include_sub_grids = gr.Checkbox(label='Include sub grids', value=False, elem_id=self.elem_id("include_sub_grids")) with gr.Row(variant="compact", elem_id="axis_options"): margin_size = gr.Slider(label="Grid margins", minimum=0, maximum=500, value=0, step=2, elem_id=self.elem_id("margin_size")) with gr.Row(variant="compact", elem_id="swap_axes"):