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

Moved to controlnet_aux v0.0.4, reinstated Zoe controlnet preprocessor. Also in pyproject.toml had to specify downgrade of timm to 0.6.13 _after_ controlnet-aux installs timm >= 0.9.2, because timm >0.6.13 breaks Zoe preprocessor.

Browse Source
This commit is contained in:
user1 2023-05-23 13:27:13 -07:00 committed by Kent Keirsey
parent 020f3ccf07
commit c4277b0662
2 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
invokeai/app/invocations/controlnet_image_processors.py
View File

@ -26,7 +26,7 @@ from controlnet_aux import (
OpenposeDetector, OpenposeDetector,
PidiNetDetector, PidiNetDetector,
ContentShuffleDetector, ContentShuffleDetector,
# ZoeDetector, # FIXME: uncomment once ZoeDetector is availabel in official controlnet_aux release ZoeDetector,
) )
from .image import ImageOutput, build_image_output, PILInvocationConfig from .image import ImageOutput, build_image_output, PILInvocationConfig
@ -390,16 +390,14 @@ class ContentShuffleImageProcessorInvocation(ImageProcessorInvocation, PILInvoca
return processed_image return processed_image
# # FIXME: ZoeDetector was implemented _after_ most recent official release of controlnet_aux (v0.0.3) class ZoeDepthImageProcessorInvocation(ImageProcessorInvocation, PILInvocationConfig):
# # so it is commented out until a new release is made """Applies Zoe depth processing to image"""
# class ZoeDepthImageProcessorInvocation(ImageProcessorInvocation, PILInvocationConfig): # fmt: off
# """Applies Zoe depth processing to image""" type: Literal["zoe_depth_image_processor"] = "zoe_depth_image_processor"
# # fmt: off # fmt: on
# type: Literal["zoe_depth_image_processor"] = "zoe_depth_image_processor"
# # fmt: on def run_processor(self, image):
# zoe_depth_processor = ZoeDetector.from_pretrained("lllyasviel/Annotators")
# def run_processor(self, image): processed_image = zoe_depth_processor(image)
# zoe_depth_processor = ZoeDetector.from_pretrained("lllyasviel/Annotators") return processed_image
# processed_image = zoe_depth_processor(image)
# return processed_image

3
pyproject.toml
View File

@ -39,7 +39,8 @@ dependencies = [
"click", "click",
"clip_anytorch", # replacing "clip @ https://github.com/openai/CLIP/archive/eaa22acb90a5876642d0507623e859909230a52d.zip", "clip_anytorch", # replacing "clip @ https://github.com/openai/CLIP/archive/eaa22acb90a5876642d0507623e859909230a52d.zip",
"compel~=1.1.5", "compel~=1.1.5",
"controlnet-aux==0.0.3", "controlnet-aux>=0.0.4",
"timm==0.6.13", # needed to override timm latest in controlnet_aux, see https://github.com/isl-org/ZoeDepth/issues/26
"datasets", "datasets",
"diffusers[torch]~=0.16.1", "diffusers[torch]~=0.16.1",
"dnspython==2.2.1", "dnspython==2.2.1",