Mirrored_Repos/InvokeAI
1
0
Fork 0
mirror of https://github.com/invoke-ai/InvokeAI synced 2024-08-30 20:32:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename ConditioningData -> TextConditioningData.

Browse Source
This commit is contained in:
Ryan Dick 2024-03-08 11:49:32 -05:00
parent 7fe6f03405
commit 8923289b89
4 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
invokeai/app/invocations/latent.py
View File

@ -57,7 +57,10 @@ from invokeai.backend.lora import LoRAModelRaw
from invokeai.backend.model_manager import BaseModelType, LoadedModel from invokeai.backend.model_manager import BaseModelType, LoadedModel
from invokeai.backend.model_patcher import ModelPatcher from invokeai.backend.model_patcher import ModelPatcher
from invokeai.backend.stable_diffusion import PipelineIntermediateState, set_seamless from invokeai.backend.stable_diffusion import PipelineIntermediateState, set_seamless
from invokeai.backend.stable_diffusion.diffusion.conditioning_data import ConditioningData, IPAdapterConditioningInfo from invokeai.backend.stable_diffusion.diffusion.conditioning_data import (
IPAdapterConditioningInfo,
TextConditioningData,
)
from invokeai.backend.util.silence_warnings import SilenceWarnings from invokeai.backend.util.silence_warnings import SilenceWarnings
from ...backend.stable_diffusion.diffusers_pipeline import ( from ...backend.stable_diffusion.diffusers_pipeline import (
@ -370,14 +373,14 @@ class DenoiseLatentsInvocation(BaseInvocation):
self, self,
context: InvocationContext, context: InvocationContext,
unet: UNet2DConditionModel, unet: UNet2DConditionModel,
) -> ConditioningData: ) -> TextConditioningData:
positive_cond_data = context.conditioning.load(self.positive_conditioning.conditioning_name) positive_cond_data = context.conditioning.load(self.positive_conditioning.conditioning_name)
c = positive_cond_data.conditionings[0].to(device=unet.device, dtype=unet.dtype) c = positive_cond_data.conditionings[0].to(device=unet.device, dtype=unet.dtype)
negative_cond_data = context.conditioning.load(self.negative_conditioning.conditioning_name) negative_cond_data = context.conditioning.load(self.negative_conditioning.conditioning_name)
uc = negative_cond_data.conditionings[0].to(device=unet.device, dtype=unet.dtype) uc = negative_cond_data.conditionings[0].to(device=unet.device, dtype=unet.dtype)
conditioning_data = ConditioningData( conditioning_data = TextConditioningData(
unconditioned_embeddings=uc, unconditioned_embeddings=uc,
text_embeddings=c, text_embeddings=c,
guidance_scale=self.cfg_scale, guidance_scale=self.cfg_scale,

11
invokeai/backend/stable_diffusion/diffusers_pipeline.py
View File

@ -23,7 +23,10 @@ from transformers import CLIPFeatureExtractor, CLIPTextModel, CLIPTokenizer
from invokeai.app.services.config.config_default import get_config from invokeai.app.services.config.config_default import get_config
from invokeai.backend.ip_adapter.ip_adapter import IPAdapter from invokeai.backend.ip_adapter.ip_adapter import IPAdapter
from invokeai.backend.ip_adapter.unet_patcher import UNetPatcher from invokeai.backend.ip_adapter.unet_patcher import UNetPatcher
from invokeai.backend.stable_diffusion.diffusion.conditioning_data import ConditioningData, IPAdapterConditioningInfo from invokeai.backend.stable_diffusion.diffusion.conditioning_data import (
IPAdapterConditioningInfo,
TextConditioningData,
)
from invokeai.backend.stable_diffusion.diffusion.shared_invokeai_diffusion import InvokeAIDiffuserComponent from invokeai.backend.stable_diffusion.diffusion.shared_invokeai_diffusion import InvokeAIDiffuserComponent
from invokeai.backend.util.attention import auto_detect_slice_size from invokeai.backend.util.attention import auto_detect_slice_size
from invokeai.backend.util.devices import normalize_device from invokeai.backend.util.devices import normalize_device
@ -297,7 +300,7 @@ class StableDiffusionGeneratorPipeline(StableDiffusionPipeline):
latents: torch.Tensor, latents: torch.Tensor,
num_inference_steps: int, num_inference_steps: int,
scheduler_step_kwargs: dict[str, Any], scheduler_step_kwargs: dict[str, Any],
conditioning_data: ConditioningData, conditioning_data: TextConditioningData,
*, *,
noise: Optional[torch.Tensor], noise: Optional[torch.Tensor],
timesteps: torch.Tensor, timesteps: torch.Tensor,
@ -383,7 +386,7 @@ class StableDiffusionGeneratorPipeline(StableDiffusionPipeline):
self, self,
latents: torch.Tensor, latents: torch.Tensor,
timesteps, timesteps,
conditioning_data: ConditioningData, conditioning_data: TextConditioningData,
scheduler_step_kwargs: dict[str, Any], scheduler_step_kwargs: dict[str, Any],
*, *,
additional_guidance: List[Callable] = None, additional_guidance: List[Callable] = None,
@ -468,7 +471,7 @@ class StableDiffusionGeneratorPipeline(StableDiffusionPipeline):
self, self,
t: torch.Tensor, t: torch.Tensor,
latents: torch.Tensor, latents: torch.Tensor,
conditioning_data: ConditioningData, conditioning_data: TextConditioningData,
step_index: int, step_index: int,
total_step_count: int, total_step_count: int,
scheduler_step_kwargs: dict[str, Any], scheduler_step_kwargs: dict[str, Any],

2
invokeai/backend/stable_diffusion/diffusion/conditioning_data.py
View File

@ -55,7 +55,7 @@ class IPAdapterConditioningInfo:
@dataclass @dataclass
class ConditioningData: class TextConditioningData:
unconditioned_embeddings: BasicConditioningInfo unconditioned_embeddings: BasicConditioningInfo
text_embeddings: BasicConditioningInfo text_embeddings: BasicConditioningInfo
""" """

8
invokeai/backend/stable_diffusion/diffusion/shared_invokeai_diffusion.py
View File

@ -10,10 +10,10 @@ from typing_extensions import TypeAlias
from invokeai.app.services.config.config_default import get_config from invokeai.app.services.config.config_default import get_config
from invokeai.backend.stable_diffusion.diffusion.conditioning_data import ( from invokeai.backend.stable_diffusion.diffusion.conditioning_data import (
ConditioningData,
ExtraConditioningInfo, ExtraConditioningInfo,
IPAdapterConditioningInfo, IPAdapterConditioningInfo,
SDXLConditioningInfo, SDXLConditioningInfo,
TextConditioningData,
) )
from .cross_attention_control import ( from .cross_attention_control import (
@ -199,7 +199,7 @@ class InvokeAIDiffuserComponent:
self, self,
sample: torch.Tensor, sample: torch.Tensor,
timestep: torch.Tensor, timestep: torch.Tensor,
conditioning_data: ConditioningData, conditioning_data: TextConditioningData,
ip_adapter_conditioning: Optional[list[IPAdapterConditioningInfo]], ip_adapter_conditioning: Optional[list[IPAdapterConditioningInfo]],
step_index: int, step_index: int,
total_step_count: int, total_step_count: int,
@ -300,7 +300,7 @@ class InvokeAIDiffuserComponent:
self, self,
x, x,
sigma, sigma,
conditioning_data: ConditioningData, conditioning_data: TextConditioningData,
ip_adapter_conditioning: Optional[list[IPAdapterConditioningInfo]], ip_adapter_conditioning: Optional[list[IPAdapterConditioningInfo]],
down_block_additional_residuals: Optional[torch.Tensor] = None, # for ControlNet down_block_additional_residuals: Optional[torch.Tensor] = None, # for ControlNet
mid_block_additional_residual: Optional[torch.Tensor] = None, # for ControlNet mid_block_additional_residual: Optional[torch.Tensor] = None, # for ControlNet
@ -365,7 +365,7 @@ class InvokeAIDiffuserComponent:
self, self,
x: torch.Tensor, x: torch.Tensor,
sigma, sigma,
conditioning_data: ConditioningData, conditioning_data: TextConditioningData,
ip_adapter_conditioning: Optional[list[IPAdapterConditioningInfo]], ip_adapter_conditioning: Optional[list[IPAdapterConditioningInfo]],
cross_attention_control_types_to_do: list[CrossAttentionType], cross_attention_control_types_to_do: list[CrossAttentionType],
down_block_additional_residuals: Optional[torch.Tensor] = None, # for ControlNet down_block_additional_residuals: Optional[torch.Tensor] = None, # for ControlNet