aboutsummaryrefslogtreecommitdiff
path: root/modules/sd_models_config.py
diff options
context:
space:
mode:
authorJaredTherriault <noirjt@live.com>2023-09-04 17:29:33 -0700
committerGitHub <noreply@github.com>2023-09-04 17:29:33 -0700
commit5e16914a4e157ab3ed96f8b7841e1290a56f4484 (patch)
tree655f4582e692f0fc3667b3b668ad365ac3ab92ae /modules/sd_models_config.py
parent8f3b02f09535f55d3673aa9ea589396b8614f799 (diff)
parent5ef669de080814067961f28357256e8fe27544f4 (diff)
Merge branch 'AUTOMATIC1111:master' into master
Diffstat (limited to 'modules/sd_models_config.py')
-rw-r--r--modules/sd_models_config.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/modules/sd_models_config.py b/modules/sd_models_config.py
index 8266fa39..08dd03f1 100644
--- a/modules/sd_models_config.py
+++ b/modules/sd_models_config.py
@@ -2,7 +2,7 @@ import os
import torch
-from modules import shared, paths, sd_disable_initialization
+from modules import shared, paths, sd_disable_initialization, devices
sd_configs_path = shared.sd_configs_path
sd_repo_configs_path = os.path.join(paths.paths['Stable Diffusion'], "configs", "stable-diffusion")
@@ -29,7 +29,6 @@ def is_using_v_parameterization_for_sd2(state_dict):
"""
import ldm.modules.diffusionmodules.openaimodel
- from modules import devices
device = devices.cpu