diff --git a/scripts/tilediffusion.py b/scripts/tilediffusion.py index 9843409..a80e6eb 100644 --- a/scripts/tilediffusion.py +++ b/scripts/tilediffusion.py @@ -60,8 +60,11 @@ from modules.shared import opts from modules.processing import opt_f from modules.ui import gr_show -from tile_methods import MultiDiffusion, MixtureOfDiffusers -from tile_utils import * +from tile_utils.typing import * +from tile_utils.utils import * +from tile_methods.multidiffusion import MultiDiffusion +from tile_methods.mixtureofdiffusers import MixtureOfDiffusers + BBOX_MAX_NUM = min(getattr(shared.cmd_opts, "md_max_regions", 8), 16) diff --git a/tile_methods/__init__.py b/tile_methods/__init__.py deleted file mode 100644 index cb058df..0000000 --- a/tile_methods/__init__.py +++ /dev/null @@ -1,2 +0,0 @@ -from .multidiffusion import MultiDiffusion -from .mixtureofdiffusers import MixtureOfDiffusers diff --git a/tile_methods/abstractdiffusion.py b/tile_methods/abstractdiffusion.py index 0102aaa..2ae4711 100644 --- a/tile_methods/abstractdiffusion.py +++ b/tile_methods/abstractdiffusion.py @@ -6,7 +6,8 @@ from modules import devices, shared, prompt_parser from modules.shared import state from modules.processing import opt_f, StableDiffusionProcessing -from utils import * +from tile_utils.typing import * +from tile_utils.utils import * diff --git a/tile_methods/mixtureofdiffusers.py b/tile_methods/mixtureofdiffusers.py index ab59481..a424a93 100644 --- a/tile_methods/mixtureofdiffusers.py +++ b/tile_methods/mixtureofdiffusers.py @@ -3,8 +3,9 @@ import torch from modules import devices, shared, extra_networks from modules.shared import state -from utils import * -from .abstractdiffusion import TiledDiffusion +from tile_utils.typing import * +from tile_utils.utils import * +from tile_methods.abstractdiffusion import TiledDiffusion diff --git a/tile_methods/multidiffusion.py b/tile_methods/multidiffusion.py index 7646aa9..35f937b 100644 --- a/tile_methods/multidiffusion.py +++ b/tile_methods/multidiffusion.py @@ -3,8 +3,9 @@ import torch from modules import devices, extra_networks from modules.shared import state -from tile_utils import * -from .abstractdiffusion import TiledDiffusion +from tile_utils.typing import * +from tile_utils.utils import * +from tile_methods.abstractdiffusion import TiledDiffusion class MultiDiffusion(TiledDiffusion): diff --git a/tile_utils/__init__.py b/tile_utils/__init__.py deleted file mode 100644 index b98cb86..0000000 --- a/tile_utils/__init__.py +++ /dev/null @@ -1,2 +0,0 @@ -from .utils import * -from .typing import * \ No newline at end of file diff --git a/tile_utils/utils.py b/tile_utils/utils.py index 133314b..53ecd1f 100644 --- a/tile_utils/utils.py +++ b/tile_utils/utils.py @@ -8,7 +8,7 @@ import numpy as np from modules import devices, shared, prompt_parser, extra_networks from modules.processing import opt_f -from .typing import * +from tile_utils.typing import * class Method(Enum):