diff --git a/modules/modelLoader/flux/FluxModelLoader.py b/modules/modelLoader/flux/FluxModelLoader.py index bdbb4bc1a..7e59c5a44 100644 --- a/modules/modelLoader/flux/FluxModelLoader.py +++ b/modules/modelLoader/flux/FluxModelLoader.py @@ -54,6 +54,23 @@ def __load_diffusers( include_text_encoder_1: bool, include_text_encoder_2: bool, ): + diffusers_sub = [] + transformers_sub = [] + if not transformer_model_name: + 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 = CLIPTokenizer.from_pretrained( base_model_name, 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/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/mixin/HFModelLoaderMixin.py b/modules/modelLoader/mixin/HFModelLoaderMixin.py index 35786ebf5..7b6aa4e09 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 @@ -288,3 +289,22 @@ def _convert_diffusers_sub_module_to_dtype( train_dtype, None, ) + + 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 + + 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, + ) + except huggingface_hub.errors.HFValidationError: + pass + except Exception: + traceback.print_exc() + print("Error during bulk preloading of Huggingface model repository, proceeding without preloading") diff --git a/modules/modelLoader/stableDiffusion3/StableDiffusion3ModelLoader.py b/modules/modelLoader/stableDiffusion3/StableDiffusion3ModelLoader.py index e8a207cfd..7bb7ff390 100644 --- a/modules/modelLoader/stableDiffusion3/StableDiffusion3ModelLoader.py +++ b/modules/modelLoader/stableDiffusion3/StableDiffusion3ModelLoader.py @@ -47,6 +47,8 @@ def __load_diffusers( include_text_encoder_2: bool, include_text_encoder_3: bool, ): + #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( base_model_name, diff --git a/start-ui.bat b/start-ui.bat index e63033b66..26805633e 100644 --- a/start-ui.bat +++ b/start-ui.bat @@ -35,6 +35,14 @@ 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 disabled, to enable it set as 0 before launch + :check_python_version echo Checking Python version... %PYTHON% --version 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" "$@"