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

Revert "chore: lint"

Browse Source 
This reverts commit fff29d663d.
This commit is contained in:
psychedelicious 2023-10-17 19:56:52 +11:00 committed by Kent Keirsey
parent bdf4c4944c
commit 38e7eb8878
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -548,8 +548,8 @@ class StableDiffusionGeneratorPipeline(StableDiffusionPipeline):
mid_block_additional_residual = None mid_block_additional_residual = None
down_intrablock_additional_residuals = None down_intrablock_additional_residuals = None
# if control_data is not None and t2i_adapter_data is not None: # if control_data is not None and t2i_adapter_data is not None:
# TODO(ryand): This is a limitation of the UNet2DConditionModel API, not a fundamental incompatibility # TODO(ryand): This is a limitation of the UNet2DConditionModel API, not a fundamental incompatibility
# between ControlNets and T2I-Adapters. We will try to fix this upstream in diffusers. # between ControlNets and T2I-Adapters. We will try to fix this upstream in diffusers.
# raise Exception("ControlNet(s) and T2I-Adapter(s) cannot be used simultaneously (yet).") # raise Exception("ControlNet(s) and T2I-Adapter(s) cannot be used simultaneously (yet).")
# elif control_data is not None: # elif control_data is not None:
if control_data is not None: if control_data is not None:
@ -598,8 +598,8 @@ class StableDiffusionGeneratorPipeline(StableDiffusionPipeline):
conditioning_data=conditioning_data, conditioning_data=conditioning_data,
# extra: # extra:
down_block_additional_residuals=down_block_additional_residuals, # for ControlNet down_block_additional_residuals=down_block_additional_residuals, # for ControlNet
mid_block_additional_residual=mid_block_additional_residual, # for ControlNet mid_block_additional_residual=mid_block_additional_residual, # for ControlNet
down_intrablock_additional_residuals=down_intrablock_additional_residuals, # for T2I-Adapter down_intrablock_additional_residuals=down_intrablock_additional_residuals, # for T2I-Adapter
) )
guidance_scale = conditioning_data.guidance_scale guidance_scale = conditioning_data.guidance_scale