From a40c25ec4f2485b13a393e8f3c440d59deb1d9bf Mon Sep 17 00:00:00 2001 From: dxqbYD Date: Sun, 12 Jan 2025 16:44:44 +0100 Subject: [PATCH 01/18] override Flux transformer --- modules/cloud/BaseCloud.py | 2 + modules/modelLoader/flux/FluxModelLoader.py | 43 +++++++++++++++------ modules/trainer/CloudTrainer.py | 2 + modules/ui/ModelTab.py | 3 +- 4 files changed, 38 insertions(+), 12 deletions(-) diff --git a/modules/cloud/BaseCloud.py b/modules/cloud/BaseCloud.py index 11cfd1b4d..19e650559 100644 --- a/modules/cloud/BaseCloud.py +++ b/modules/cloud/BaseCloud.py @@ -44,6 +44,8 @@ def upload_config(self,commands : TrainCommands=None): if hasattr(self.config,"local_base_model_name"): self.file_sync.sync_up(local=Path(self.config.local_base_model_name),remote=Path(self.config.base_model_name)) + if hasattr(self.config.prior,"local_model_name"): + self.file_sync.sync_up(local=Path(self.config.prior.local_model_name),remote=Path(self.config.prior.model_name)) if hasattr(self.config,"local_lora_model_name"): self.file_sync.sync_up(local=Path(self.config.local_lora_model_name),remote=Path(self.config.lora_model_name)) diff --git a/modules/modelLoader/flux/FluxModelLoader.py b/modules/modelLoader/flux/FluxModelLoader.py index bfbff1159..a00c2087a 100644 --- a/modules/modelLoader/flux/FluxModelLoader.py +++ b/modules/modelLoader/flux/FluxModelLoader.py @@ -28,13 +28,14 @@ def __load_internal( model_type: ModelType, weight_dtypes: ModelWeightDtypes, base_model_name: str, + transformer_model_name: str, vae_model_name: str, include_text_encoder_1: bool, include_text_encoder_2: bool, ): if os.path.isfile(os.path.join(base_model_name, "meta.json")): self.__load_diffusers( - model, model_type, weight_dtypes, base_model_name, vae_model_name, + model, model_type, weight_dtypes, base_model_name, transformer_model_name, vae_model_name, include_text_encoder_1, include_text_encoder_2, ) else: @@ -46,6 +47,7 @@ def __load_diffusers( model_type: ModelType, weight_dtypes: ModelWeightDtypes, base_model_name: str, + transformer_model_name: str, vae_model_name: str, include_text_encoder_1: bool, include_text_encoder_2: bool, @@ -109,13 +111,22 @@ def __load_diffusers( "vae", ) - transformer = self._load_diffusers_sub_module( - FluxTransformer2DModel, - weight_dtypes.prior, - weight_dtypes.train_dtype, - base_model_name, - "transformer", - ) + if transformer_model_name: + transformer = FluxTransformer2DModel.from_single_file( + transformer_model_name, + torch_dtype = weight_dtypes.prior.torch_dtype(), + ) + transformer = self._convert_diffusers_sub_module_to_dtype( + transformer, weight_dtypes.prior, weight_dtypes.train_dtype + ) + else: + transformer = self._load_diffusers_sub_module( + FluxTransformer2DModel, + weight_dtypes.prior, + weight_dtypes.train_dtype, + base_model_name, + "transformer", + ) model.model_type = model_type model.tokenizer_1 = tokenizer_1 @@ -146,13 +157,23 @@ def __load_safetensors( model_type: ModelType, weight_dtypes: ModelWeightDtypes, base_model_name: str, + transformer_model_name: str, vae_model_name: str, include_text_encoder_1: bool, include_text_encoder_2: bool, ): + if transformer_model_name: + transformer = FluxTransformer2DModel.from_single_file( + transformer_model_name, + torch_dtype = weight_dtypes.prior.torch_dtype(), + ) + else: + transformer=None + pipeline = FluxPipeline.from_single_file( pretrained_model_link_or_path=base_model_name, safety_checker=None, + transformer=transformer, ) if include_text_encoder_2: @@ -218,7 +239,7 @@ def load( try: self.__load_internal( - model, model_type, weight_dtypes, model_names.base_model, model_names.vae_model, + model, model_type, weight_dtypes, model_names.base_model, model_names.prior_model, model_names.vae_model, model_names.include_text_encoder, model_names.include_text_encoder_2, ) return @@ -227,7 +248,7 @@ def load( try: self.__load_diffusers( - model, model_type, weight_dtypes, model_names.base_model, model_names.vae_model, + model, model_type, weight_dtypes, model_names.base_model, model_names.prior_model, model_names.vae_model, model_names.include_text_encoder, model_names.include_text_encoder_2, ) return @@ -236,7 +257,7 @@ def load( try: self.__load_safetensors( - model, model_type, weight_dtypes, model_names.base_model, model_names.vae_model, + model, model_type, weight_dtypes, model_names.base_model, model_names.prior_model, model_names.vae_model, model_names.include_text_encoder, model_names.include_text_encoder_2, ) return diff --git a/modules/trainer/CloudTrainer.py b/modules/trainer/CloudTrainer.py index 8e984abdd..45bad4338 100644 --- a/modules/trainer/CloudTrainer.py +++ b/modules/trainer/CloudTrainer.py @@ -162,6 +162,8 @@ def adjust(config,attribute : str): adjust(remote,"cache_dir") if Path(remote.base_model_name).exists() or remote.base_model_name.startswith("cloud:"): adjust(remote,"base_model_name") + if Path(remote.prior.model_name).exists() or remote.prior.model_name.startswith("cloud:"): + adjust(remote.prior,"model_name") adjust(remote,"output_model_destination") adjust(remote,"lora_model_name") diff --git a/modules/ui/ModelTab.py b/modules/ui/ModelTab.py index f28482a80..6a1dc6ad0 100644 --- a/modules/ui/ModelTab.py +++ b/modules/ui/ModelTab.py @@ -101,6 +101,7 @@ def __setup_flux_ui(self): row = self.__create_base_components( row, has_prior=True, + allow_override_prior=True, has_text_encoder_1=True, has_text_encoder_2=True, has_vae=True, @@ -252,7 +253,7 @@ def __create_base_components( if allow_override_prior: # prior model components.label(self.scroll_frame, row, 0, "Prior Model", - tooltip="Filename, directory or Hugging Face repository of the prior model") + tooltip="Filename, directory or Hugging Face repository of the prior model. For Flux, it must be a safetensors file that only contains the transformer.") components.file_entry( self.scroll_frame, row, 1, self.ui_state, "prior.model_name", path_modifier=lambda x: Path(x).parent.absolute() if x.endswith(".json") else x From c5c08a21d2d5938bae2c8b748d54b2196aab7f4b Mon Sep 17 00:00:00 2001 From: dxqbYD Date: Wed, 29 Jan 2025 11:18:43 +0100 Subject: [PATCH 02/18] ignore hugging face connection error for offline training --- modules/trainer/GenericTrainer.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/modules/trainer/GenericTrainer.py b/modules/trainer/GenericTrainer.py index f4e11bec4..ce2817524 100644 --- a/modules/trainer/GenericTrainer.py +++ b/modules/trainer/GenericTrainer.py @@ -5,6 +5,8 @@ import traceback from collections.abc import Callable from pathlib import Path +from requests.exceptions import ConnectionError +import contextlib from modules.dataLoader.BaseDataLoader import BaseDataLoader from modules.model.BaseModel import BaseModel @@ -106,10 +108,11 @@ def start(self): if self.config.secrets.huggingface_token != "": self.callbacks.on_update_status("logging into Hugging Face") - huggingface_hub.login( - token = self.config.secrets.huggingface_token, - new_session = False, - ) + with contextlib.suppress(ConnectionError): + huggingface_hub.login( + token = self.config.secrets.huggingface_token, + new_session = False, + ) self.callbacks.on_update_status("loading the model") self.model = self.model_loader.load( From b60968da3fd8816a3439dd01a9afb025278b61cc Mon Sep 17 00:00:00 2001 From: dxqbYD Date: Wed, 29 Jan 2025 11:26:40 +0100 Subject: [PATCH 03/18] pre-commit fix --- modules/modelSampler/BaseModelSampler.py | 2 +- modules/trainer/GenericTrainer.py | 4 ++-- modules/ui/CloudTab.py | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/modelSampler/BaseModelSampler.py b/modules/modelSampler/BaseModelSampler.py index ebda34e28..2689faa0c 100644 --- a/modules/modelSampler/BaseModelSampler.py +++ b/modules/modelSampler/BaseModelSampler.py @@ -1,5 +1,5 @@ -import os import io +import os from abc import ABCMeta, abstractmethod from collections.abc import Callable from pathlib import Path diff --git a/modules/trainer/GenericTrainer.py b/modules/trainer/GenericTrainer.py index ce2817524..0ef77def6 100644 --- a/modules/trainer/GenericTrainer.py +++ b/modules/trainer/GenericTrainer.py @@ -1,3 +1,4 @@ +import contextlib import copy import json import os @@ -5,8 +6,6 @@ import traceback from collections.abc import Callable from pathlib import Path -from requests.exceptions import ConnectionError -import contextlib from modules.dataLoader.BaseDataLoader import BaseDataLoader from modules.model.BaseModel import BaseModel @@ -38,6 +37,7 @@ from torchvision.transforms.functional import pil_to_tensor import huggingface_hub +from requests.exceptions import ConnectionError from tqdm import tqdm diff --git a/modules/ui/CloudTab.py b/modules/ui/CloudTab.py index 6a8b29b66..09a1f7325 100644 --- a/modules/ui/CloudTab.py +++ b/modules/ui/CloudTab.py @@ -1,4 +1,6 @@ +import webbrowser + from modules.util.config.TrainConfig import TrainConfig from modules.util.enum.CloudAction import CloudAction from modules.util.enum.CloudFileSync import CloudFileSync @@ -7,8 +9,6 @@ from modules.util.ui.UIState import UIState import customtkinter as ctk -import webbrowser - class CloudTab: From aec59b6346a15a7fc2b80b938ad31e35b15e21c3 Mon Sep 17 00:00:00 2001 From: dxqbYD Date: Sat, 22 Feb 2025 13:56:21 +0100 Subject: [PATCH 04/18] clean exit --- modules/ui/TrainUI.py | 5 ++++- scripts/train_ui.py | 1 - 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/ui/TrainUI.py b/modules/ui/TrainUI.py index 5a97d08d0..be89e5070 100644 --- a/modules/ui/TrainUI.py +++ b/modules/ui/TrainUI.py @@ -86,8 +86,11 @@ def __init__(self): # Persistent profiling window. self.profiling_window = ProfilingWindow(self) - def close(self): + self.protocol("WM_DELETE_WINDOW", self.__close) + + def __close(self): self.top_bar_component.save_default() + self.quit() def top_bar(self, master): return TopBar( diff --git a/scripts/train_ui.py b/scripts/train_ui.py index 9234ac479..46ee8f1e6 100644 --- a/scripts/train_ui.py +++ b/scripts/train_ui.py @@ -8,7 +8,6 @@ def main(): ui = TrainUI() ui.mainloop() - ui.close() if __name__ == '__main__': From bf38e5526b4801c568dc3f5ffd0116bb231bb233 Mon Sep 17 00:00:00 2001 From: dxqbYD Date: Sat, 29 Mar 2025 08:47:49 +0100 Subject: [PATCH 05/18] avoid loading in float32; bugfix --- modules/modelLoader/flux/FluxModelLoader.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/modules/modelLoader/flux/FluxModelLoader.py b/modules/modelLoader/flux/FluxModelLoader.py index a00c2087a..bdbb4bc1a 100644 --- a/modules/modelLoader/flux/FluxModelLoader.py +++ b/modules/modelLoader/flux/FluxModelLoader.py @@ -7,6 +7,8 @@ from modules.util.ModelNames import ModelNames from modules.util.ModelWeightDtypes import ModelWeightDtypes +import torch + from diffusers import ( AutoencoderKL, FlowMatchEulerDiscreteScheduler, @@ -114,7 +116,8 @@ def __load_diffusers( if transformer_model_name: transformer = FluxTransformer2DModel.from_single_file( transformer_model_name, - torch_dtype = weight_dtypes.prior.torch_dtype(), + #avoid loading the transformer in float32: + torch_dtype = torch.bfloat16 if weight_dtypes.prior.torch_dtype() is None else weight_dtypes.prior.torch_dtype() ) transformer = self._convert_diffusers_sub_module_to_dtype( transformer, weight_dtypes.prior, weight_dtypes.train_dtype @@ -162,14 +165,11 @@ def __load_safetensors( include_text_encoder_1: bool, include_text_encoder_2: bool, ): - if transformer_model_name: - transformer = FluxTransformer2DModel.from_single_file( - transformer_model_name, - torch_dtype = weight_dtypes.prior.torch_dtype(), - ) - else: - transformer=None - + transformer = FluxTransformer2DModel.from_single_file( + #always load transformer separately even though FluxPipeLine.from_single_file() could load it, to avoid loading in float32: + transformer_model_name if transformer_model_name else base_model_name, + torch_dtype = torch.bfloat16 if weight_dtypes.prior.torch_dtype() is None else weight_dtypes.prior.torch_dtype() + ) pipeline = FluxPipeline.from_single_file( pretrained_model_link_or_path=base_model_name, safety_checker=None, From 851c3f28f7c84ff4f420a538769babce6357fd02 Mon Sep 17 00:00:00 2001 From: dxqbYD Date: Sat, 5 Apr 2025 11:09:33 +0200 Subject: [PATCH 06/18] prepare HF submodules --- modules/modelLoader/flux/FluxModelLoader.py | 15 +++++++++++++++ modules/modelLoader/mixin/HFModelLoaderMixin.py | 14 ++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/modules/modelLoader/flux/FluxModelLoader.py b/modules/modelLoader/flux/FluxModelLoader.py index bfbff1159..9d020985d 100644 --- a/modules/modelLoader/flux/FluxModelLoader.py +++ b/modules/modelLoader/flux/FluxModelLoader.py @@ -50,6 +50,21 @@ def __load_diffusers( include_text_encoder_1: bool, include_text_encoder_2: bool, ): + diffusers_sub = ["transformer"] + transformers_sub = [] + if include_text_encoder_1: + transformers_sub.append("text_encoder") + if include_text_encoder_2: + diffusers_sub.append("text_encoder_2") + if not vae_model_name: + diffusers_sub.append("vae") + + self._prepare_sub_modules( + base_model_name, + diffusers_modules=diffusers_sub, + transformers_modules=transformers_sub, + ) + if include_text_encoder_1: tokenizer_1 = CLIPTokenizer.from_pretrained( base_model_name, diff --git a/modules/modelLoader/mixin/HFModelLoaderMixin.py b/modules/modelLoader/mixin/HFModelLoaderMixin.py index 8e3d64c2c..a90dc930e 100644 --- a/modules/modelLoader/mixin/HFModelLoaderMixin.py +++ b/modules/modelLoader/mixin/HFModelLoaderMixin.py @@ -288,3 +288,17 @@ def _convert_diffusers_sub_module_to_dtype( train_dtype, None, ) + + def _prepare_sub_modules(self, pretrained_model_name_or_path: str, diffusers_modules: list, transformers_modules: list): + is_local = os.path.isdir(pretrained_model_name_or_path) + if is_local: + return + + diffusers_paths = [folder + "/diffusion_pytorch_model*" for folder in diffusers_modules] + transformers_paths = [folder + "/model*" for folder in transformers_modules] + transformers_paths.extend([folder + "/pytorch_model*" for folder in transformers_modules]) + + huggingface_hub.snapshot_download( + pretrained_model_name_or_path, + allow_patterns=diffusers_paths + transformers_paths, + ) From 4d0ccaae6163947696394623a1935eff2b9325be Mon Sep 17 00:00:00 2001 From: dxqbYD Date: Sat, 5 Apr 2025 13:09:20 +0200 Subject: [PATCH 07/18] merged #639 --- modules/modelLoader/flux/FluxModelLoader.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/modelLoader/flux/FluxModelLoader.py b/modules/modelLoader/flux/FluxModelLoader.py index 147c9a32c..70f2d509e 100644 --- a/modules/modelLoader/flux/FluxModelLoader.py +++ b/modules/modelLoader/flux/FluxModelLoader.py @@ -54,8 +54,10 @@ def __load_diffusers( include_text_encoder_1: bool, include_text_encoder_2: bool, ): - diffusers_sub = ["transformer"] + diffusers_sub = [] transformers_sub = [] + if not transformer_model_name: + diffusers_sub.apprent("transformer") if include_text_encoder_1: transformers_sub.append("text_encoder") if include_text_encoder_2: From 42831d718b638539d3bc92724710cedb0c12059c Mon Sep 17 00:00:00 2001 From: dxqbYD Date: Sat, 5 Apr 2025 13:13:56 +0200 Subject: [PATCH 08/18] typo --- modules/modelLoader/flux/FluxModelLoader.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/modelLoader/flux/FluxModelLoader.py b/modules/modelLoader/flux/FluxModelLoader.py index 70f2d509e..4e0449d1d 100644 --- a/modules/modelLoader/flux/FluxModelLoader.py +++ b/modules/modelLoader/flux/FluxModelLoader.py @@ -57,7 +57,7 @@ def __load_diffusers( diffusers_sub = [] transformers_sub = [] if not transformer_model_name: - diffusers_sub.apprent("transformer") + diffusers_sub.append("transformer") if include_text_encoder_1: transformers_sub.append("text_encoder") if include_text_encoder_2: From 7fe85daa3c56ec9846df6d9c790c92a444254794 Mon Sep 17 00:00:00 2001 From: dxqbYD Date: Sat, 5 Apr 2025 17:28:13 +0200 Subject: [PATCH 09/18] bugfix --- modules/modelLoader/flux/FluxModelLoader.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/modelLoader/flux/FluxModelLoader.py b/modules/modelLoader/flux/FluxModelLoader.py index 4e0449d1d..7e59c5a44 100644 --- a/modules/modelLoader/flux/FluxModelLoader.py +++ b/modules/modelLoader/flux/FluxModelLoader.py @@ -61,7 +61,7 @@ def __load_diffusers( if include_text_encoder_1: transformers_sub.append("text_encoder") if include_text_encoder_2: - diffusers_sub.append("text_encoder_2") + transformers_sub.append("text_encoder_2") if not vae_model_name: diffusers_sub.append("vae") From fcb581a6a6bb4fb64ecc337198b11f40d7de4681 Mon Sep 17 00:00:00 2001 From: dxqbYD Date: Sat, 17 May 2025 20:07:07 +0200 Subject: [PATCH 10/18] temperature --- modules/modelSetup/BaseFluxSetup.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/modelSetup/BaseFluxSetup.py b/modules/modelSetup/BaseFluxSetup.py index 8574a8b5f..c1c40a39e 100644 --- a/modules/modelSetup/BaseFluxSetup.py +++ b/modules/modelSetup/BaseFluxSetup.py @@ -236,6 +236,9 @@ def predict( latent_noise = self._create_noise(scaled_latent_image, config, generator) + temperature = 1.5 + latent_noise *= temperature ** 0.5 + timestep = self._get_timestep_discrete( model.noise_scheduler.config['num_train_timesteps'], deterministic, @@ -304,7 +307,7 @@ def predict( latent_input.shape[3], ) - flow = latent_noise - scaled_latent_image + flow = latent_noise / (temperature ** 0.5) - scaled_latent_image model_output_data = { 'loss_type': 'target', 'timestep': timestep, From f2381f125a3b09b8f2a7b66a52a685885c0793f2 Mon Sep 17 00:00:00 2001 From: dxqbYD Date: Sun, 18 May 2025 09:41:50 +0200 Subject: [PATCH 11/18] Revert "temperature" This reverts commit fcb581a6a6bb4fb64ecc337198b11f40d7de4681. --- modules/modelSetup/BaseFluxSetup.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/modules/modelSetup/BaseFluxSetup.py b/modules/modelSetup/BaseFluxSetup.py index c1c40a39e..8574a8b5f 100644 --- a/modules/modelSetup/BaseFluxSetup.py +++ b/modules/modelSetup/BaseFluxSetup.py @@ -236,9 +236,6 @@ def predict( latent_noise = self._create_noise(scaled_latent_image, config, generator) - temperature = 1.5 - latent_noise *= temperature ** 0.5 - timestep = self._get_timestep_discrete( model.noise_scheduler.config['num_train_timesteps'], deterministic, @@ -307,7 +304,7 @@ def predict( latent_input.shape[3], ) - flow = latent_noise / (temperature ** 0.5) - scaled_latent_image + flow = latent_noise - scaled_latent_image model_output_data = { 'loss_type': 'target', 'timestep': timestep, From 612d2564277bba1935159329830e156a040b75a3 Mon Sep 17 00:00:00 2001 From: dxqbYD Date: Thu, 10 Jul 2025 15:13:32 +0200 Subject: [PATCH 12/18] exception handling --- modules/modelLoader/mixin/HFModelLoaderMixin.py | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/modules/modelLoader/mixin/HFModelLoaderMixin.py b/modules/modelLoader/mixin/HFModelLoaderMixin.py index f64ad6625..264e301b3 100644 --- a/modules/modelLoader/mixin/HFModelLoaderMixin.py +++ b/modules/modelLoader/mixin/HFModelLoaderMixin.py @@ -18,6 +18,7 @@ import huggingface_hub from huggingface_hub.utils import EntryNotFoundError from safetensors.torch import load_file +import traceback class HFModelLoaderMixin(metaclass=ABCMeta): @@ -298,7 +299,13 @@ def _prepare_sub_modules(self, pretrained_model_name_or_path: str, diffusers_mod transformers_paths = [folder + "/model*" for folder in transformers_modules] transformers_paths.extend([folder + "/pytorch_model*" for folder in transformers_modules]) - huggingface_hub.snapshot_download( - pretrained_model_name_or_path, - allow_patterns=diffusers_paths + transformers_paths, - ) + try: + huggingface_hub.snapshot_download( + pretrained_model_name_or_path, + allow_patterns=diffusers_paths + transformers_paths, + ) + except huggingface_hub.errors.HFValidationError: + pass + except Exception: + traceback.print_exc() + print("Error during bulk preloading of Huggingface model repository, proceeding without preloading") From 83ab35992e5588425a06f014dc36e12421fb9dbc Mon Sep 17 00:00:00 2001 From: dxqbYD Date: Thu, 10 Jul 2025 15:18:38 +0200 Subject: [PATCH 13/18] pre-commit fix --- modules/modelLoader/mixin/HFModelLoaderMixin.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/modelLoader/mixin/HFModelLoaderMixin.py b/modules/modelLoader/mixin/HFModelLoaderMixin.py index 264e301b3..4871f1596 100644 --- a/modules/modelLoader/mixin/HFModelLoaderMixin.py +++ b/modules/modelLoader/mixin/HFModelLoaderMixin.py @@ -1,5 +1,6 @@ import json import os +import traceback from abc import ABCMeta from itertools import repeat @@ -18,7 +19,6 @@ import huggingface_hub from huggingface_hub.utils import EntryNotFoundError from safetensors.torch import load_file -import traceback class HFModelLoaderMixin(metaclass=ABCMeta): From b424f158e4060659a7b559cfcfdca7494bc4e64e Mon Sep 17 00:00:00 2001 From: O-J1 <18110006+O-J1@users.noreply.github.com> Date: Mon, 25 Aug 2025 21:01:21 +1000 Subject: [PATCH 14/18] Disable xet by default but defer to user value, add snapshot dl to SD3 and Hunyuan --- .../hunyuanVideo/HunyuanVideoModelLoader.py | 17 +++++++++++++++++ .../StableDiffusion3ModelLoader.py | 19 +++++++++++++++++++ start-ui.bat | 10 ++++++++++ start-ui.sh | 5 +++++ 4 files changed, 51 insertions(+) diff --git a/modules/modelLoader/hunyuanVideo/HunyuanVideoModelLoader.py b/modules/modelLoader/hunyuanVideo/HunyuanVideoModelLoader.py index 056ca3631..0705ebfe7 100644 --- a/modules/modelLoader/hunyuanVideo/HunyuanVideoModelLoader.py +++ b/modules/modelLoader/hunyuanVideo/HunyuanVideoModelLoader.py @@ -51,6 +51,23 @@ def __load_diffusers( include_text_encoder_1: bool, include_text_encoder_2: bool, ): + diffusers_sub = [] + transformers_sub = [] + + diffusers_sub.append("transformer") + if include_text_encoder_1: + transformers_sub.append("text_encoder") + if include_text_encoder_2: + transformers_sub.append("text_encoder_2") + if not vae_model_name: + diffusers_sub.append("vae") + + self._prepare_sub_modules( + base_model_name, + diffusers_modules=diffusers_sub, + transformers_modules=transformers_sub, + ) + if include_text_encoder_1: tokenizer_1 = LlamaTokenizerFast.from_pretrained( base_model_name, diff --git a/modules/modelLoader/stableDiffusion3/StableDiffusion3ModelLoader.py b/modules/modelLoader/stableDiffusion3/StableDiffusion3ModelLoader.py index e8a207cfd..990995173 100644 --- a/modules/modelLoader/stableDiffusion3/StableDiffusion3ModelLoader.py +++ b/modules/modelLoader/stableDiffusion3/StableDiffusion3ModelLoader.py @@ -47,6 +47,25 @@ def __load_diffusers( include_text_encoder_2: bool, include_text_encoder_3: bool, ): + diffusers_sub = [] + transformers_sub = [] + + diffusers_sub.append("transformer") + if include_text_encoder_1: + transformers_sub.append("text_encoder") + if include_text_encoder_2: + transformers_sub.append("text_encoder_2") + if include_text_encoder_3: + transformers_sub.append("text_encoder_3") + if not vae_model_name: + diffusers_sub.append("vae") + + self._prepare_sub_modules( + base_model_name, + diffusers_modules=diffusers_sub, + transformers_modules=transformers_sub, + ) + if include_text_encoder_1: tokenizer_1 = CLIPTokenizer.from_pretrained( base_model_name, diff --git a/start-ui.bat b/start-ui.bat index 177e19c1e..681b6de24 100644 --- a/start-ui.bat +++ b/start-ui.bat @@ -35,6 +35,16 @@ set PYTHON="%VENV_DIR%\Scripts\python.exe" if defined PROFILE (set PYTHON=%PYTHON% -m scalene --off --cpu --gpu --profile-all --no-browser) echo Using Python %PYTHON% +REM Disable HF_HUB_DISABLE_XET, buggy; default disables Xet (set to 0 to enable) - https://github.com/Nerogar/OneTrainer/issues/949 +if not defined HF_HUB_DISABLE_XET ( + set "HF_HUB_DISABLE_XET=1" +) +echo HF_HUB_DISABLE_XET=%HF_HUB_DISABLE_XET% +echo. +echo NOTE: XeT allows even higher speed, parallel downloads, however its buggy +echo NOTE: Only enable it if your download speed is greater than 40 megabytes per second (MB/s) - not megabits. +echo. + :launch echo Starting UI... %PYTHON% scripts\train_ui.py diff --git a/start-ui.sh b/start-ui.sh index b2960c262..2f0eecc0d 100755 --- a/start-ui.sh +++ b/start-ui.sh @@ -4,6 +4,11 @@ set -e source "${BASH_SOURCE[0]%/*}/lib.include.sh" +# Xet is buggy. Disabled by default unless already defined - https://github.com/Nerogar/OneTrainer/issues/949 +if [[ -z "${HF_HUB_DISABLE_XET+x}" ]]; then + export HF_HUB_DISABLE_XET=1 +fi + prepare_runtime_environment run_python_in_active_env "scripts/train_ui.py" "$@" From d3bc5989245a68f6943bbfccb78e574331ade70d Mon Sep 17 00:00:00 2001 From: O-J1 <18110006+O-J1@users.noreply.github.com> Date: Mon, 25 Aug 2025 22:24:27 +1000 Subject: [PATCH 15/18] Less verbose note on Xet --- start-ui.bat | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/start-ui.bat b/start-ui.bat index 2bc886ae8..26805633e 100644 --- a/start-ui.bat +++ b/start-ui.bat @@ -41,9 +41,7 @@ if not defined HF_HUB_DISABLE_XET ( ) echo HF_HUB_DISABLE_XET=%HF_HUB_DISABLE_XET% echo. -echo NOTE: XeT allows even higher speed, parallel downloads, however its buggy -echo NOTE: Only enable it if your download speed is greater than 40 megabytes per second (MB/s) - not megabits. -echo. +echo NOTE: Xet disabled, to enable it set as 0 before launch :check_python_version echo Checking Python version... From 39db6f64f20f71521e21794ae21daf7c31dbaed2 Mon Sep 17 00:00:00 2001 From: O-J1 <18110006+O-J1@users.noreply.github.com> Date: Mon, 25 Aug 2025 22:45:31 +1000 Subject: [PATCH 16/18] Update with ignore patterns to not download fp16 for SD3.X --- modules/modelLoader/mixin/HFModelLoaderMixin.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/modules/modelLoader/mixin/HFModelLoaderMixin.py b/modules/modelLoader/mixin/HFModelLoaderMixin.py index e56fca1b5..a7a9ea7f3 100644 --- a/modules/modelLoader/mixin/HFModelLoaderMixin.py +++ b/modules/modelLoader/mixin/HFModelLoaderMixin.py @@ -294,6 +294,11 @@ def _prepare_sub_modules(self, pretrained_model_name_or_path: str, diffusers_mod is_local = os.path.isdir(pretrained_model_name_or_path) if is_local: return + # SAI polluted their sd3 / sd3.5 medium repo text encoders with fp16 files, so we need to explicitly ignore them + ignore_patterns = [ + "*fp16*.safetensors", + "*.bin", # We dont ever want bin files + ] diffusers_paths = [folder + "/diffusion_pytorch_model*" for folder in diffusers_modules] transformers_paths = [folder + "/model*" for folder in transformers_modules] @@ -303,6 +308,7 @@ def _prepare_sub_modules(self, pretrained_model_name_or_path: str, diffusers_mod huggingface_hub.snapshot_download( pretrained_model_name_or_path, allow_patterns=diffusers_paths + transformers_paths, + ignore_patterns=ignore_patterns, ) except huggingface_hub.errors.HFValidationError: pass From a37ea8456f49904b1892c11c80eced46055d0f4b Mon Sep 17 00:00:00 2001 From: dxqbYD Date: Tue, 26 Aug 2025 17:22:18 +0200 Subject: [PATCH 17/18] add HiDream, remove ignorepattern --- .../modelLoader/hiDream/HiDreamModelLoader.py | 28 +++++++++++++++++++ .../modelLoader/mixin/HFModelLoaderMixin.py | 15 +++------- 2 files changed, 32 insertions(+), 11 deletions(-) diff --git a/modules/modelLoader/hiDream/HiDreamModelLoader.py b/modules/modelLoader/hiDream/HiDreamModelLoader.py index 19f51e6eb..d734cb232 100644 --- a/modules/modelLoader/hiDream/HiDreamModelLoader.py +++ b/modules/modelLoader/hiDream/HiDreamModelLoader.py @@ -64,6 +64,34 @@ def __load_diffusers( include_text_encoder_3: bool, include_text_encoder_4: bool, ): + diffusers_sub = [] + transformers_sub = [] + + diffusers_sub.append("transformer") + if include_text_encoder_1: + transformers_sub.append("text_encoder") + if include_text_encoder_2: + transformers_sub.append("text_encoder_2") + if include_text_encoder_3: + transformers_sub.append("text_encoder_3") + if include_text_encoder_4: + if text_encoder_4_model_name: + self._prepare_sub_modules( + text_encoder_4_model_name, + transformers_modules=[""], + diffusers_modules=[], + ) + else: + transformers_sub.append("text_encoder_4") + if not vae_model_name: + diffusers_sub.append("vae") + + self._prepare_sub_modules( + base_model_name, + diffusers_modules=diffusers_sub, + transformers_modules=transformers_sub, + ) + tokenizer_1 = CLIPTokenizer.from_pretrained( base_model_name, subfolder="tokenizer", diff --git a/modules/modelLoader/mixin/HFModelLoaderMixin.py b/modules/modelLoader/mixin/HFModelLoaderMixin.py index a7a9ea7f3..7b6aa4e09 100644 --- a/modules/modelLoader/mixin/HFModelLoaderMixin.py +++ b/modules/modelLoader/mixin/HFModelLoaderMixin.py @@ -290,25 +290,18 @@ def _convert_diffusers_sub_module_to_dtype( None, ) - def _prepare_sub_modules(self, pretrained_model_name_or_path: str, diffusers_modules: list, transformers_modules: list): + def _prepare_sub_modules(self, pretrained_model_name_or_path: str, diffusers_modules: list[str], transformers_modules: list[str]): is_local = os.path.isdir(pretrained_model_name_or_path) if is_local: return - # SAI polluted their sd3 / sd3.5 medium repo text encoders with fp16 files, so we need to explicitly ignore them - ignore_patterns = [ - "*fp16*.safetensors", - "*.bin", # We dont ever want bin files - ] - - diffusers_paths = [folder + "/diffusion_pytorch_model*" for folder in diffusers_modules] - transformers_paths = [folder + "/model*" for folder in transformers_modules] - transformers_paths.extend([folder + "/pytorch_model*" for folder in transformers_modules]) + diffusers_paths = [((folder + "/") if folder else "") + "diffusion_pytorch_model*" for folder in diffusers_modules] + transformers_paths = [((folder + "/") if folder else "") + "model*" for folder in transformers_modules] + transformers_paths.extend([((folder + "/") if folder else "") + "pytorch_model*" for folder in transformers_modules]) try: huggingface_hub.snapshot_download( pretrained_model_name_or_path, allow_patterns=diffusers_paths + transformers_paths, - ignore_patterns=ignore_patterns, ) except huggingface_hub.errors.HFValidationError: pass From 1d7210a5d589c0722f3025c1205ecfb150f16ddc Mon Sep 17 00:00:00 2001 From: dxqbYD Date: Tue, 26 Aug 2025 17:45:15 +0200 Subject: [PATCH 18/18] remove SD3 --- .../StableDiffusion3ModelLoader.py | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/modules/modelLoader/stableDiffusion3/StableDiffusion3ModelLoader.py b/modules/modelLoader/stableDiffusion3/StableDiffusion3ModelLoader.py index 990995173..7bb7ff390 100644 --- a/modules/modelLoader/stableDiffusion3/StableDiffusion3ModelLoader.py +++ b/modules/modelLoader/stableDiffusion3/StableDiffusion3ModelLoader.py @@ -47,24 +47,7 @@ def __load_diffusers( include_text_encoder_2: bool, include_text_encoder_3: bool, ): - diffusers_sub = [] - transformers_sub = [] - - diffusers_sub.append("transformer") - if include_text_encoder_1: - transformers_sub.append("text_encoder") - if include_text_encoder_2: - transformers_sub.append("text_encoder_2") - if include_text_encoder_3: - transformers_sub.append("text_encoder_3") - if not vae_model_name: - diffusers_sub.append("vae") - - self._prepare_sub_modules( - base_model_name, - diffusers_modules=diffusers_sub, - transformers_modules=transformers_sub, - ) + #no call to self._prepare_sub_modules, because SAI polluted their sd3 / sd3.5 medium repo text encoders with fp16 files if include_text_encoder_1: tokenizer_1 = CLIPTokenizer.from_pretrained(