optimum-rbln 0.7.4a7__tar.gz → 0.7.4a9__tar.gz

{optimum_rbln-0.7.4a7 → optimum_rbln-0.7.4a9}/.github/ISSUE_TEMPLATE/model_request.md

@@ -8,7 +8,7 @@ assignees: ''
 
 ### Model Information
 - Model name: 
-- Model link (Hugging Face/Paper/GitHub): 
+- Model link (HuggingFace/Paper/GitHub): 
 - Task type (e.g., Text Generation, Image Classification): 
 
 ### Model Details

{optimum_rbln-0.7.4a7 → optimum_rbln-0.7.4a9}/.github/scripts/auto_code_review.py

@@ -36,7 +36,7 @@ def get_pr_diff():
 
 
 def get_prompt(diff, pr):
-    system_prompt = """You are an experienced software engineer specializing in code reviews for deep learning libraries. Your task is to review code changes and related pull request (PR) information for `optimum-rbln`, a Python library that optimizes Hugging Face models for execution on RBLN NPUs.
+    system_prompt = """You are an experienced software engineer specializing in code reviews for deep learning libraries. Your task is to review code changes and related pull request (PR) information for `optimum-rbln`, a Python library that optimizes HuggingFace models for execution on RBLN NPUs.
 
 Focus on providing actionable and constructive feedback. Don't make generalized suggestions."""
 

{optimum_rbln-0.7.4a7 → optimum_rbln-0.7.4a9}/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.4
 Name: optimum-rbln
-Version: 0.7.4a7
-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.
+Version: 0.7.4a9
+Summary: Optimum RBLN is the interface between the HuggingFace 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
 Project-URL: Repository, https://github.com/rebellions-sw/optimum-rbln

{optimum_rbln-0.7.4a7 → optimum_rbln-0.7.4a9}/pyproject.toml

