From 2615870721ccbc0b6a0665f0bfa137dcc2ec18bf Mon Sep 17 00:00:00 2001 From: TGG Date: Thu, 28 Jul 2022 10:54:34 +0200 Subject: [PATCH 1/3] add support for webp --- guided_diffusion/image_datasets.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guided_diffusion/image_datasets.py b/guided_diffusion/image_datasets.py index 93022ae20..12e6fd49e 100644 --- a/guided_diffusion/image_datasets.py +++ b/guided_diffusion/image_datasets.py @@ -72,7 +72,7 @@ def _list_image_files_recursively(data_dir): for entry in sorted(bf.listdir(data_dir)): full_path = bf.join(data_dir, entry) ext = entry.split(".")[-1] - if "." in entry and ext.lower() in ["jpg", "jpeg", "png", "gif"]: + if "." in entry and ext.lower() in ["jpg", "jpeg", "png", "gif", "webp"]: results.append(full_path) elif bf.isdir(full_path): results.extend(_list_image_files_recursively(full_path)) From 1c50d8e804346b2482785741005bff63fa946891 Mon Sep 17 00:00:00 2001 From: TGG Date: Sun, 7 Aug 2022 23:09:01 +0200 Subject: [PATCH 2/3] allow random crop --- guided_diffusion/script_util.py | 1 + scripts/image_train.py | 2 ++ 2 files changed, 3 insertions(+) diff --git a/guided_diffusion/script_util.py b/guided_diffusion/script_util.py index 2bfdad9fc..7fed506ce 100644 --- a/guided_diffusion/script_util.py +++ b/guided_diffusion/script_util.py @@ -60,6 +60,7 @@ def model_and_diffusion_defaults(): resblock_updown=False, use_fp16=False, use_new_attention_order=False, + random_crop=False, ) res.update(diffusion_defaults()) return res diff --git a/scripts/image_train.py b/scripts/image_train.py index 38ec777d8..2abf2a5bc 100644 --- a/scripts/image_train.py +++ b/scripts/image_train.py @@ -35,6 +35,7 @@ def main(): batch_size=args.batch_size, image_size=args.image_size, class_cond=args.class_cond, + random_crop=args.random_crop, ) logger.log("training...") @@ -72,6 +73,7 @@ def create_argparser(): resume_checkpoint="", use_fp16=False, fp16_scale_growth=1e-3, + random_crop=False, ) defaults.update(model_and_diffusion_defaults()) parser = argparse.ArgumentParser() From d066248511732ee02db64a4285e74e125b9d2cc8 Mon Sep 17 00:00:00 2001 From: "philipp.haslbauer" Date: Wed, 10 Aug 2022 09:26:59 +0200 Subject: [PATCH 3/3] workaround: add kwargs --- guided_diffusion/script_util.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/guided_diffusion/script_util.py b/guided_diffusion/script_util.py index 2bfdad9fc..a753e9319 100644 --- a/guided_diffusion/script_util.py +++ b/guided_diffusion/script_util.py @@ -95,6 +95,7 @@ def create_model_and_diffusion( resblock_updown, use_fp16, use_new_attention_order, + **kwargs ): model = create_model( image_size, @@ -300,6 +301,7 @@ def sr_create_model_and_diffusion( use_scale_shift_norm, resblock_updown, use_fp16, + **kwargs ): model = sr_create_model( large_size,