diff --git a/nodes.py b/nodes.py index 67553fd..a3478a5 100644 --- a/nodes.py +++ b/nodes.py @@ -10,13 +10,14 @@ from tqdm import tqdm from .wanvideo.modules.clip import CLIPModel from .wanvideo.modules.model import rope_params from .wanvideo.modules.t5 import T5EncoderModel -from .wanvideo.utils.fm_solvers import (FlowDPMSolverMultistepScheduler, - get_sampling_sigmas, retrieve_timesteps) -from .wanvideo.utils.fm_solvers_unipc import FlowUniPCMultistepScheduler -from .wanvideo.utils.basic_flowmatch import FlowMatchScheduler -from .wanvideo.utils.flowmatch_pusa import FlowMatchSchedulerPusa + +from .wanvideo.schedulers import ( + FlowDPMSolverMultistepScheduler, FlowUniPCMultistepScheduler, + FlowMatchScheduler, FlowMatchSchedulerPusa, FlowMatchLCMScheduler, + get_sampling_sigmas, retrieve_timesteps +) + from diffusers.schedulers import FlowMatchEulerDiscreteScheduler, DEISMultistepScheduler -from .wanvideo.utils.scheduling_flow_match_lcm import FlowMatchLCMScheduler from .multitalk.multitalk import timestep_transform, add_noise diff --git a/skyreels/nodes.py b/skyreels/nodes.py index 663d37a..d2d8fd8 100644 --- a/skyreels/nodes.py +++ b/skyreels/nodes.py @@ -6,9 +6,9 @@ import math from tqdm import tqdm from ..wanvideo.modules.model import rope_params -from ..wanvideo.utils.fm_solvers_unipc import FlowUniPCMultistepScheduler +from ..wanvideo.schedulers.fm_solvers_unipc import FlowUniPCMultistepScheduler from diffusers.schedulers import FlowMatchEulerDiscreteScheduler -from ..wanvideo.utils.scheduling_flow_match_lcm import FlowMatchLCMScheduler +from ..wanvideo.schedulers.scheduling_flow_match_lcm import FlowMatchLCMScheduler from ..nodes import optimized_scale from einops import rearrange diff --git a/wanvideo/schedulers/__init__.py b/wanvideo/schedulers/__init__.py new file mode 100644 index 0000000..3f5e8b5 --- /dev/null +++ b/wanvideo/schedulers/__init__.py @@ -0,0 +1,5 @@ +from .fm_solvers import (FlowDPMSolverMultistepScheduler, get_sampling_sigmas, retrieve_timesteps) +from .fm_solvers_unipc import FlowUniPCMultistepScheduler +from .basic_flowmatch import FlowMatchScheduler +from .flowmatch_pusa import FlowMatchSchedulerPusa +from .scheduling_flow_match_lcm import FlowMatchLCMScheduler diff --git a/wanvideo/utils/basic_flowmatch.py b/wanvideo/schedulers/basic_flowmatch.py similarity index 100% rename from wanvideo/utils/basic_flowmatch.py rename to wanvideo/schedulers/basic_flowmatch.py diff --git a/wanvideo/utils/flowmatch_pusa.py b/wanvideo/schedulers/flowmatch_pusa.py similarity index 98% rename from wanvideo/utils/flowmatch_pusa.py rename to wanvideo/schedulers/flowmatch_pusa.py index c465fbc..12c3b32 100644 --- a/wanvideo/utils/flowmatch_pusa.py +++ b/wanvideo/schedulers/flowmatch_pusa.py @@ -38,7 +38,6 @@ class FlowMatchSchedulerPusa(): def step(self, model_output, timestep, sample, to_final=False, **kwargs): - print("timestep in scheduler", timestep) if isinstance(timestep, torch.Tensor): # timestep = timestep.cpu() self.timesteps = self.timesteps.to(timestep.device) @@ -75,7 +74,7 @@ class FlowMatchSchedulerPusa(): if torch.any(timestep == 0): zero_indices = torch.where(timestep == 0)[1].to(torch.long) sigma[:,:,zero_indices] = 0 - print("sigma", sigma[0,0,:,0,0], '\n', "sigma_", sigma_[0,0,:,0,0]) + #print("sigma", sigma[0,0,:,0,0], '\n', "sigma_", sigma_[0,0,:,0,0]) prev_sample = sample + model_output * (sigma_ - sigma) return prev_sample diff --git a/wanvideo/utils/fm_solvers.py b/wanvideo/schedulers/fm_solvers.py similarity index 100% rename from wanvideo/utils/fm_solvers.py rename to wanvideo/schedulers/fm_solvers.py diff --git a/wanvideo/utils/fm_solvers_unipc.py b/wanvideo/schedulers/fm_solvers_unipc.py similarity index 100% rename from wanvideo/utils/fm_solvers_unipc.py rename to wanvideo/schedulers/fm_solvers_unipc.py diff --git a/wanvideo/utils/scheduling_flow_match_lcm.py b/wanvideo/schedulers/scheduling_flow_match_lcm.py similarity index 100% rename from wanvideo/utils/scheduling_flow_match_lcm.py rename to wanvideo/schedulers/scheduling_flow_match_lcm.py diff --git a/wanvideo/utils/__init__.py b/wanvideo/utils/__init__.py deleted file mode 100644 index 6e9a339..0000000 --- a/wanvideo/utils/__init__.py +++ /dev/null @@ -1,8 +0,0 @@ -from .fm_solvers import (FlowDPMSolverMultistepScheduler, get_sampling_sigmas, - retrieve_timesteps) -from .fm_solvers_unipc import FlowUniPCMultistepScheduler - -__all__ = [ - 'HuggingfaceTokenizer', 'get_sampling_sigmas', 'retrieve_timesteps', - 'FlowDPMSolverMultistepScheduler', 'FlowUniPCMultistepScheduler' -]