Merge branch 'main' into bugfix/fix-scripts

This commit is contained in:
Jonathan 2023-03-03 20:36:29 -06:00 committed by GitHub
commit 9efeb1b2ec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -8,14 +8,11 @@ from typing import Callable, Optional
import torch import torch
from diffusers.utils.logging import get_verbosity, set_verbosity, set_verbosity_error from diffusers.utils.logging import get_verbosity, set_verbosity, set_verbosity_error
from ..models import PostprocessingSettings from ..stable_diffusion import PostprocessingSettings
from .base import Generator from .base import Generator
from .diffusers_pipeline import ( from ..stable_diffusion.diffusers_pipeline import StableDiffusionGeneratorPipeline
ConditioningData, from ..stable_diffusion.diffusers_pipeline import ConditioningData
StableDiffusionGeneratorPipeline, from ..stable_diffusion.diffusers_pipeline import trim_to_multiple_of
trim_to_multiple_of,
)
class Txt2Img2Img(Generator): class Txt2Img2Img(Generator):
def __init__(self, model, precision): def __init__(self, model, precision):