"tools/preprocess_mmdata.py" did not exist on "3207c19ab48212da1220300bca1a4bbcde60e08f"
Unverified Commit e564abe2 authored by YiYi Xu's avatar YiYi Xu Committed by GitHub
Browse files

fix controlnet module refactor (#9968)

* fix
parent 3139d39f
...@@ -38,7 +38,7 @@ from ...loaders import ( ...@@ -38,7 +38,7 @@ from ...loaders import (
StableDiffusionXLLoraLoaderMixin, StableDiffusionXLLoraLoaderMixin,
TextualInversionLoaderMixin, TextualInversionLoaderMixin,
) )
from ...models import AutoencoderKL, ControlNetModel, ImageProjection, UNet2DConditionModel from ...models import AutoencoderKL, ControlNetModel, ImageProjection, MultiControlNetModel, UNet2DConditionModel
from ...models.attention_processor import ( from ...models.attention_processor import (
AttnProcessor2_0, AttnProcessor2_0,
XFormersAttnProcessor, XFormersAttnProcessor,
...@@ -61,8 +61,6 @@ from .pag_utils import PAGMixin ...@@ -61,8 +61,6 @@ from .pag_utils import PAGMixin
if is_invisible_watermark_available(): if is_invisible_watermark_available():
from ..stable_diffusion_xl.watermark import StableDiffusionXLWatermarker from ..stable_diffusion_xl.watermark import StableDiffusionXLWatermarker
from ..controlnet.multicontrolnet import MultiControlNetModel
logger = logging.get_logger(__name__) # pylint: disable=invalid-name logger = logging.get_logger(__name__) # pylint: disable=invalid-name
......
...@@ -452,6 +452,21 @@ class MultiAdapter(metaclass=DummyObject): ...@@ -452,6 +452,21 @@ class MultiAdapter(metaclass=DummyObject):
requires_backends(cls, ["torch"]) requires_backends(cls, ["torch"])
class MultiControlNetModel(metaclass=DummyObject):
_backends = ["torch"]
def __init__(self, *args, **kwargs):
requires_backends(self, ["torch"])
@classmethod
def from_config(cls, *args, **kwargs):
requires_backends(cls, ["torch"])
@classmethod
def from_pretrained(cls, *args, **kwargs):
requires_backends(cls, ["torch"])
class PixArtTransformer2DModel(metaclass=DummyObject): class PixArtTransformer2DModel(metaclass=DummyObject):
_backends = ["torch"] _backends = ["torch"]
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment