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

Resolving rebase conflict, redirecting control imports to invocations/control_adapter

Browse Source
This commit is contained in:
user1 2023-08-30 17:35:31 -07:00
parent 054edc4077
commit 0c17f8604f
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -60,7 +60,7 @@ from .baseinvocation import (
invocation_output, invocation_output,
) )
from .compel import ConditioningField from .compel import ConditioningField
from .controlnet_image_processors import ControlField from .control_adapter import ControlField
from .model import ModelInfo, UNetField, VaeField from .model import ModelInfo, UNetField, VaeField

2
invokeai/app/invocations/metadata.py
View File

@ -11,7 +11,7 @@ from invokeai.app.invocations.baseinvocation import (
invocation, invocation,
invocation_output, invocation_output,
) )
from invokeai.app.invocations.controlnet_image_processors import ControlField from invokeai.app.invocations.control_adapter import ControlField
from invokeai.app.invocations.model import LoRAModelField, MainModelField, VAEModelField from invokeai.app.invocations.model import LoRAModelField, MainModelField, VAEModelField
from invokeai.app.util.model_exclude_null import BaseModelExcludeNull from invokeai.app.util.model_exclude_null import BaseModelExcludeNull

2
invokeai/app/invocations/onnx.py
View File

@ -34,7 +34,7 @@ from .baseinvocation import (
invocation, invocation,
invocation_output, invocation_output,
) )
from .controlnet_image_processors import ControlField from .control_adapter import ControlField
from .latent import SAMPLER_NAME_VALUES, LatentsField, LatentsOutput, build_latents_output, get_scheduler from .latent import SAMPLER_NAME_VALUES, LatentsField, LatentsOutput, build_latents_output, get_scheduler
from .model import ClipField, ModelInfo, UNetField, VaeField from .model import ClipField, ModelInfo, UNetField, VaeField