From 68405910ba4f62a9a8e0bad1fb726ee9751565fc Mon Sep 17 00:00:00 2001 From: blessedcoolant <54517381+blessedcoolant@users.noreply.github.com> Date: Thu, 8 Jun 2023 04:42:52 +1200 Subject: [PATCH] Upgrade to Diffusers 0.17.0 --- invokeai/app/invocations/latent.py | 2 +- invokeai/backend/generator/txt2img.py | 2 +- invokeai/backend/stable_diffusion/diffusers_pipeline.py | 2 +- pyproject.toml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/invokeai/app/invocations/latent.py b/invokeai/app/invocations/latent.py index ba65e214c3..e0c1b150ea 100644 --- a/invokeai/app/invocations/latent.py +++ b/invokeai/app/invocations/latent.py @@ -5,7 +5,7 @@ import einops from typing import Literal, Optional, Union, List from compel import Compel -from diffusers.pipelines.stable_diffusion.pipeline_stable_diffusion_controlnet import MultiControlNetModel +from diffusers.pipelines.controlnet import MultiControlNetModel from pydantic import BaseModel, Field, validator import torch diff --git a/invokeai/backend/generator/txt2img.py b/invokeai/backend/generator/txt2img.py index a83a8e0c31..3ed6e5bdce 100644 --- a/invokeai/backend/generator/txt2img.py +++ b/invokeai/backend/generator/txt2img.py @@ -6,7 +6,7 @@ import torch from typing import Any, Callable, Dict, List, Optional, Tuple, Union from diffusers.models.controlnet import ControlNetModel, ControlNetOutput -from diffusers.pipelines.stable_diffusion.pipeline_stable_diffusion_controlnet import MultiControlNetModel +from diffusers.pipelines.controlnet import MultiControlNetModel from ..stable_diffusion import ( ConditioningData, diff --git a/invokeai/backend/stable_diffusion/diffusers_pipeline.py b/invokeai/backend/stable_diffusion/diffusers_pipeline.py index 2867630881..3c2b119d22 100644 --- a/invokeai/backend/stable_diffusion/diffusers_pipeline.py +++ b/invokeai/backend/stable_diffusion/diffusers_pipeline.py @@ -23,7 +23,7 @@ from diffusers.pipelines.stable_diffusion import StableDiffusionPipelineOutput from diffusers.pipelines.stable_diffusion.pipeline_stable_diffusion import ( StableDiffusionPipeline, ) -from diffusers.pipelines.stable_diffusion.pipeline_stable_diffusion_controlnet import MultiControlNetModel +from diffusers.pipelines.controlnet import MultiControlNetModel from diffusers.pipelines.stable_diffusion.pipeline_stable_diffusion_img2img import ( StableDiffusionImg2ImgPipeline, diff --git a/pyproject.toml b/pyproject.toml index 38f4b7673f..806c2003a3 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -42,7 +42,7 @@ dependencies = [ "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", - "diffusers[torch]~=0.16.1", + "diffusers[torch]~=0.17.0", "dnspython==2.2.1", "einops", "eventlet",