diff --git a/extensions-builtin/sd_forge_fooocus_inpaint/scripts/forge_fooocus_inpaint.py b/extensions-builtin/sd_forge_fooocus_inpaint/scripts/forge_fooocus_inpaint.py index 1ffe3513..20ed2d57 100644 --- a/extensions-builtin/sd_forge_fooocus_inpaint/scripts/forge_fooocus_inpaint.py +++ b/extensions-builtin/sd_forge_fooocus_inpaint/scripts/forge_fooocus_inpaint.py @@ -5,7 +5,7 @@ import backend.patcher.base from modules_forge.shared import add_supported_control_model from modules_forge.supported_controlnet import ControlModelPatcher -from modules_forge.forge_sampler import sampling_prepare +from backend.sampling.sampling_function import sampling_prepare from backend.utils import load_torch_file from backend.memory_management import cast_to_device, current_loaded_models from backend.patcher.lora import model_lora_keys_unet diff --git a/modules/sd_samplers_cfg_denoiser.py b/modules/sd_samplers_cfg_denoiser.py index 7594d97f..0934ccfe 100644 --- a/modules/sd_samplers_cfg_denoiser.py +++ b/modules/sd_samplers_cfg_denoiser.py @@ -6,7 +6,7 @@ import modules.shared as shared from modules.script_callbacks import CFGDenoiserParams, cfg_denoiser_callback from modules.script_callbacks import CFGDenoisedParams, cfg_denoised_callback from modules.script_callbacks import AfterCFGCallbackParams, cfg_after_cfg_callback -from modules_forge import forge_sampler +from backend.sampling.sampling_function import sampling_function def catenate_conds(conds): @@ -179,8 +179,7 @@ class CFGDenoiser(torch.nn.Module): denoiser_params = CFGDenoiserParams(x, image_cond, sigma, state.sampling_step, state.sampling_steps, cond, uncond, self) cfg_denoiser_callback(denoiser_params) - denoised = forge_sampler.forge_sample(self, denoiser_params=denoiser_params, - cond_scale=cond_scale, cond_composition=cond_composition) + denoised = sampling_function(self, denoiser_params=denoiser_params, cond_scale=cond_scale, cond_composition=cond_composition) if self.mask is not None: blended_latent = denoised * self.nmask + self.init_latent * self.mask @@ -207,4 +206,3 @@ class CFGDenoiser(torch.nn.Module): return eps return denoised.to(device=original_x_device, dtype=original_x_dtype) - diff --git a/modules/sd_samplers_common.py b/modules/sd_samplers_common.py index 56d1dff4..01723c30 100644 --- a/modules/sd_samplers_common.py +++ b/modules/sd_samplers_common.py @@ -5,7 +5,7 @@ import torch from PIL import Image from modules import devices, images, sd_vae_approx, sd_samplers, sd_vae_taesd, shared, sd_models from modules.shared import opts, state -from modules_forge.forge_sampler import sampling_prepare, sampling_cleanup +from backend.sampling.sampling_function import sampling_prepare, sampling_cleanup from modules import extra_networks import k_diffusion.sampling diff --git a/modules/sd_samplers_kdiffusion.py b/modules/sd_samplers_kdiffusion.py index 348d45f1..f0b88c95 100644 --- a/modules/sd_samplers_kdiffusion.py +++ b/modules/sd_samplers_kdiffusion.py @@ -7,7 +7,7 @@ from modules.script_callbacks import ExtraNoiseParams, extra_noise_callback from modules.shared import opts import modules.shared as shared -from modules_forge.forge_sampler import sampling_prepare, sampling_cleanup +from backend.sampling.sampling_function import sampling_prepare, sampling_cleanup samplers_k_diffusion = [ diff --git a/modules/sd_samplers_timesteps.py b/modules/sd_samplers_timesteps.py index 9dbb53b6..08956497 100644 --- a/modules/sd_samplers_timesteps.py +++ b/modules/sd_samplers_timesteps.py @@ -7,7 +7,7 @@ from modules.script_callbacks import ExtraNoiseParams, extra_noise_callback from modules.shared import opts import modules.shared as shared -from modules_forge.forge_sampler import sampling_prepare, sampling_cleanup +from backend.sampling.sampling_function import sampling_prepare, sampling_cleanup samplers_timesteps = [ diff --git a/modules_forge/forge_sampler.py b/modules_forge/forge_sampler.py deleted file mode 100644 index d779b3f7..00000000 --- a/modules_forge/forge_sampler.py +++ /dev/null @@ -1,3 +0,0 @@ -from backend.sampling.sampling_function import * - -forge_sample = sampling_function