From 46ffaa2f0d830dd06b4716dbf3ec3a5adde1cb2b Mon Sep 17 00:00:00 2001
From: doctorpangloss <@hiddenswitch.com>
Date: Wed, 28 Aug 2024 14:48:42 -0700
Subject: [PATCH] Fix Flux controlnets

---
 comfy/controlnet.py         | 5 +++--
 comfy/ldm/flux/__init__.py  | 0
 comfy/ldm/hydit/__init__.py | 0
 3 files changed, 3 insertions(+), 2 deletions(-)
 create mode 100644 comfy/ldm/flux/__init__.py
 create mode 100644 comfy/ldm/hydit/__init__.py

diff --git a/comfy/controlnet.py b/comfy/controlnet.py
index e56ad97ef..0959faf0a 100644
--- a/comfy/controlnet.py
+++ b/comfy/controlnet.py
@@ -30,8 +30,9 @@ from . import model_patcher
 from . import ops
 from . import utils
 from .cldm import cldm, mmdit
-from .ldm import hydit, flux
+from .ldm import hydit
 from .ldm.cascade import controlnet as cascade_controlnet
+from .ldm.flux import controlnet_xlabs
 from .ldm.flux.controlnet_instantx import InstantXControlNetFlux
 from .ldm.flux.controlnet_instantx_format2 import InstantXControlNetFluxFormat2
 from .ldm.flux.weight_dtypes import FLUX_WEIGHT_DTYPES
@@ -497,7 +498,7 @@ def load_controlnet_flux_instantx(sd, controlnet_class, weight_dtype, full_path)
 
 def load_controlnet_flux_xlabs(sd):
     model_config, operations, load_device, unet_dtype, manual_cast_dtype, offload_device = controlnet_config(sd)
-    control_model = flux.controlnet_xlabs.ControlNetFlux(operations=operations, device=offload_device, dtype=unet_dtype, **model_config.unet_config)
+    control_model = controlnet_xlabs.ControlNetFlux(operations=operations, device=offload_device, dtype=unet_dtype, **model_config.unet_config)
     control_model = controlnet_load_state_dict(control_model, sd)
     extra_conds = ['y', 'guidance']
     control = ControlNet(control_model, load_device=load_device, manual_cast_dtype=manual_cast_dtype, extra_conds=extra_conds)
diff --git a/comfy/ldm/flux/__init__.py b/comfy/ldm/flux/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/comfy/ldm/hydit/__init__.py b/comfy/ldm/hydit/__init__.py
new file mode 100644
index 000000000..e69de29bb