Mirrored_Repos/InvokeAI
1
0
Fork 0
mirror of https://github.com/invoke-ai/InvokeAI synced 2024-08-30 20:32:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into bugfix/free-gpu-mem-diffuser

Browse Source
This commit is contained in:
Lincoln Stein 2023-01-19 18:03:36 -05:00 committed by GitHub
commit f0010919f2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ldm/invoke/generator/txt2img2img.py
View File

@ -3,6 +3,7 @@ ldm.invoke.generator.txt2img inherits from ldm.invoke.generator
''' '''
import math import math
from diffusers.utils.logging import get_verbosity, set_verbosity, set_verbosity_error
from typing import Callable, Optional from typing import Callable, Optional
import torch import torch
@ -66,6 +67,8 @@ class Txt2Img2Img(Generator):
second_pass_noise = self.get_noise_like(resized_latents) second_pass_noise = self.get_noise_like(resized_latents)
verbosity = get_verbosity()
set_verbosity_error()
pipeline_output = pipeline.img2img_from_latents_and_embeddings( pipeline_output = pipeline.img2img_from_latents_and_embeddings(
resized_latents, resized_latents,
num_inference_steps=steps, num_inference_steps=steps,
@ -73,6 +76,7 @@ class Txt2Img2Img(Generator):
strength=strength, strength=strength,
noise=second_pass_noise, noise=second_pass_noise,
callback=step_callback) callback=step_callback)
set_verbosity(verbosity)
return pipeline.numpy_to_pil(pipeline_output.images)[0] return pipeline.numpy_to_pil(pipeline_output.images)[0]

7
ldm/invoke/model_manager.py
View File

@ -25,6 +25,7 @@ import torch
import safetensors import safetensors
import transformers import transformers
from diffusers import AutoencoderKL, logging as dlogging from diffusers import AutoencoderKL, logging as dlogging
from diffusers.utils.logging import get_verbosity, set_verbosity, set_verbosity_error
from omegaconf import OmegaConf from omegaconf import OmegaConf
from omegaconf.dictconfig import DictConfig from omegaconf.dictconfig import DictConfig
from picklescan.scanner import scan_file_path from picklescan.scanner import scan_file_path
@ -827,11 +828,11 @@ class ModelManager(object):
return model return model
# diffusers really really doesn't like us moving a float16 model onto CPU # diffusers really really doesn't like us moving a float16 model onto CPU
import logging verbosity = get_verbosity()
logging.getLogger('diffusers.pipeline_utils').setLevel(logging.CRITICAL) set_verbosity_error()
model.cond_stage_model.device = 'cpu' model.cond_stage_model.device = 'cpu'
model.to('cpu') model.to('cpu')
logging.getLogger('pipeline_utils').setLevel(logging.INFO) set_verbosity(verbosity)
for submodel in ('first_stage_model','cond_stage_model','model'): for submodel in ('first_stage_model','cond_stage_model','model'):
try: try: