holm/easydiffusion
1
0
Fork 0
forked from extern/easydiffusion
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't check for ldm, since it doesn't register in the pkgutils

Browse Source
This commit is contained in:
cmdr2 2022-10-10 20:59:43 +05:30
parent c91348dae7
commit 199fa4a0f5
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
installer/installer/helpers.py
View File

@ -1,3 +1,4 @@
import os
from os import path from os import path
import subprocess import subprocess
import traceback import traceback
@ -38,20 +39,24 @@ def modules_exist_in_env(modules, env_dir_path=app.project_env_dir_path):
module_args = ' '.join(modules) module_args = ' '.join(modules)
check_modules_cmd = f'python "{check_modules_script_path}" {module_args}' check_modules_cmd = f'python "{check_modules_script_path}" {module_args}'
env = os.environ.copy()
env['PYTHONPATH'] = app.stable_diffusion_repo_dir_path + ';' + os.path.join(app.project_env_dir_path, 'lib', 'site-packages')
if app.activated_env_dir_path != env_dir_path: if app.activated_env_dir_path != env_dir_path:
activate_cmd = f'micromamba activate "{env_dir_path}"' activate_cmd = f'micromamba activate "{env_dir_path}"'
check_modules_cmd = f'{activate_cmd} && {check_modules_cmd}' check_modules_cmd = f'{activate_cmd} && {check_modules_cmd}'
# activate and run the modules checker # activate and run the modules checker
output, _ = run(check_modules_cmd, get_output=True) output, _ = run(check_modules_cmd, get_output=True, env=env)
if 'Missing' in output: if 'Missing' in output:
log(output)
return False return False
return True return True
def fail_with_install_error(error_msg): def fail_with_install_error(error_msg):
try: try:
log(traceback.format_exc()) log(traceback.format_stack())
log(f''' log(f'''
Error: {error_msg}. Sorry about that, please try to: Error: {error_msg}. Sorry about that, please try to:

2
installer/installer/tasks/install_stable_diffusion_packages.py
View File

@ -56,4 +56,4 @@ Downloading packages necessary for Stable Diffusion..
''') ''')
def is_valid_env(): def is_valid_env():
return helpers.modules_exist_in_env(('torch', 'ldm', 'antlr4', 'transformers', 'numpy', 'gfpgan', 'realesrgan', 'basicsr')) return helpers.modules_exist_in_env(('torch', 'antlr4', 'transformers', 'numpy', 'gfpgan', 'realesrgan', 'basicsr'))