optimum-rbln 0.7.2rc0__tar.gz → 0.7.2rc2__tar.gz

{optimum_rbln-0.7.2rc0 → optimum_rbln-0.7.2rc2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: optimum-rbln
-Version: 0.7.2rc0
+Version: 0.7.2rc2
 Summary: Optimum RBLN is the interface between the Hugging Face Transformers and Diffusers libraries and RBLN accelerators. It provides a set of tools enabling easy model loading and inference on single and multiple rbln device settings for different downstream tasks.
 Project-URL: Homepage, https://rebellions.ai
 Project-URL: Documentation, https://docs.rbln.ai

optimum_rbln-0.7.2rc2/examples/kandinsky2_2/run_kandinsky2_2_inpaint.py

@@ -0,0 +1,60 @@
+import os
+
+import fire
+import numpy as np
+import torch
+from diffusers.utils import load_image
+
+from optimum.rbln import RBLNKandinskyV22InpaintPipeline, RBLNKandinskyV22PriorPipeline
+
+
+def main(
+    prior_model_id: str = "kandinsky-community/kandinsky-2-2-prior",
+    inpaint_model_id: str = "kandinsky-community/kandinsky-2-2-decoder-inpaint",
+    from_diffusers: bool = False,
+    prompt: str = "a hat",
+):
+    img_url = "https://huggingface.co/datasets/hf-internal-testing/diffusers-images/resolve/main/kandinsky/cat.png"
+    init_image = load_image(img_url)
+
+    if from_diffusers:
+        prior_pipe = RBLNKandinskyV22PriorPipeline.from_pretrained(
+            model_id=prior_model_id,
+            export=True,
+        )
+        prior_pipe.save_pretrained(os.path.basename(prior_model_id))
+
+        pipe = RBLNKandinskyV22InpaintPipeline.from_pretrained(
+            model_id=inpaint_model_id,
+            export=True,
+        )
+        pipe.save_pretrained(os.path.basename(inpaint_model_id))
+    else:
+        prior_pipe = RBLNKandinskyV22PriorPipeline.from_pretrained(
+            model_id=os.path.basename(prior_model_id),
+            export=False,
+        )
+        pipe = RBLNKandinskyV22InpaintPipeline.from_pretrained(
+            model_id=os.path.basename(inpaint_model_id),
+            export=False,
+        )
+
+    generator = torch.manual_seed(42)
+    image_emb, zero_image_emb = prior_pipe(prompt, generator=generator, return_dict=False)
+
+    mask = np.zeros((512, 512), dtype=np.float32)
+    mask[:170, 170:-170] = 1
+
+    out = pipe(
+        image=init_image,
+        mask_image=mask,
+        image_embeds=image_emb,
+        negative_image_embeds=zero_image_emb,
+        generator=generator,
+    )
+    image = out.images[0]
+    image.save(f"{prompt}.png")
+
+
+if __name__ == "__main__":
+    fire.Fire(main)

{optimum_rbln-0.7.2rc0 → optimum_rbln-0.7.2rc2}/src/optimum/rbln/__version__.py

@@ -1,8 +1,13 @@
-# file generated by setuptools_scm
+# file generated by setuptools-scm
 # don't change, don't track in version control
+
+__all__ = ["__version__", "__version_tuple__", "version", "version_tuple"]
+
 TYPE_CHECKING = False
 if TYPE_CHECKING:
-    from typing import Tuple, Union
+    from typing import Tuple
+    from typing import Union
+
     VERSION_TUPLE = Tuple[Union[int, str], ...]
 else:
     VERSION_TUPLE = object
@@ -12,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.7.2rc0'
+__version__ = version = '0.7.2rc2'
 __version_tuple__ = version_tuple = (0, 7, 2)

{optimum_rbln-0.7.2rc0 → optimum_rbln-0.7.2rc2}/src/optimum/rbln/diffusers/modeling_diffusers.py

@@ -112,6 +112,11 @@ class RBLNDiffusionMixin:
             submodule_cls: RBLNModel = getattr(importlib.import_module("optimum.rbln"), f"{submodule_class_name}")
             prefix = cls._prefix.get(submodule_name, "")
             connected_submodules = cls._connected_classes.get(submodule_name)._submodules
+            pipe_global_config = {k: v for k, v in submodule_config.items() if k not in connected_submodules}
+            submodule_config = {k: v for k, v in submodule_config.items() if k in connected_submodules}
+            for key in submodule_config.keys():
+                submodule_config[key].update(pipe_global_config)
+
             for connected_submodule_name in connected_submodules:
                 connected_submodule_config = rbln_config.pop(prefix + connected_submodule_name, {})
                 if connected_submodule_name in submodule_config:
@@ -119,14 +124,17 @@ class RBLNDiffusionMixin:
                 else:
                     submodule_config[connected_submodule_name] = connected_submodule_config
 
-            submodules = copy.deepcopy(cls._submodules)
-            submodules += [prefix + connected_submodule_name for connected_submodule_name in connected_submodules]
+            pipe_global_config = {
+                k: v for k, v in rbln_config.items() if k != submodule_class_name and not isinstance(v, dict)
+            }
 
-            pipe_global_config = {k: v for k, v in rbln_config.items() if k not in submodules}
             for connected_submodule_name in connected_submodules:
-                submodule_config[connected_submodule_name].update(
-                    {k: v for k, v in pipe_global_config.items() if k not in submodule_config}
-                )
+                for k, v in pipe_global_config.items():
+                    if "guidance_scale" in k:
+                        if prefix + "guidance_scale" == k:
+                            submodule_config[connected_submodule_name]["guidance_scale"] = v
+                    else:
+                        submodule_config[connected_submodule_name][k] = v
             rbln_config[submodule_name] = submodule_config
         else:
             raise ValueError(f"submodule {submodule_name} isn't supported")
@@ -414,9 +422,16 @@ class RBLNDiffusionMixin:
         if rbln_config.get("optimize_host_memory") is False:
             # Keep compiled_model objs to further analysis. -> TODO: remove soon...
             model.compiled_models = []
-            for name in cls._submodules:
-                submodule = getattr(model, name)
-                model.compiled_models.extend(submodule.compiled_models)
+            if model._load_connected_pipes:
+                for name in cls._submodules:
+                    connected_pipe = getattr(model, name)
+                    for submodule_name in connected_pipe.__class__._submodules:
+                        submodule = getattr(connected_pipe, submodule_name)
+                        model.compiled_models.extend(submodule.compiled_models)
+            else:
+                for name in cls._submodules:
+                    submodule = getattr(model, name)
+                    model.compiled_models.extend(submodule.compiled_models)
 
         return model