From 6246901ee5a1d9baa1fa89e0e00b55d396fe00df Mon Sep 17 00:00:00 2001 From: Jesse Andrews Date: Wed, 1 Feb 2023 22:26:31 +0000 Subject: [PATCH 1/5] allow jpeg files in addition to jpg files --- lora_diffusion/cli_lora_pti.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lora_diffusion/cli_lora_pti.py b/lora_diffusion/cli_lora_pti.py index 7cc8d92..94dea8e 100644 --- a/lora_diffusion/cli_lora_pti.py +++ b/lora_diffusion/cli_lora_pti.py @@ -382,7 +382,7 @@ def train_inversion( # open all images in test_image_path images = [] for file in os.listdir(test_image_path): - if file.endswith(".png") or file.endswith(".jpg"): + if file.endswith(".png") or file.endswith(".jpg") or file.endswith(".jpeg"): images.append( Image.open(os.path.join(test_image_path, file)) ) From 872a1926dabb808bd6a06e8b0f2fd60e90d96417 Mon Sep 17 00:00:00 2001 From: Levi McCallum Date: Wed, 1 Feb 2023 16:32:44 -0800 Subject: [PATCH 2/5] Support prefix text for blip captioning --- lora_diffusion/preprocess_files.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lora_diffusion/preprocess_files.py b/lora_diffusion/preprocess_files.py index bc54eea..bedb89f 100644 --- a/lora_diffusion/preprocess_files.py +++ b/lora_diffusion/preprocess_files.py @@ -121,6 +121,7 @@ def clipseg_mask_generator( @torch.no_grad() def blip_captioning_dataset( images: List[Image.Image], + text: Optional[str] = None, model_id: Literal[ "Salesforce/blip-image-captioning-large", "Salesforce/blip-image-captioning-base", @@ -139,7 +140,7 @@ def blip_captioning_dataset( captions = [] for image in tqdm(images): - inputs = processor(image, return_tensors="pt").to("cuda") + inputs = processor(image, text=text, return_tensors="pt").to("cuda") out = model.generate( **inputs, max_length=150, do_sample=True, top_k=50, temperature=0.7 ) @@ -243,6 +244,7 @@ def _center_of_mass(mask: Image.Image): def load_and_save_masks_and_captions( files: Union[str, List[str]], output_dir: str, + caption_text: Optional[str] = None, target_prompts: Optional[Union[List[str], str]] = None, target_size: int = 512, crop_based_on_salience: bool = True, @@ -277,7 +279,7 @@ def load_and_save_masks_and_captions( # captions print(f"Generating {len(images)} captions...") - captions = blip_captioning_dataset(images) + captions = blip_captioning_dataset(images, text=caption_text) if target_prompts is None: target_prompts = captions From 960ed6a16fe1b974db1ceb1885f0ab9171c29d23 Mon Sep 17 00:00:00 2001 From: SimoRyu Date: Thu, 2 Feb 2023 15:30:43 +0000 Subject: [PATCH 3/5] jpeg --- lora_diffusion/dataset.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lora_diffusion/dataset.py b/lora_diffusion/dataset.py index a8e81b0..9a6dfec 100644 --- a/lora_diffusion/dataset.py +++ b/lora_diffusion/dataset.py @@ -139,9 +139,11 @@ def __init__( self.captions = open(f"{instance_data_root}/caption.txt").readlines() else: - possibily_src_images = glob.glob( - str(instance_data_root) + "/*.jpg" - ) + glob.glob(str(instance_data_root) + "/*.png") + possibily_src_images = ( + glob.glob(str(instance_data_root) + "/*.jpg") + + glob.glob(str(instance_data_root) + "/*.png") + + glob.glob(str(instance_data_root) + "/*.jpeg") + ) possibily_src_images = ( set(possibily_src_images) - set(glob.glob(str(instance_data_root) + "/*mask.png")) From 117aceda7f33c4c0ce39a74fd6353a099e3cdb48 Mon Sep 17 00:00:00 2001 From: SimoRyu Date: Thu, 2 Feb 2023 15:32:38 +0000 Subject: [PATCH 4/5] notimple error for now --- lora_diffusion/dataset.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lora_diffusion/dataset.py b/lora_diffusion/dataset.py index 9a6dfec..eed4403 100644 --- a/lora_diffusion/dataset.py +++ b/lora_diffusion/dataset.py @@ -205,6 +205,8 @@ def __init__( self._length = self.num_instance_images if class_data_root is not None: + assert NotImplementedError, "Prior preservation is not implemented yet." + self.class_data_root = Path(class_data_root) self.class_data_root.mkdir(parents=True, exist_ok=True) self.class_images_path = list(self.class_data_root.iterdir()) From 624fa9cf5bb0398f9d241a73af0c2bc3054d1ee8 Mon Sep 17 00:00:00 2001 From: SimoRyu Date: Thu, 2 Feb 2023 15:33:30 +0000 Subject: [PATCH 5/5] version --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index b27850c..d49c151 100644 --- a/setup.py +++ b/setup.py @@ -6,7 +6,7 @@ setup( name="lora_diffusion", py_modules=["lora_diffusion"], - version="0.1.4", + version="0.1.5", description="Low Rank Adaptation for Diffusion Models. Works with Stable Diffusion out-of-the-box.", author="Simo Ryu", packages=find_packages(),