@@ -1,7 +1,7 @@
 [project]
 name = "optimum-rbln"
 description = """
-Optimum RBLN is the interface between the Hugging Face Transformers and Diffusers libraries and RBLN accelerators.
+Optimum RBLN is the interface between the HuggingFace 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.
 """
 authors = [

{optimum_rbln-0.7.4a7 → optimum_rbln-0.7.4a9}/src/optimum/rbln/__version__.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.7.4a7'
-__version_tuple__ = version_tuple = (0, 7, 4, 'a7')
+__version__ = version = '0.7.4a9'
+__version_tuple__ = version_tuple = (0, 7, 4, 'a9')

{optimum_rbln-0.7.4a7 → optimum_rbln-0.7.4a9}/src/optimum/rbln/configuration_utils.py

@@ -174,6 +174,14 @@ class RBLNAutoConfig:
         cls = getattr(importlib.import_module("optimum.rbln"), cls_name)
         return cls(**kwargs)
 
+    @staticmethod
+    def load_from_dict(config_dict: Dict[str, Any]) -> "RBLNModelConfig":
+        cls_name = config_dict.get("cls_name")
+        if cls_name is None:
+            raise ValueError("`cls_name` is required.")
+        cls = getattr(importlib.import_module("optimum.rbln"), cls_name)
+        return cls(**config_dict)
+
     @staticmethod
     def load(
         path: str,
@@ -195,8 +203,9 @@ class RBLNAutoConfig:
         cls, config_file = load_config(path)
 
         rbln_keys = [key for key in kwargs.keys() if key.startswith("rbln_")]
-
         rbln_runtime_kwargs = {key[5:]: kwargs.pop(key) for key in rbln_keys if key[5:] in RUNTIME_KEYWORDS}
+        rbln_submodule_kwargs = {key[5:]: kwargs.pop(key) for key in rbln_keys if key[5:] in cls.submodules}
+
         rbln_kwargs = {
             key[5:]: kwargs.pop(key)
             for key in rbln_keys
@@ -206,6 +215,14 @@ class RBLNAutoConfig:
         if len(rbln_kwargs) > 0:
             raise ValueError(f"Cannot set the following arguments: {list(rbln_kwargs.keys())}")
 
+        # Process submodule's rbln_config
+        for submodule in cls.submodules:
+            if submodule not in config_file:
+                raise ValueError(f"Submodule {submodule} not found in rbln_config.json.")
+            submodule_config = config_file[submodule]
+            submodule_config.update(rbln_submodule_kwargs.pop(submodule, {}))
+            config_file[submodule] = RBLNAutoConfig.load_from_dict(submodule_config)
+
         if passed_rbln_config is not None:
             config_file.update(passed_rbln_config._runtime_options)
             # TODO(jongho): Reject if the passed_rbln_config has different attributes from the config_file
@@ -435,6 +452,7 @@ class RBLNModelConfig:
         "activate_profiler",
     ]
     submodules: List[str] = []
+    subclass_non_save_attributes = []
 
     def init_submodule_config(
         self,
@@ -463,7 +481,11 @@ class RBLNModelConfig:
         return submodule_config
 
     def __setattr__(self, key, value):
-        if key != "_attributes_map" and key not in self.non_save_attributes:
+        if (
+            key != "_attributes_map"
+            and key not in self.non_save_attributes
+            and key not in self.subclass_non_save_attributes
+        ):
             self._attributes_map[key] = value
 
         if hasattr(self, "_frozen") and self._frozen:
@@ -706,6 +728,28 @@ class RBLNModelConfig:
 
         return rbln_config, kwargs
 
+    def get_default_values_for_original_cls(self, func_name: str, keys: List[str]) -> Dict[str, Any]:
+        """
+        Get default values for original class attributes from RBLNModelConfig.
+
+        Args:
+            func_name (str): The name of the function to get the default values for.
+            keys (List[str]): The keys of the attributes to get.
+
+        Returns:
+            Dict[str, Any]: The default values for the attributes.
+        """
+        model_cls = self.rbln_model_cls.get_hf_class()
+        func = getattr(model_cls, func_name)
+        func_signature = inspect.signature(func)
+        default_values = {}
+        for key in keys:
+            if key in func_signature.parameters:
+                default_values[key] = func_signature.parameters[key].default
+            else:
+                raise ValueError(f"Default value for `{key}` is not set for the model class.")
+        return default_values
+
     @property
     def create_runtimes(self):
         context = ContextRblnConfig.get_current_context()["create_runtimes"]

{optimum_rbln-0.7.4a7 → optimum_rbln-0.7.4a9}/src/optimum/rbln/diffusers/configurations/models/configuration_controlnet.py

@@ -18,6 +18,8 @@ from ....configuration_utils import RBLNModelConfig
 
 
 class RBLNControlNetModelConfig(RBLNModelConfig):
+    subclass_non_save_attributes = ["_batch_size_is_specified"]
+
     def __init__(
         self,
         batch_size: Optional[int] = None,
@@ -44,6 +46,8 @@ class RBLNControlNetModelConfig(RBLNModelConfig):
             ValueError: If batch_size is not a positive integer.
         """
         super().__init__(**kwargs)
+        self._batch_size_is_specified = batch_size is not None
+
         self.batch_size = batch_size or 1
         if not isinstance(self.batch_size, int) or self.batch_size < 0:
             raise ValueError(f"batch_size must be a positive integer, got {self.batch_size}")
@@ -52,3 +56,7 @@ class RBLNControlNetModelConfig(RBLNModelConfig):
         self.unet_sample_size = unet_sample_size
         self.vae_sample_size = vae_sample_size
         self.text_model_hidden_size = text_model_hidden_size
+
+    @property
+    def batch_size_is_specified(self):
+        return self._batch_size_is_specified

{optimum_rbln-0.7.4a7 → optimum_rbln-0.7.4a9}/src/optimum/rbln/diffusers/configurations/models/configuration_prior_transformer.py

@@ -18,6 +18,8 @@ from ....configuration_utils import RBLNModelConfig
 
 
 class RBLNPriorTransformerConfig(RBLNModelConfig):
+    subclass_non_save_attributes = ["_batch_size_is_specified"]
+
     def __init__(
         self,
         batch_size: Optional[int] = None,
@@ -36,9 +38,15 @@ class RBLNPriorTransformerConfig(RBLNModelConfig):
             ValueError: If batch_size is not a positive integer.
         """
         super().__init__(**kwargs)
+        self._batch_size_is_specified = batch_size is not None
+
         self.batch_size = batch_size or 1
         if not isinstance(self.batch_size, int) or self.batch_size < 0:
             raise ValueError(f"batch_size must be a positive integer, got {self.batch_size}")
 
         self.embedding_dim = embedding_dim
         self.num_embeddings = num_embeddings
+
+    @property
+    def batch_size_is_specified(self):
+        return self._batch_size_is_specified

{optimum_rbln-0.7.4a7 → optimum_rbln-0.7.4a9}/src/optimum/rbln/diffusers/configurations/models/configuration_transformer_sd3.py

@@ -18,6 +18,8 @@ from ....configuration_utils import RBLNModelConfig
 
 
 class RBLNSD3Transformer2DModelConfig(RBLNModelConfig):
+    subclass_non_save_attributes = ["_batch_size_is_specified"]
+
     def __init__(
         self,
         batch_size: Optional[int] = None,
@@ -38,6 +40,8 @@ class RBLNSD3Transformer2DModelConfig(RBLNModelConfig):
             ValueError: If batch_size is not a positive integer.
         """
         super().__init__(**kwargs)
+        self._batch_size_is_specified = batch_size is not None
+
         self.batch_size = batch_size or 1
         if not isinstance(self.batch_size, int) or self.batch_size < 0:
             raise ValueError(f"batch_size must be a positive integer, got {self.batch_size}")
@@ -46,3 +50,7 @@ class RBLNSD3Transformer2DModelConfig(RBLNModelConfig):
         self.sample_size = sample_size
         if isinstance(self.sample_size, int):
             self.sample_size = (self.sample_size, self.sample_size)
+
+    @property
+    def batch_size_is_specified(self):
+        return self._batch_size_is_specified

{optimum_rbln-0.7.4a7 → optimum_rbln-0.7.4a9}/src/optimum/rbln/diffusers/configurations/models/configuration_unet_2d_condition.py

@@ -18,6 +18,8 @@ from ....configuration_utils import RBLNModelConfig
 
 
 class RBLNUNet2DConditionModelConfig(RBLNModelConfig):
+    subclass_non_save_attributes = ["_batch_size_is_specified"]
+
     def __init__(
         self,
         batch_size: Optional[int] = None,
@@ -49,6 +51,8 @@ class RBLNUNet2DConditionModelConfig(RBLNModelConfig):
             ValueError: If batch_size is not a positive integer.
         """
         super().__init__(**kwargs)
+        self._batch_size_is_specified = batch_size is not None
+
         self.batch_size = batch_size or 1
         if not isinstance(self.batch_size, int) or self.batch_size < 0:
             raise ValueError(f"batch_size must be a positive integer, got {self.batch_size}")
@@ -64,3 +68,7 @@ class RBLNUNet2DConditionModelConfig(RBLNModelConfig):
         self.sample_size = sample_size
         if isinstance(sample_size, int):
             self.sample_size = (sample_size, sample_size)
+
+    @property
+    def batch_size_is_specified(self):
+        return self._batch_size_is_specified

{optimum_rbln-0.7.4a7 → optimum_rbln-0.7.4a9}/src/optimum/rbln/diffusers/configurations/pipelines/configuration_controlnet.py

@@ -16,13 +16,9 @@ from typing import Optional, Tuple
 
 from ....configuration_utils import RBLNModelConfig
 from ....transformers import RBLNCLIPTextModelConfig, RBLNCLIPTextModelWithProjectionConfig
-from ....utils.logging import get_logger
 from ..models import RBLNAutoencoderKLConfig, RBLNControlNetModelConfig, RBLNUNet2DConditionModelConfig
 
 
-logger = get_logger(__name__)
-
-
 class _RBLNStableDiffusionControlNetPipelineBaseConfig(RBLNModelConfig):
     submodules = ["text_encoder", "unet", "vae", "controlnet"]
     _vae_uses_encoder = False
@@ -58,7 +54,7 @@ class _RBLNStableDiffusionControlNetPipelineBaseConfig(RBLNModelConfig):
             sample_size (Optional[Tuple[int, int]]): Spatial dimensions for the UNet model.
             image_size (Optional[Tuple[int, int]]): Alternative way to specify image dimensions.
                 Cannot be used together with img_height/img_width.
-            guidance_scale (Optional[float]): Scale for classifier-free guidance. Deprecated parameter.
+            guidance_scale (Optional[float]): Scale for classifier-free guidance.
             **kwargs: Additional arguments passed to the parent RBLNModelConfig.
 
         Raises:
@@ -79,7 +75,6 @@ class _RBLNStableDiffusionControlNetPipelineBaseConfig(RBLNModelConfig):
         self.unet = self.init_submodule_config(
             RBLNUNet2DConditionModelConfig,
             unet,
-            batch_size=batch_size,
             sample_size=sample_size,
         )
         self.vae = self.init_submodule_config(
@@ -89,14 +84,24 @@ class _RBLNStableDiffusionControlNetPipelineBaseConfig(RBLNModelConfig):
             uses_encoder=self.__class__._vae_uses_encoder,
             sample_size=image_size,  # image size is equal to sample size in vae
         )
-        self.controlnet = self.init_submodule_config(RBLNControlNetModelConfig, controlnet, batch_size=batch_size)
+        self.controlnet = self.init_submodule_config(RBLNControlNetModelConfig, controlnet)
+
+        # Get default guidance scale from original class to set UNet and ControlNet batch size
+        if guidance_scale is None:
+            guidance_scale = self.get_default_values_for_original_cls("__call__", ["guidance_scale"])["guidance_scale"]
 
         if guidance_scale is not None:
-            logger.warning("Specifying `guidance_scale` is deprecated. It will be removed in a future version.")
             do_classifier_free_guidance = guidance_scale > 1.0
             if do_classifier_free_guidance:
-                self.unet.batch_size = self.text_encoder.batch_size * 2
-                self.controlnet.batch_size = self.text_encoder.batch_size * 2
+                if not self.unet.batch_size_is_specified:
+                    self.unet.batch_size = self.text_encoder.batch_size * 2
+                if not self.controlnet.batch_size_is_specified:
+                    self.controlnet.batch_size = self.text_encoder.batch_size * 2
+            else:
+                if not self.unet.batch_size_is_specified:
+                    self.unet.batch_size = self.text_encoder.batch_size
+                if not self.controlnet.batch_size_is_specified:
+                    self.controlnet.batch_size = self.text_encoder.batch_size
 
     @property
     def batch_size(self):
@@ -157,7 +162,7 @@ class _RBLNStableDiffusionXLControlNetPipelineBaseConfig(RBLNModelConfig):
             sample_size (Optional[Tuple[int, int]]): Spatial dimensions for the UNet model.
             image_size (Optional[Tuple[int, int]]): Alternative way to specify image dimensions.
                 Cannot be used together with img_height/img_width.
-            guidance_scale (Optional[float]): Scale for classifier-free guidance. Deprecated parameter.
+            guidance_scale (Optional[float]): Scale for classifier-free guidance.
             **kwargs: Additional arguments passed to the parent RBLNModelConfig.
 
         Raises:
@@ -181,7 +186,6 @@ class _RBLNStableDiffusionXLControlNetPipelineBaseConfig(RBLNModelConfig):
         self.unet = self.init_submodule_config(
             RBLNUNet2DConditionModelConfig,
             unet,
-            batch_size=batch_size,
             sample_size=sample_size,
         )
         self.vae = self.init_submodule_config(
@@ -191,14 +195,25 @@ class _RBLNStableDiffusionXLControlNetPipelineBaseConfig(RBLNModelConfig):
             uses_encoder=self.__class__._vae_uses_encoder,
             sample_size=image_size,  # image size is equal to sample size in vae
         )
-        self.controlnet = self.init_submodule_config(RBLNControlNetModelConfig, controlnet, batch_size=batch_size)
+        self.controlnet = self.init_submodule_config(RBLNControlNetModelConfig, controlnet)
 
-        if guidance_scale is not None:
-            logger.warning("Specifying `guidance_scale` is deprecated. It will be removed in a future version.")
-            do_classifier_free_guidance = guidance_scale > 1.0
-            if do_classifier_free_guidance:
+        # Get default guidance scale from original class to set UNet and ControlNet batch size
+        guidance_scale = (
+            guidance_scale
+            or self.get_default_values_for_original_cls("__call__", ["guidance_scale"])["guidance_scale"]
+        )
+
+        do_classifier_free_guidance = guidance_scale > 1.0
+        if do_classifier_free_guidance:
+            if not self.unet.batch_size_is_specified:
                 self.unet.batch_size = self.text_encoder.batch_size * 2
+            if not self.controlnet.batch_size_is_specified:
                 self.controlnet.batch_size = self.text_encoder.batch_size * 2
+        else:
+            if not self.unet.batch_size_is_specified:
+                self.unet.batch_size = self.text_encoder.batch_size
+            if not self.controlnet.batch_size_is_specified:
+                self.controlnet.batch_size = self.text_encoder.batch_size
 
     @property
     def batch_size(self):

{optimum_rbln-0.7.4a7 → optimum_rbln-0.7.4a9}/src/optimum/rbln/diffusers/configurations/pipelines/configuration_kandinsky2_2.py

@@ -16,14 +16,10 @@ from typing import Optional, Tuple
 
 from ....configuration_utils import RBLNModelConfig
 from ....transformers import RBLNCLIPTextModelWithProjectionConfig, RBLNCLIPVisionModelWithProjectionConfig
-from ....utils.logging import get_logger
 from ..models import RBLNUNet2DConditionModelConfig, RBLNVQModelConfig
 from ..models.configuration_prior_transformer import RBLNPriorTransformerConfig
 
 
-logger = get_logger(__name__)
-
-
 class _RBLNKandinskyV22PipelineBaseConfig(RBLNModelConfig):
     submodules = ["unet", "movq"]
     _movq_uses_encoder = False
@@ -49,7 +45,7 @@ class _RBLNKandinskyV22PipelineBaseConfig(RBLNModelConfig):
                 Initialized as RBLNVQModelConfig if not provided.
             sample_size (Optional[Tuple[int, int]]): Spatial dimensions for the UNet model.
             batch_size (Optional[int]): Batch size for inference, applied to all submodules.
-            guidance_scale (Optional[float]): Scale for classifier-free guidance. Deprecated parameter.
+            guidance_scale (Optional[float]): Scale for classifier-free guidance.
             image_size (Optional[Tuple[int, int]]): Dimensions for the generated images.
                 Cannot be used together with img_height/img_width.
             img_height (Optional[int]): Height of the generated images.
@@ -70,9 +66,7 @@ class _RBLNKandinskyV22PipelineBaseConfig(RBLNModelConfig):
         if img_height is not None and img_width is not None:
             image_size = (img_height, img_width)
 
-        self.unet = self.init_submodule_config(
-            RBLNUNet2DConditionModelConfig, unet, batch_size=batch_size, sample_size=sample_size
-        )
+        self.unet = self.init_submodule_config(RBLNUNet2DConditionModelConfig, unet, sample_size=sample_size)
         self.movq = self.init_submodule_config(
             RBLNVQModelConfig,
             movq,
@@ -81,11 +75,16 @@ class _RBLNKandinskyV22PipelineBaseConfig(RBLNModelConfig):
             uses_encoder=self._movq_uses_encoder,
         )
 
-        if guidance_scale is not None:
-            logger.warning("Specifying `guidance_scale` is deprecated. It will be removed in a future version.")
+        # Get default guidance scale from original class to set UNet batch size
+        if guidance_scale is None:
+            guidance_scale = self.get_default_values_for_original_cls("__call__", ["guidance_scale"])["guidance_scale"]
+
+        if not self.unet.batch_size_is_specified:
             do_classifier_free_guidance = guidance_scale > 1.0
             if do_classifier_free_guidance:
                 self.unet.batch_size = self.movq.batch_size * 2
+            else:
+                self.unet.batch_size = self.movq.batch_size
 
     @property
     def batch_size(self):
@@ -136,7 +135,7 @@ class RBLNKandinskyV22PriorPipelineConfig(RBLNModelConfig):
             prior (Optional[RBLNPriorTransformerConfig]): Configuration for the prior transformer component.
                 Initialized as RBLNPriorTransformerConfig if not provided.
             batch_size (Optional[int]): Batch size for inference, applied to all submodules.
-            guidance_scale (Optional[float]): Scale for classifier-free guidance. Deprecated parameter.
+            guidance_scale (Optional[float]): Scale for classifier-free guidance.
             **kwargs: Additional arguments passed to the parent RBLNModelConfig.
 
         Note:
@@ -151,13 +150,18 @@ class RBLNKandinskyV22PriorPipelineConfig(RBLNModelConfig):
             RBLNCLIPVisionModelWithProjectionConfig, image_encoder, batch_size=batch_size
         )
 
-        self.prior = self.init_submodule_config(RBLNPriorTransformerConfig, prior, batch_size=batch_size)
+        self.prior = self.init_submodule_config(RBLNPriorTransformerConfig, prior)
+
+        # Get default guidance scale from original class to set UNet batch size
+        if guidance_scale is None:
+            guidance_scale = self.get_default_values_for_original_cls("__call__", ["guidance_scale"])["guidance_scale"]
 
-        if guidance_scale is not None:
-            logger.warning("Specifying `guidance_scale` is deprecated. It will be removed in a future version.")
+        if not self.prior.batch_size_is_specified:
             do_classifier_free_guidance = guidance_scale > 1.0
             if do_classifier_free_guidance:
                 self.prior.batch_size = self.text_encoder.batch_size * 2
+            else:
+                self.prior.batch_size = self.text_encoder.batch_size
 
     @property
     def batch_size(self):
@@ -208,7 +212,7 @@ class _RBLNKandinskyV22CombinedPipelineBaseConfig(RBLNModelConfig):
             batch_size (Optional[int]): Batch size for inference, applied to all submodules.
             img_height (Optional[int]): Height of the generated images.
             img_width (Optional[int]): Width of the generated images.
-            guidance_scale (Optional[float]): Scale for classifier-free guidance. Deprecated parameter.
+            guidance_scale (Optional[float]): Scale for classifier-free guidance.
             prior_prior (Optional[RBLNPriorTransformerConfig]): Direct configuration for the prior transformer.
                 Used if prior_pipe is not provided.
             prior_image_encoder (Optional[RBLNCLIPVisionModelWithProjectionConfig]): Direct configuration for the image encoder.

{optimum_rbln-0.7.4a7 → optimum_rbln-0.7.4a9}/src/optimum/rbln/diffusers/configurations/pipelines/configuration_stable_diffusion.py

@@ -16,13 +16,9 @@ from typing import Optional, Tuple
 
 from ....configuration_utils import RBLNModelConfig
 from ....transformers import RBLNCLIPTextModelConfig
-from ....utils.logging import get_logger
 from ..models import RBLNAutoencoderKLConfig, RBLNUNet2DConditionModelConfig
 
 
-logger = get_logger(__name__)
-
-
 class _RBLNStableDiffusionPipelineBaseConfig(RBLNModelConfig):
     submodules = ["text_encoder", "unet", "vae"]
     _vae_uses_encoder = False
@@ -55,7 +51,7 @@ class _RBLNStableDiffusionPipelineBaseConfig(RBLNModelConfig):
             sample_size (Optional[Tuple[int, int]]): Spatial dimensions for the UNet model.
             image_size (Optional[Tuple[int, int]]): Alternative way to specify image dimensions.
                 Cannot be used together with img_height/img_width.
-            guidance_scale (Optional[float]): Scale for classifier-free guidance. Deprecated parameter.
+            guidance_scale (Optional[float]): Scale for classifier-free guidance.
             **kwargs: Additional arguments passed to the parent RBLNModelConfig.
 
         Raises:
@@ -76,7 +72,6 @@ class _RBLNStableDiffusionPipelineBaseConfig(RBLNModelConfig):
         self.unet = self.init_submodule_config(
             RBLNUNet2DConditionModelConfig,
             unet,
-            batch_size=batch_size,
             sample_size=sample_size,
         )
         self.vae = self.init_submodule_config(
@@ -87,11 +82,16 @@ class _RBLNStableDiffusionPipelineBaseConfig(RBLNModelConfig):
             sample_size=image_size,  # image size is equal to sample size in vae
         )
 
-        if guidance_scale is not None:
-            logger.warning("Specifying `guidance_scale` is deprecated. It will be removed in a future version.")
+        # Get default guidance scale from original class to set UNet batch size
+        if guidance_scale is None:
+            guidance_scale = self.get_default_values_for_original_cls("__call__", ["guidance_scale"])["guidance_scale"]
+
+        if not self.unet.batch_size_is_specified:
             do_classifier_free_guidance = guidance_scale > 1.0
             if do_classifier_free_guidance:
                 self.unet.batch_size = self.text_encoder.batch_size * 2
+            else:
+                self.unet.batch_size = self.text_encoder.batch_size
 
     @property
     def batch_size(self):

{optimum_rbln-0.7.4a7 → optimum_rbln-0.7.4a9}/src/optimum/rbln/diffusers/configurations/pipelines/configuration_stable_diffusion_3.py

@@ -16,13 +16,9 @@ from typing import Optional, Tuple
 
 from ....configuration_utils import RBLNModelConfig
 from ....transformers import RBLNCLIPTextModelWithProjectionConfig, RBLNT5EncoderModelConfig
-from ....utils.logging import get_logger
 from ..models import RBLNAutoencoderKLConfig, RBLNSD3Transformer2DModelConfig
 
 
-logger = get_logger(__name__)
-
-
 class _RBLNStableDiffusion3PipelineBaseConfig(RBLNModelConfig):
     submodules = ["transformer", "text_encoder", "text_encoder_2", "text_encoder_3", "vae"]
     _vae_uses_encoder = False
@@ -63,7 +59,7 @@ class _RBLNStableDiffusion3PipelineBaseConfig(RBLNModelConfig):
             batch_size (Optional[int]): Batch size for inference, applied to all submodules.
             img_height (Optional[int]): Height of the generated images.
             img_width (Optional[int]): Width of the generated images.
-            guidance_scale (Optional[float]): Scale for classifier-free guidance. Deprecated parameter.
+            guidance_scale (Optional[float]): Scale for classifier-free guidance.
             **kwargs: Additional arguments passed to the parent RBLNModelConfig.
 
         Raises:
@@ -97,7 +93,6 @@ class _RBLNStableDiffusion3PipelineBaseConfig(RBLNModelConfig):
         self.transformer = self.init_submodule_config(
             RBLNSD3Transformer2DModelConfig,
             transformer,
-            batch_size=batch_size,
             sample_size=sample_size,
         )
         self.vae = self.init_submodule_config(
@@ -108,11 +103,16 @@ class _RBLNStableDiffusion3PipelineBaseConfig(RBLNModelConfig):
             sample_size=image_size,
         )
 
-        if guidance_scale is not None:
-            logger.warning("Specifying `guidance_scale` is deprecated. It will be removed in a future version.")
+        # Get default guidance scale from original class to set Transformer batch size
+        if guidance_scale is None:
+            guidance_scale = self.get_default_values_for_original_cls("__call__", ["guidance_scale"])["guidance_scale"]
+
+        if not self.transformer.batch_size_is_specified:
             do_classifier_free_guidance = guidance_scale > 1.0
             if do_classifier_free_guidance:
                 self.transformer.batch_size = self.text_encoder.batch_size * 2
+            else:
+                self.transformer.batch_size = self.text_encoder.batch_size
 
     @property
     def max_seq_len(self):

{optimum_rbln-0.7.4a7 → optimum_rbln-0.7.4a9}/src/optimum/rbln/diffusers/configurations/pipelines/configuration_stable_diffusion_xl.py

@@ -16,13 +16,9 @@ from typing import Optional, Tuple
 
 from ....configuration_utils import RBLNModelConfig
 from ....transformers import RBLNCLIPTextModelConfig, RBLNCLIPTextModelWithProjectionConfig
-from ....utils.logging import get_logger
 from ..models import RBLNAutoencoderKLConfig, RBLNUNet2DConditionModelConfig
 
 
-logger = get_logger(__name__)
-
-
 class _RBLNStableDiffusionXLPipelineBaseConfig(RBLNModelConfig):
     submodules = ["text_encoder", "text_encoder_2", "unet", "vae"]
     _vae_uses_encoder = False
@@ -58,7 +54,7 @@ class _RBLNStableDiffusionXLPipelineBaseConfig(RBLNModelConfig):
             sample_size (Optional[Tuple[int, int]]): Spatial dimensions for the UNet model.
             image_size (Optional[Tuple[int, int]]): Alternative way to specify image dimensions.
                 Cannot be used together with img_height/img_width.
-            guidance_scale (Optional[float]): Scale for classifier-free guidance. Deprecated parameter.
+            guidance_scale (Optional[float]): Scale for classifier-free guidance.
             **kwargs: Additional arguments passed to the parent RBLNModelConfig.
 
         Raises:
@@ -82,7 +78,6 @@ class _RBLNStableDiffusionXLPipelineBaseConfig(RBLNModelConfig):
         self.unet = self.init_submodule_config(
             RBLNUNet2DConditionModelConfig,
             unet,
-            batch_size=batch_size,
             sample_size=sample_size,
         )
         self.vae = self.init_submodule_config(
@@ -93,11 +88,16 @@ class _RBLNStableDiffusionXLPipelineBaseConfig(RBLNModelConfig):
             sample_size=image_size,  # image size is equal to sample size in vae
         )
 
-        if guidance_scale is not None:
-            logger.warning("Specifying `guidance_scale` is deprecated. It will be removed in a future version.")
+        # Get default guidance scale from original class to set UNet batch size
+        if guidance_scale is None:
+            guidance_scale = self.get_default_values_for_original_cls("__call__", ["guidance_scale"])["guidance_scale"]
+
+        if not self.unet.batch_size_is_specified:
             do_classifier_free_guidance = guidance_scale > 1.0
             if do_classifier_free_guidance:
                 self.unet.batch_size = self.text_encoder.batch_size * 2
+            else:
+                self.unet.batch_size = self.text_encoder.batch_size
 
     @property
     def batch_size(self):