Skip to content

Commit

Permalink
Revert "fall back to vanilla if xformers is not available (Stability-…
Browse files Browse the repository at this point in the history
…AI#51)" (Stability-AI#61)

This reverts commit ef520df.
  • Loading branch information
timudk authored Jul 26, 2023
1 parent 68f3f89 commit a4ceca6
Showing 1 changed file with 0 additions and 9 deletions.
9 changes: 0 additions & 9 deletions sgm/modules/diffusionmodules/model.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
# pytorch_diffusion + derived encoder decoder
import logging
import warnings

import math
from typing import Any, Callable, Optional

Expand Down Expand Up @@ -293,13 +291,6 @@ def make_attn(in_channels, attn_type="vanilla", attn_kwargs=None):
f"as it is too expensive. Please install xformers via e.g. 'pip install xformers==0.0.16'"
)
attn_type = "vanilla-xformers"
if attn_type == "vanilla-xformers" and not XFORMERS_IS_AVAILABLE:
warnings.warn(
f"Requested attention type {attn_type!r} but Xformers is not available; "
f"falling back to vanilla attention"
)
attn_type = "vanilla"
attn_kwargs = None
logger.debug(f"making attention of type '{attn_type}' with {in_channels} in_channels")
if attn_type == "vanilla":
assert attn_kwargs is None
Expand Down

0 comments on commit a4ceca6

Please sign in to comment.