Fix triton.ops import error by using local VAE types

Fixes #340 - Installation error with PyTorch 2.7+cu126 and triton_windows

Replace diffusers.models.autoencoders.vae imports with local implementations
of DecoderOutput and DiagonalGaussianDistribution to avoid triggering the
bitsandbytes -> triton.ops import chain that fails on newer triton versions.
This commit is contained in:
Adrien Toupet
2025-11-30 08:27:01 -05:00
parent b0ac880a4f
commit 021fc7b70f
3 changed files with 51 additions and 2 deletions
@@ -17,7 +17,6 @@ import torch
import torch.nn as nn
import torch.nn.functional as F
from diffusers.models.attention_processor import Attention, SpatialNorm
from diffusers.models.autoencoders.vae import DecoderOutput, DiagonalGaussianDistribution
from diffusers.models.downsampling import Downsample2D
from diffusers.models.lora import LoRACompatibleConv
from diffusers.models.modeling_outputs import AutoencoderKLOutput
@@ -46,6 +45,8 @@ from .types import (
CausalAutoencoderOutput,
CausalDecoderOutput,
CausalEncoderOutput,
DecoderOutput,
DiagonalGaussianDistribution,
MemoryState,
_inflation_mode_t,
_memory_device_t,
+48
View File
@@ -74,3 +74,51 @@ class CausalEncoderOutput(NamedTuple):
class CausalDecoderOutput(NamedTuple):
sample: torch.Tensor
class DecoderOutput:
"""Output of decoding method - matches diffusers.models.autoencoders.vae.DecoderOutput"""
def __init__(self, sample: torch.Tensor, commit_loss: Optional[torch.Tensor] = None):
self.sample = sample
self.commit_loss = commit_loss
class DiagonalGaussianDistribution:
"""Matches diffusers.models.autoencoders.vae.DiagonalGaussianDistribution exactly."""
def __init__(self, parameters: torch.Tensor, deterministic: bool = False):
self.parameters = parameters
self.mean, self.logvar = torch.chunk(parameters, 2, dim=1)
self.logvar = torch.clamp(self.logvar, -30.0, 20.0)
self.deterministic = deterministic
self.std = torch.exp(0.5 * self.logvar)
self.var = torch.exp(self.logvar)
if self.deterministic:
self.var = self.std = torch.zeros_like(
self.mean, device=self.parameters.device, dtype=self.parameters.dtype
)
def sample(self, generator: Optional[torch.Generator] = None) -> torch.Tensor:
if self.deterministic:
return self.mode()
sample = torch.randn(
self.mean.shape,
generator=generator,
device=self.parameters.device,
dtype=self.parameters.dtype,
)
return self.mean + self.std * sample
def mode(self) -> torch.Tensor:
return self.mean
def kl(self, other: Optional["DiagonalGaussianDistribution"] = None) -> torch.Tensor:
if other is None:
return 0.5 * torch.sum(
self.mean.pow(2) + self.var - 1.0 - self.logvar,
dim=[1, 2, 3],
)
return 0.5 * torch.sum(
(self.mean - other.mean).pow(2) / other.var
+ self.var / other.var - 1.0 - self.logvar + other.logvar,
dim=[1, 2, 3],
)
+1 -1
View File
@@ -15,7 +15,6 @@ from typing import Optional, Tuple, Literal, Callable, Union
import torch
import torch.nn as nn
import torch.nn.functional as F
from diffusers.models.autoencoders.vae import DiagonalGaussianDistribution
from einops import rearrange
from ....common.half_precision_fixes import safe_pad_operation
@@ -36,6 +35,7 @@ from .types import (
CausalAutoencoderOutput,
CausalDecoderOutput,
CausalEncoderOutput,
DiagonalGaussianDistribution,
MemoryState,
_inflation_mode_t,
_memory_device_t,