Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

support diffusers >=0.29.0 #85

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/idm_vton/unet_block_hacked_garmnet.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,10 @@
from diffusers.utils.torch_utils import apply_freeu
from diffusers.models.activations import get_activation
from diffusers.models.attention_processor import Attention, AttnAddedKVProcessor, AttnAddedKVProcessor2_0
from diffusers.models.dual_transformer_2d import DualTransformer2DModel
try:
from diffusers.models.transformers.dual_transformer_2d import DualTransformer2DModel
except ImportError:
from diffusers.models.dual_transformer_2d import DualTransformer2DModel
from diffusers.models.normalization import AdaGroupNorm
from diffusers.models.resnet import Downsample2D, FirDownsample2D, FirUpsample2D, KDownsample2D, KUpsample2D, ResnetBlock2D, Upsample2D
from .transformerhacked_garmnet import Transformer2DModel
Expand Down
6 changes: 5 additions & 1 deletion src/idm_vton/unet_block_hacked_tryon.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,11 @@
from diffusers.utils.torch_utils import apply_freeu
from diffusers.models.activations import get_activation
from diffusers.models.attention_processor import Attention, AttnAddedKVProcessor, AttnAddedKVProcessor2_0
from diffusers.models.dual_transformer_2d import DualTransformer2DModel
try:
# >=0.29.0
from diffusers.models.transformers.dual_transformer_2d import DualTransformer2DModel
except ImportError:
from diffusers.models.dual_transformer_2d import DualTransformer2DModel
from diffusers.models.normalization import AdaGroupNorm
from diffusers.models.resnet import Downsample2D, FirDownsample2D, FirUpsample2D, KDownsample2D, KUpsample2D, ResnetBlock2D, Upsample2D
from .transformerhacked_tryon import Transformer2DModel
Expand Down
5 changes: 4 additions & 1 deletion src/idm_vton/unet_hacked_garmnet.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,10 @@
get_up_block,
)
from diffusers.models.resnet import Downsample2D, FirDownsample2D, FirUpsample2D, KDownsample2D, KUpsample2D, ResnetBlock2D, Upsample2D
from diffusers.models.transformer_2d import Transformer2DModel
try:
from diffusers.models.transformers.transformer_2d import Transformer2DModel
except ModuleNotFoundError:
from diffusers.models.transformer_2d import Transformer2DModel


logger = logging.get_logger(__name__) # pylint: disable=invalid-name
Expand Down
5 changes: 4 additions & 1 deletion src/idm_vton/unet_hacked_tryon.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,10 @@
get_up_block,
)
from diffusers.models.resnet import Downsample2D, FirDownsample2D, FirUpsample2D, KDownsample2D, KUpsample2D, ResnetBlock2D, Upsample2D
from diffusers.models.transformer_2d import Transformer2DModel
try:
from diffusers.models.transformers.transformer_2d import Transformer2DModelOutput
except ModuleNotFoundError:
from diffusers.models.transformer_2d import Transformer2DModel
import math

from ..ip_adapter.ip_adapter import Resampler
Expand Down
6 changes: 4 additions & 2 deletions src/ip_adapter/attention_processor.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,10 @@
from diffusers.models.lora import LoRACompatibleLinear
from diffusers.models.lora import LoRALinearLayer,LoRAConv2dLayer
from einops import rearrange

from diffusers.models.transformer_2d import Transformer2DModel
try:
from diffusers.models.transformers.transformer_2d import Transformer2DModel
except ModuleNotFoundError:
from diffusers.models.transformer_2d import Transformer2DModel

class AttnProcessor(nn.Module):
r"""
Expand Down
1 change: 1 addition & 0 deletions src/nodes/pipeline_loader.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ def load_pipeline(self, weight_dtype):
unet = UNet2DConditionModel.from_pretrained(
WEIGHTS_PATH,
subfolder="unet",
safety_checker=None,
torch_dtype=weight_dtype
).requires_grad_(False).eval().to(DEVICE)

Expand Down