diff --git a/configs/stable-diffusion/inpainting/v1-edgeinpainting.yaml b/configs/stable-diffusion/inpainting/v1-edgeinpainting.yaml index 2c28072..eb786e1 100644 --- a/configs/stable-diffusion/inpainting/v1-edgeinpainting.yaml +++ b/configs/stable-diffusion/inpainting/v1-edgeinpainting.yaml @@ -17,10 +17,10 @@ model: scale_factor: 0.18215 ckpt_path: "/fsx/stable-diffusion/stable-diffusion/checkpoints/v1pp/v1pp-flatlined-hr.ckpt" - #concat_keys: - # - mask - # - masked_image - # - smoothing_strength + concat_keys: + - mask + - masked_image + - smoothing_strength c_concat_log_start: 1 c_concat_log_end: 5 @@ -38,7 +38,7 @@ model: target: ldm.modules.diffusionmodules.openaimodel.UNetModel params: image_size: 32 # unused - in_channels: 9 # 4 data + 4 downscaled image + 1 mask + in_channels: 10 # 4 data + 4 downscaled image + 1 mask + 1 smoothing strength out_channels: 4 model_channels: 320 attention_resolutions: [ 4, 2, 1 ] diff --git a/ldm/data/laion.py b/ldm/data/laion.py index f256690..591896b 100644 --- a/ldm/data/laion.py +++ b/ldm/data/laion.py @@ -268,7 +268,7 @@ class AddEdge(PRNGMixin): assert mode in list(MASK_MODES.keys()), f'unknown mask generation mode "{mode}"' self.make_mask = MASK_MODES[mode] self.n_down_choices = [0] - self.sigma_choices = [1] + self.sigma_choices = [1, 2] self.mask_edges = mask_edges @torch.no_grad() diff --git a/scripts/slurm/v1_edgeinpainting/launcher.sh b/scripts/slurm/v1_edgeinpainting/launcher.sh index d9618a9..8d148f2 100755 --- a/scripts/slurm/v1_edgeinpainting/launcher.sh +++ b/scripts/slurm/v1_edgeinpainting/launcher.sh @@ -24,7 +24,7 @@ cd /fsx/stable-diffusion/stable-diffusion CONFIG="/fsx/stable-diffusion/stable-diffusion/configs/stable-diffusion/inpainting/v1-edgeinpainting.yaml" # start without masking -EXTRA="data.params.train.postprocess.params.mask_edges=false" +EXTRA="data.params.train.postprocess.params.mask_edges=false -f _extracat" # resume and set new seed to reshuffle data #EXTRA="--seed 543 --resume_from_checkpoint ..."