rename files

modules/dat_model.py

@@ -4,7 +4,7 @@ from modules import modelloader, errors
 from modules.shared import cmd_opts, opts
 from modules.upscaler import Upscaler, UpscalerData
 from modules.upscaler_utils import upscale_with_model
-from modules_forge.forge_util import prepare_free_memory
+from modules_forge.utils import prepare_free_memory
 
 
 class UpscalerDAT(Upscaler):

modules/esrgan_model.py

@@ -2,7 +2,7 @@ from modules import modelloader, devices, errors
 from modules.shared import opts
 from modules.upscaler import Upscaler, UpscalerData
 from modules.upscaler_utils import upscale_with_model
-from modules_forge.forge_util import prepare_free_memory
+from modules_forge.utils import prepare_free_memory
 
 
 class UpscalerESRGAN(Upscaler):

modules/face_restoration_utils.py

@@ -10,7 +10,7 @@ import numpy as np
 import torch
 
 from modules import devices, errors, face_restoration, shared
-from modules_forge.forge_util import prepare_free_memory
+from modules_forge.utils import prepare_free_memory
 
 if TYPE_CHECKING:
     from facexlib.utils.face_restoration_helper import FaceRestoreHelper

modules/hat_model.py

@@ -5,7 +5,7 @@ from modules import modelloader, devices
 from modules.shared import opts
 from modules.upscaler import Upscaler, UpscalerData
 from modules.upscaler_utils import upscale_with_model
-from modules_forge.forge_util import prepare_free_memory
+from modules_forge.utils import prepare_free_memory
 
 
 class UpscalerHAT(Upscaler):

modules/processing.py

@@ -34,7 +34,7 @@ from ldm.models.diffusion.ddpm import LatentDepth2ImageDiffusion
 from einops import repeat, rearrange
 from blendmodes.blend import blendLayers, BlendType
 from modules.sd_models import apply_token_merging
-from modules_forge.forge_util import apply_circular_forge
+from modules_forge.utils import apply_circular_forge
 
 
 # some of those options should not be changed at all because they would break the model, so I removed them from options.

modules/realesrgan_model.py

@@ -4,7 +4,7 @@ from modules import modelloader, errors
 from modules.shared import cmd_opts, opts
 from modules.upscaler import Upscaler, UpscalerData
 from modules.upscaler_utils import upscale_with_model
-from modules_forge.forge_util import prepare_free_memory
+from modules_forge.utils import prepare_free_memory
 
 
 class UpscalerRealESRGAN(Upscaler):

modules/sd_models.py

@@ -17,7 +17,7 @@ from modules import paths, shared, modelloader, devices, script_callbacks, sd_va
 from modules.shared import opts
 from modules.timer import Timer
 import numpy as np
-from modules_forge import forge_loader
+from modules_forge import loader
 from backend import memory_management
 
 
@@ -663,7 +663,7 @@ def load_model(checkpoint_info=None, already_loaded_state_dict=None):
         # cache newly loaded model
         checkpoints_loaded[checkpoint_info] = state_dict.copy()
 
-    sd_model = forge_loader.load_model_for_a1111(timer=timer, checkpoint_info=checkpoint_info, state_dict=state_dict)
+    sd_model = loader.load_model_for_a1111(timer=timer, checkpoint_info=checkpoint_info, state_dict=state_dict)
     sd_model.filename = checkpoint_info.filename
 
     if not SkipWritingToConfig.skip:

modules/sd_models_xl.py

@@ -9,7 +9,7 @@ from modules import devices, shared, prompt_parser
 from modules import torch_utils
 
 from backend import memory_management
-from modules_forge.forge_clip import move_clip_to_gpu
+from modules_forge.clip import move_clip_to_gpu
 
 
 def get_learned_conditioning(self: sgm.models.diffusion.DiffusionEngine, batch: prompt_parser.SdConditioning | list[str]):