From 51189f74ffef44beafbf97bb86fa622ebfd3b0f6 Mon Sep 17 00:00:00 2001 From: Denis Kochetov Date: Thu, 7 Aug 2025 08:49:13 +0000 Subject: [PATCH] updated code for diffusers fix charactergen --- .../tuneavideo/models/unet_mv2d_condition.py | 12 +++++++----- .../Stage_2D/tuneavideo/models/unet_mv2d_ref.py | 11 ++++++----- .../Era3D/mvdiffusion/models/unet_mv2d_condition.py | 9 +++++---- .../Wonder3D/models/unet_mv2d_condition.py | 9 +++++---- 4 files changed, 23 insertions(+), 18 deletions(-) diff --git a/Gen_3D_Modules/CharacterGen/Stage_2D/tuneavideo/models/unet_mv2d_condition.py b/Gen_3D_Modules/CharacterGen/Stage_2D/tuneavideo/models/unet_mv2d_condition.py index be58de7..3f787c3 100644 --- a/Gen_3D_Modules/CharacterGen/Stage_2D/tuneavideo/models/unet_mv2d_condition.py +++ b/Gen_3D_Modules/CharacterGen/Stage_2D/tuneavideo/models/unet_mv2d_condition.py @@ -1249,7 +1249,7 @@ class UNetMV2DConditionModel(ModelMixin, ConfigMixin, UNet2DConditionLoadersMixi return_unused_kwargs=True, return_commit_hash=True, force_download=force_download, - resume_download=resume_download, + # resume_download=resume_download, proxies=proxies, local_files_only=local_files_only, use_auth_token=use_auth_token, @@ -1304,7 +1304,7 @@ class UNetMV2DConditionModel(ModelMixin, ConfigMixin, UNet2DConditionLoadersMixi weights_name=_add_variant(SAFETENSORS_WEIGHTS_NAME, variant), cache_dir=cache_dir, force_download=force_download, - resume_download=resume_download, + # resume_download=resume_download, proxies=proxies, local_files_only=local_files_only, use_auth_token=use_auth_token, @@ -1323,7 +1323,7 @@ class UNetMV2DConditionModel(ModelMixin, ConfigMixin, UNet2DConditionLoadersMixi weights_name=_add_variant(WEIGHTS_NAME, variant), cache_dir=cache_dir, force_download=force_download, - resume_download=resume_download, + # resume_download=resume_download, proxies=proxies, local_files_only=local_files_only, use_auth_token=use_auth_token, @@ -1347,8 +1347,10 @@ class UNetMV2DConditionModel(ModelMixin, ConfigMixin, UNet2DConditionLoadersMixi default_attn_proc, enabled=name.endswith("attn1.processor"), name=name ) model.set_attn_processor(unet_lora_attn_procs) - state_dict = load_state_dict(model_file, variant=variant) - model._convert_deprecated_attention_blocks(state_dict) + # state_dict = load_state_dict(model_file, variant=variant) + state_dict = load_state_dict(model_file) + + # model._convert_deprecated_attention_blocks(state_dict) conv_in_weight = state_dict['conv_in.weight'] conv_out_weight = state_dict['conv_out.weight'] diff --git a/Gen_3D_Modules/CharacterGen/Stage_2D/tuneavideo/models/unet_mv2d_ref.py b/Gen_3D_Modules/CharacterGen/Stage_2D/tuneavideo/models/unet_mv2d_ref.py index bef070c..c5c9316 100644 --- a/Gen_3D_Modules/CharacterGen/Stage_2D/tuneavideo/models/unet_mv2d_ref.py +++ b/Gen_3D_Modules/CharacterGen/Stage_2D/tuneavideo/models/unet_mv2d_ref.py @@ -1310,7 +1310,7 @@ class UNetMV2DRefModel(ModelMixin, ConfigMixin, UNet2DConditionLoadersMixin): return_unused_kwargs=True, return_commit_hash=True, force_download=force_download, - resume_download=resume_download, + # resume_download=resume_download, proxies=proxies, local_files_only=local_files_only, use_auth_token=use_auth_token, @@ -1365,7 +1365,7 @@ class UNetMV2DRefModel(ModelMixin, ConfigMixin, UNet2DConditionLoadersMixin): weights_name=_add_variant(SAFETENSORS_WEIGHTS_NAME, variant), cache_dir=cache_dir, force_download=force_download, - resume_download=resume_download, + # resume_download=resume_download, proxies=proxies, local_files_only=local_files_only, use_auth_token=use_auth_token, @@ -1384,7 +1384,7 @@ class UNetMV2DRefModel(ModelMixin, ConfigMixin, UNet2DConditionLoadersMixin): weights_name=_add_variant(WEIGHTS_NAME, variant), cache_dir=cache_dir, force_download=force_download, - resume_download=resume_download, + # resume_download=resume_download, proxies=proxies, local_files_only=local_files_only, use_auth_token=use_auth_token, @@ -1408,8 +1408,9 @@ class UNetMV2DRefModel(ModelMixin, ConfigMixin, UNet2DConditionLoadersMixin): default_attn_proc, enabled=name.endswith("attn1.processor"), name=name ) model.set_attn_processor(unet_lora_attn_procs) - state_dict = load_state_dict(model_file, variant=variant) - model._convert_deprecated_attention_blocks(state_dict) + # state_dict = load_state_dict(model_file, variant=variant) + state_dict = load_state_dict(model_file) + # model._convert_deprecated_attention_blocks(state_dict) conv_in_weight = state_dict['conv_in.weight'] conv_out_weight = state_dict['conv_out.weight'] diff --git a/Gen_3D_Modules/Era3D/mvdiffusion/models/unet_mv2d_condition.py b/Gen_3D_Modules/Era3D/mvdiffusion/models/unet_mv2d_condition.py index 7bd9f9b..e62845e 100644 --- a/Gen_3D_Modules/Era3D/mvdiffusion/models/unet_mv2d_condition.py +++ b/Gen_3D_Modules/Era3D/mvdiffusion/models/unet_mv2d_condition.py @@ -1417,7 +1417,7 @@ class UNetMV2DConditionModel(ModelMixin, ConfigMixin, UNet2DConditionLoadersMixi return_unused_kwargs=True, return_commit_hash=True, force_download=force_download, - resume_download=resume_download, + # resume_download=resume_download, proxies=proxies, local_files_only=local_files_only, use_auth_token=use_auth_token, @@ -1476,7 +1476,7 @@ class UNetMV2DConditionModel(ModelMixin, ConfigMixin, UNet2DConditionLoadersMixi weights_name=_add_variant(SAFETENSORS_WEIGHTS_NAME, variant), cache_dir=cache_dir, force_download=force_download, - resume_download=resume_download, + # resume_download=resume_download, proxies=proxies, local_files_only=local_files_only, use_auth_token=use_auth_token, @@ -1495,7 +1495,7 @@ class UNetMV2DConditionModel(ModelMixin, ConfigMixin, UNet2DConditionLoadersMixi weights_name=_add_variant(WEIGHTS_NAME, variant), cache_dir=cache_dir, force_download=force_download, - resume_download=resume_download, + # resume_download=resume_download, proxies=proxies, local_files_only=local_files_only, use_auth_token=use_auth_token, @@ -1507,7 +1507,8 @@ class UNetMV2DConditionModel(ModelMixin, ConfigMixin, UNet2DConditionLoadersMixi model = cls.from_config(config, **unused_kwargs) import copy - state_dict_pretrain = load_state_dict(model_file, variant=variant) + # state_dict_pretrain = load_state_dict(model_file, variant=variant) + state_dict = load_state_dict(model_file) state_dict = copy.deepcopy(state_dict_pretrain) if init_mvattn_with_selfattn: diff --git a/Gen_3D_Modules/Wonder3D/models/unet_mv2d_condition.py b/Gen_3D_Modules/Wonder3D/models/unet_mv2d_condition.py index 0511953..f530c4a 100644 --- a/Gen_3D_Modules/Wonder3D/models/unet_mv2d_condition.py +++ b/Gen_3D_Modules/Wonder3D/models/unet_mv2d_condition.py @@ -1222,7 +1222,7 @@ class UNetMV2DConditionModel(ModelMixin, ConfigMixin, UNet2DConditionLoadersMixi return_unused_kwargs=True, return_commit_hash=True, force_download=force_download, - resume_download=resume_download, + # resume_download=resume_download, proxies=proxies, local_files_only=local_files_only, use_auth_token=use_auth_token, @@ -1278,7 +1278,7 @@ class UNetMV2DConditionModel(ModelMixin, ConfigMixin, UNet2DConditionLoadersMixi weights_name=_add_variant(SAFETENSORS_WEIGHTS_NAME, variant), cache_dir=cache_dir, force_download=force_download, - resume_download=resume_download, + # resume_download=resume_download, proxies=proxies, local_files_only=local_files_only, use_auth_token=use_auth_token, @@ -1297,7 +1297,7 @@ class UNetMV2DConditionModel(ModelMixin, ConfigMixin, UNet2DConditionLoadersMixi weights_name=_add_variant(WEIGHTS_NAME, variant), cache_dir=cache_dir, force_download=force_download, - resume_download=resume_download, + # resume_download=resume_download, proxies=proxies, local_files_only=local_files_only, use_auth_token=use_auth_token, @@ -1309,7 +1309,8 @@ class UNetMV2DConditionModel(ModelMixin, ConfigMixin, UNet2DConditionLoadersMixi model = cls.from_config(config, **unused_kwargs) import copy - state_dict_v0 = load_state_dict(model_file, variant=variant) + # state_dict_v0 = load_state_dict(model_file, variant=variant) + state_dict_v0 = load_state_dict(model_file) state_dict = copy.deepcopy(state_dict_v0) # attn_joint -> attn_joint_last; norm_joint -> norm_joint_last # attn_joint_twice -> attn_joint_mid; norm_joint_twice -> norm_joint_mid