Skip to content

Commit 84a75de

Browse files
authored
Compatibility patch (transformers) (#1419)
* fix compatibility issue with transformers
1 parent 56f5805 commit 84a75de

3 files changed

Lines changed: 19 additions & 9 deletions

File tree

diffsynth/models/dinov3_image_encoder.py

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
1-
from transformers.models.dinov3_vit.modeling_dinov3_vit import DINOv3ViTModel, DINOv3ViTConfig
2-
from transformers import DINOv3ViTImageProcessor
3-
import torch
4-
1+
import torch, warnings
2+
try:
3+
from transformers.models.dinov3_vit.modeling_dinov3_vit import DINOv3ViTModel
4+
except:
5+
warnings.warn(f"Cannot import `DINOv3ViTModel`. `DINOv3ImageEncoder` is not available. Please update `transformers` by `pip install -U transformers`.")
6+
DINOv3ViTModel = torch.nn.Module
57
from ..core.device.npu_compatible_device import get_device_type
68

79

810
class DINOv3ImageEncoder(DINOv3ViTModel):
911
def __init__(self):
12+
from transformers.models.dinov3_vit.modeling_dinov3_vit import DINOv3ViTConfig
13+
from transformers import DINOv3ViTImageProcessor
1014
config = DINOv3ViTConfig(
1115
architectures = [
1216
"DINOv3ViTModel"

diffsynth/models/siglip2_image_encoder.py

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,17 @@
1-
from transformers.models.siglip.modeling_siglip import SiglipVisionModel, SiglipVisionConfig
2-
from transformers import SiglipImageProcessor, Siglip2VisionModel, Siglip2VisionConfig, Siglip2ImageProcessor
3-
import torch
4-
1+
import torch, warnings
2+
from transformers import Siglip2VisionModel
3+
try:
4+
from transformers.models.siglip.modeling_siglip import SiglipVisionModel
5+
except:
6+
warnings.warn(f"Cannot import `SiglipVisionModel`. `Siglip2ImageEncoder` is not available. Please update `transformers` by `pip install -U transformers`.")
7+
SiglipVisionModel = torch.nn.Module
58
from diffsynth.core.device.npu_compatible_device import get_device_type
69

710

811
class Siglip2ImageEncoder(SiglipVisionModel):
912
def __init__(self):
13+
from transformers.models.siglip.modeling_siglip import SiglipVisionConfig
14+
from transformers import SiglipImageProcessor
1015
config = SiglipVisionConfig(
1116
attention_dropout = 0.0,
1217
dtype = "float32",
@@ -74,6 +79,7 @@ def forward(self, image, torch_dtype=torch.bfloat16, device=get_device_type()):
7479

7580
class Siglip2ImageEncoder428M(Siglip2VisionModel):
7681
def __init__(self):
82+
from transformers import Siglip2VisionConfig, Siglip2ImageProcessor
7783
config = Siglip2VisionConfig(
7884
attention_dropout = 0.0,
7985
dtype = "bfloat16",

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
44

55
[project]
66
name = "diffsynth"
7-
version = "2.0.10"
7+
version = "2.0.11"
88
description = "Enjoy the magic of Diffusion models!"
99
authors = [{name = "ModelScope Team"}]
1010
license = {text = "Apache-2.0"}

0 commit comments

Comments
 (0)