all files migrated; tweaks needed

invokeai/backend/stable_diffusion/diffusion/cross_attention_control.py

@@ -15,7 +15,7 @@ from torch import nn
 from compel.cross_attention_control import Arguments
 from diffusers.models.unet_2d_condition import UNet2DConditionModel
 from diffusers.models.cross_attention import AttnProcessor
-from ...devices import torch_dtype
+from ...util import torch_dtype
 
 
 class CrossAttentionType(enum.Enum):

invokeai/backend/stable_diffusion/diffusion/ddpm.py

@@ -23,7 +23,7 @@ from omegaconf import ListConfig
 import urllib
 
 from ..textual_inversion_manager import TextualInversionManager
-from ...util import (
+from ...util.util import (
     log_txt_as_img,
     exists,
     default,

invokeai/backend/stable_diffusion/diffusion/plms.py

@@ -4,7 +4,7 @@ import torch
 import numpy as np
 from tqdm import tqdm
 from functools import partial
-from ...devices import choose_torch_device
+from ...util import choose_torch_device
 from .shared_invokeai_diffusion import InvokeAIDiffuserComponent
 from .sampler import Sampler
 from ..diffusionmodules.util import noise_like

invokeai/backend/stable_diffusion/diffusion/sampler.py

@@ -7,7 +7,7 @@ import torch
 import numpy as np
 from tqdm import tqdm
 from functools import partial
-from ...devices import choose_torch_device
+from ...util import choose_torch_device
 from .shared_invokeai_diffusion import InvokeAIDiffuserComponent
 
 from ..diffusionmodules.util import (

invokeai/backend/stable_diffusion/diffusion/shared_invokeai_diffusion.py

@@ -8,7 +8,7 @@ import torch
 from diffusers.models.cross_attention import AttnProcessor
 from typing_extensions import TypeAlias
 
-from ldm.invoke.globals import Globals
+from invokeai.backend.globals import Globals
 from .cross_attention_control import Arguments, \
     restore_default_cross_attention, override_cross_attention, Context, get_cross_attention_modules, \
     CrossAttentionType, SwapCrossAttnContext