1
0
Fork 0

Revert "wrap some diffusers imports for version safety"

This reverts commit e7f7bbc9ea.
This commit is contained in:
Sean Sube 2023-12-29 18:52:54 -06:00
parent da6beb31b2
commit 8b698ed4ab
Signed by: ssube
GPG Key ID: 3EED7B957D362AF1
2 changed files with 3 additions and 11 deletions

View File

@ -4,10 +4,11 @@ from typing import Union
import numpy as np
import torch
from diffusers import OnnxRuntimeModel
from diffusers.models.autoencoder_kl import AutoencoderKLOutput
from diffusers.models.vae import DecoderOutput
from diffusers.pipelines.onnx_utils import ORT_TO_NP_TYPE
from ...server import ServerContext
from ..version_safe_diffusers import AutoencoderKLOutput, DecoderOutput
logger = getLogger(__name__)

View File

@ -5,9 +5,7 @@ from packaging import version
is_diffusers_0_15 = version.parse(
version.parse(diffusers.__version__).base_version
) >= version.parse("0.15")
is_diffusers_0_24 = version.parse(
version.parse(diffusers.__version__).base_version
) >= version.parse("0.24")
try:
from diffusers import DEISMultistepScheduler
@ -35,10 +33,3 @@ if is_diffusers_0_15:
else:
from diffusers.models.cross_attention import CrossAttnProcessor as AttnProcessor
if is_diffusers_0_24:
from diffusers.models.autoencoders.vae import DecoderOutput
from diffusers.models.modeling_outputs import AutoencoderKLOutput
else:
from diffusers.models.autoencoder_kl import AutoencoderKLOutput
from diffusers.models.vae import DecoderOutput