Public/automatic
1
0
Fork 0
mirror of https://github.com/vladmandic/automatic synced 2026-09-20 09:38:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

Avoid using args as a variable name

Browse Source
This commit is contained in:
awsr
2026-03-05 16:16:01 -08:00
parent b2f29911d2
commit 7c09e3dfe1
3 changed files with 106 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files
installer.py
+102 -102
View File
@@ -40,7 +40,7 @@ first_call = True
quick_allowed = True
errors = []
opts = {}
args = Dot({
arguments = Dot({
'debug': False,
'reset': False,
'profile': False,
@@ -89,7 +89,7 @@ except Exception:
@lru_cache
def get_logfile():
log_size = os.path.getsize(log_file) if os.path.exists(log_file) else 0
log.info(f'Logger: file="{os.path.abspath(log_file)}" level={logging.getLevelName(logging.DEBUG if args.debug else logging.INFO)} host="{hostname}" size={log_size} mode={"append" if not log_rolled else "create"}')
log.info(f'Logger: file="{os.path.abspath(log_file)}" level={logging.getLevelName(logging.DEBUG if arguments.debug else logging.INFO)} host="{hostname}" size={log_size} mode={"append" if not log_rolled else "create"}')
return log_file
@@ -169,13 +169,13 @@ def installed(package, friendly: str = None, quiet = False): # pylint: disable=r
if len(p) > 1:
exact = pkg_version == p[1]
if not exact and not quiet:
if args.experimental:
if arguments.experimental:
log.warning(f'Install: package="{p[0]}" installed={pkg_version} required={p[1]} allowing experimental')
else:
log.warning(f'Install: package="{p[0]}" installed={pkg_version} required={p[1]} version mismatch')
global restart_required # pylint: disable=global-statement
restart_required = True
ok = ok and (exact or args.experimental)
ok = ok and (exact or arguments.experimental)
else:
if not quiet:
log.debug(f'Install: package="{p[0]}" install required')
@@ -238,7 +238,7 @@ def pip(arg: str, ignore: bool = False, quiet: bool = True, uv = True):
log.warning('Offline mode enabled')
return 'offline'
package = arg.replace("install", "").replace("--upgrade", "").replace("--no-deps", "").replace("--force-reinstall", "").replace(" ", " ").strip()
uv = uv and args.uv and not package.startswith('git+')
uv = uv and arguments.uv and not package.startswith('git+')
pipCmd = "uv pip" if uv else "pip"
if not quiet and '-r ' not in arg:
log.info(f'Install: package="{package}" mode={"uv" if uv else "pip"}')
@@ -271,13 +271,13 @@ def pip(arg: str, ignore: bool = False, quiet: bool = True, uv = True):
def install(package, friendly: str = None, ignore: bool = False, reinstall: bool = False, no_deps: bool = False, quiet: bool = False, force: bool = False, no_build_isolation: bool = False):
t_start = time.time()
res = ''
if args.reinstall or args.upgrade:
if arguments.reinstall or arguments.upgrade:
global quick_allowed # pylint: disable=global-statement
quick_allowed = False
if (args.reinstall) or (reinstall) or (not installed(package, friendly, quiet=quiet)):
if (arguments.reinstall) or (reinstall) or (not installed(package, friendly, quiet=quiet)):
deps = '' if not no_deps else '--no-deps '
isolation = '' if not no_build_isolation else '--no-build-isolation '
cmd = f"install{' --upgrade' if not args.uv else ''}{' --force-reinstall' if force else ''} {deps}{isolation}{package}"
cmd = f"install{' --upgrade' if not arguments.uv else ''}{' --force-reinstall' if force else ''} {deps}{isolation}{package}"
res = pip(cmd, ignore=ignore, uv=package != "uv" and not package.startswith('git+'))
ts('install', t_start)
return res
@@ -286,7 +286,7 @@ def install(package, friendly: str = None, ignore: bool = False, reinstall: bool
# execute git command
def git(arg: str, folder: str = None, ignore: bool = False, optional: bool = False): # pylint: disable=unused-argument
t_start = time.time()
if args.skip_git:
if arguments.skip_git:
return ''
if 'google.colab' in sys.modules:
return ''
@@ -370,7 +370,7 @@ def update(folder, keep_branch = False, rebase = True):
else:
res = git(f'pull origin {b} {arg}', folder)
debug(f'Install update: folder={folder} branch={b} args={arg} {res}')
if not args.experimental:
if not arguments.experimental:
commit = extensions_commit.get(os.path.basename(folder), None)
if commit is not None:
res = git(f'checkout {commit}', folder)
@@ -432,7 +432,7 @@ def check_python(supported_minors=None, experimental_minors=None, reason=None):
supported_minors = [10, 11, 12, 13]
experimental_minors = [14]
t_start = time.time()
if args.quick:
if arguments.quick:
return
log.info(f'Python: version={platform.python_version()} platform={platform.system()} bin="{sys.executable}" venv="{sys.prefix}"')
if int(sys.version_info.minor) == 9:
@@ -450,13 +450,13 @@ def check_python(supported_minors=None, experimental_minors=None, reason=None):
log.error(f"Python incompatible: current {sys.version_info.major}.{sys.version_info.minor}.{sys.version_info.micro} required 3.{supported_minors}")
if reason is not None:
log.error(reason)
if not args.ignore and not args.experimental:
if not arguments.ignore and not arguments.experimental:
sys.exit(1)
if not args.skip_git:
if not arguments.skip_git:
git_cmd = os.environ.get('GIT', "git")
if shutil.which(git_cmd) is None:
log.error('Git not found')
if not args.ignore:
if not arguments.ignore:
sys.exit(1)
else:
git_version = git('--version', folder=None, ignore=False)
@@ -467,7 +467,7 @@ def check_python(supported_minors=None, experimental_minors=None, reason=None):
# check diffusers version
def check_diffusers():
t_start = time.time()
if args.skip_all:
if arguments.skip_all:
return
target_commit = '8ec0a5ccad96957c10388d2d2acc7fdd8e0fab84' # diffusers commit hash
# if args.use_rocm or args.use_zluda or args.use_directml:
@@ -475,13 +475,13 @@ def check_diffusers():
pkg = package_spec('diffusers')
minor = int(pkg.version.split('.')[1] if pkg is not None else -1)
current = opts.get('diffusers_version', '') if minor > -1 else ''
if (minor == -1) or ((current != target_commit) and (not args.experimental)):
if (minor == -1) or ((current != target_commit) and (not arguments.experimental)):
if minor == -1:
log.info(f'Install: package="diffusers" commit={target_commit}')
else:
log.info(f'Update: package="diffusers" current={pkg.version} hash={current} target={target_commit}')
pip('uninstall --yes diffusers', ignore=True, quiet=True, uv=False)
if args.skip_git:
if arguments.skip_git:
log.warning('Git: marked as not available but required for diffusers installation')
pip(f'install --upgrade git+https://github.com/huggingface/diffusers@{target_commit}', ignore=False, quiet=True, uv=False)
global diffusers_commit # pylint: disable=global-statement
@@ -492,12 +492,12 @@ def check_diffusers():
# check transformers version
def check_transformers():
t_start = time.time()
if args.skip_all or args.skip_git or args.experimental:
if arguments.skip_all or arguments.skip_git or arguments.experimental:
return
pkg_transformers = package_spec('transformers')
pkg_tokenizers = package_spec('tokenizers')
target_commit = '753d61104116eefc8ffc977327b441ee0c8d599f' # transformers commit hash == 4.57.6
if args.use_directml:
if arguments.use_directml:
target_transformers = '4.52.4'
target_tokenizers = '0.21.4'
else:
@@ -505,7 +505,7 @@ def check_transformers():
target_tokenizers = '0.22.2'
if target_transformers is not None:
# Pinned release version (e.g. DirectML)
if (pkg_transformers is None) or ((pkg_transformers.version != target_transformers) or (pkg_tokenizers is None) or ((pkg_tokenizers.version != target_tokenizers) and (not args.experimental))):
if (pkg_transformers is None) or ((pkg_transformers.version != target_transformers) or (pkg_tokenizers is None) or ((pkg_tokenizers.version != target_tokenizers) and (not arguments.experimental))):
if pkg_transformers is None:
log.info(f'Install: package="transformers" version={target_transformers}')
else:
@@ -532,7 +532,7 @@ def check_transformers():
# check onnx version
def check_onnx():
t_start = time.time()
if args.skip_all or args.skip_requirements:
if arguments.skip_all or arguments.skip_requirements:
return
if not installed('onnx', quiet=True):
install('onnx', 'onnx', ignore=True)
@@ -545,7 +545,7 @@ def install_cuda():
t_start = time.time()
log.info('CUDA: nVidia toolkit detected')
ts('cuda', t_start)
if args.use_nightly:
if arguments.use_nightly:
cmd = os.environ.get('TORCH_COMMAND', '--upgrade --pre torch torchvision --index-url https://download.pytorch.org/whl/nightly/cu128 --extra-index-url https://download.pytorch.org/whl/nightly/cu130')
else:
cmd = os.environ.get('TORCH_COMMAND', 'torch==2.10.0+cu128 torchvision==0.25.0+cu128 --index-url https://download.pytorch.org/whl/cu128')
@@ -555,7 +555,7 @@ def install_cuda():
def install_rocm_zluda():
torch_command = ''
t_start = time.time()
if args.skip_all or args.skip_requirements:
if arguments.skip_all or arguments.skip_requirements:
return torch_command
from modules import rocm
@@ -572,7 +572,7 @@ def install_rocm_zluda():
log.warning('ROCm: no agent was found')
else:
log.info(f'ROCm: agents={[gpu.name for gpu in amd_gpus]}')
if args.device_id is None:
if arguments.device_id is None:
index = 0
for idx, gpu in enumerate(amd_gpus):
index = idx
@@ -583,11 +583,11 @@ def install_rocm_zluda():
os.environ.setdefault('HIP_VISIBLE_DEVICES', str(index))
device = amd_gpus[index]
else:
device_id = int(args.device_id)
device_id = int(arguments.device_id)
if device_id < len(amd_gpus):
device = amd_gpus[device_id]
if sys.platform == "win32" and not args.use_zluda and device is not None and device.therock is not None and not installed("rocm"):
if sys.platform == "win32" and not arguments.use_zluda and device is not None and device.therock is not None and not installed("rocm"):
check_python(supported_minors=[11, 12, 13], reason='ROCm backend requires a Python version between 3.11 and 3.13')
install(f"rocm[devel,libraries] --index-url https://rocm.nightlies.amd.com/{device.therock}")
rocm.refresh()
@@ -598,18 +598,18 @@ def install_rocm_zluda():
log.info(msg)
if sys.platform == "win32":
if args.use_zluda:
if arguments.use_zluda:
torch_command = os.environ.get('TORCH_COMMAND', 'torch==2.7.1+cu118 torchvision==0.22.1+cu118 --index-url https://download.pytorch.org/whl/cu118')
if args.device_id is not None:
if arguments.device_id is not None:
if os.environ.get('HIP_VISIBLE_DEVICES', None) is not None:
log.warning('Setting HIP_VISIBLE_DEVICES and --device-id at the same time may be mistake.')
os.environ['HIP_VISIBLE_DEVICES'] = args.device_id
del args.device_id
os.environ['HIP_VISIBLE_DEVICES'] = arguments.device_id
del arguments.device_id
from modules import zluda_installer
try:
if args.reinstall or zluda_installer.is_reinstall_needed():
if arguments.reinstall or zluda_installer.is_reinstall_needed():
zluda_installer.uninstall()
zluda_installer.install()
zluda_installer.set_default_agent(device)
@@ -632,7 +632,7 @@ def install_rocm_zluda():
torch_command = os.environ.get('TORCH_COMMAND', '--no-cache-dir https://repo.radeon.com/rocm/windows/rocm-rel-6.4.4/torch-2.8.0a0%2Bgitfc14c65-cp312-cp312-win_amd64.whl https://repo.radeon.com/rocm/windows/rocm-rel-6.4.4/torchvision-0.24.0a0%2Bc85f008-cp312-cp312-win_amd64.whl')
else:
#check_python(supported_minors=[10, 11, 12, 13, 14], reason='ROCm backend requires a Python version between 3.10 and 3.13')
if args.use_nightly:
if arguments.use_nightly:
if rocm.version is None or float(rocm.version) >= 7.1: # assume the latest if version check fails
torch_command = os.environ.get('TORCH_COMMAND', '--upgrade --pre torch torchvision --index-url https://download.pytorch.org/whl/nightly/rocm7.1')
else: # oldest rocm version on nightly is 7.0
@@ -673,10 +673,10 @@ def install_rocm_zluda():
def install_ipex():
t_start = time.time()
#check_python(supported_minors=[10, 11, 12, 13, 14], reason='IPEX backend requires a Python version between 3.10 and 3.13')
args.use_ipex = True # pylint: disable=attribute-defined-outside-init
arguments.use_ipex = True # pylint: disable=attribute-defined-outside-init
log.info('IPEX: Intel OneAPI toolkit detected')
if args.use_nightly:
if arguments.use_nightly:
torch_command = os.environ.get('TORCH_COMMAND', '--upgrade --pre torch torchvision --index-url https://download.pytorch.org/whl/nightly/xpu')
else:
torch_command = os.environ.get('TORCH_COMMAND', 'torch==2.10.0+xpu torchvision==0.25.0+xpu --index-url https://download.pytorch.org/whl/xpu')
@@ -696,7 +696,7 @@ def install_openvino():
else:
torch_command = os.environ.get('TORCH_COMMAND', 'torch==2.10.0+cpu torchvision==0.25.0 --index-url https://download.pytorch.org/whl/cpu')
if not (args.skip_all or args.skip_requirements):
if not (arguments.skip_all or arguments.skip_requirements):
install(os.environ.get('OPENVINO_COMMAND', 'openvino==2025.4.1'), 'openvino')
install(os.environ.get('NNCF_COMMAND', 'nncf==2.19.0'), 'nncf')
ts('openvino', t_start)
@@ -708,13 +708,13 @@ def install_torch_addons():
triton_command = os.environ.get('TRITON_COMMAND', None)
if triton_command is not None and triton_command != 'skip':
install(triton_command, 'triton', quiet=True)
xformers_package = os.environ.get('XFORMERS_PACKAGE', '--pre xformers') if opts.get('cross_attention_optimization', '') == 'xFormers' or args.use_xformers else 'none'
xformers_package = os.environ.get('XFORMERS_PACKAGE', '--pre xformers') if opts.get('cross_attention_optimization', '') == 'xFormers' or arguments.use_xformers else 'none'
if 'xformers' in xformers_package:
try:
install(xformers_package, ignore=True, no_deps=True)
except Exception as e:
log.debug(f'xFormers cannot install: {e}')
elif not args.experimental and not args.use_xformers and opts.get('cross_attention_optimization', '') != 'xFormers':
elif not arguments.experimental and not arguments.use_xformers and opts.get('cross_attention_optimization', '') != 'xFormers':
uninstall('xformers')
if opts.get('cuda_compile_backend', '') == 'hidet':
install('hidet', 'hidet')
@@ -728,7 +728,7 @@ def install_torch_addons():
install('torchao==0.10.0', 'torchao')
if opts.get('samples_format', 'jpg') == 'jxl' or opts.get('grid_format', 'jpg') == 'jxl':
install('pillow-jxl-plugin==1.3.5', 'pillow-jxl-plugin')
if not args.experimental:
if not arguments.experimental:
uninstall('wandb', quiet=True)
uninstall('pynvml', quiet=True)
ts('addons', t_start)
@@ -753,25 +753,25 @@ def check_cudnn():
def check_torch():
log.info('Torch: verifying installation')
t_start = time.time()
if args.skip_torch:
if arguments.skip_torch:
log.info('Torch: skip tests')
return
if args.profile:
if arguments.profile:
pr = cProfile.Profile()
pr.enable()
allow_cuda = not (args.use_rocm or args.use_directml or args.use_ipex or args.use_openvino)
allow_rocm = not (args.use_cuda or args.use_directml or args.use_ipex or args.use_openvino)
allow_ipex = not (args.use_cuda or args.use_rocm or args.use_directml or args.use_openvino)
allow_directml = not (args.use_cuda or args.use_rocm or args.use_ipex or args.use_openvino)
allow_openvino = not (args.use_cuda or args.use_rocm or args.use_ipex or args.use_directml)
log.debug(f'Torch overrides: cuda={args.use_cuda} rocm={args.use_rocm} ipex={args.use_ipex} directml={args.use_directml} openvino={args.use_openvino} zluda={args.use_zluda}')
allow_cuda = not (arguments.use_rocm or arguments.use_directml or arguments.use_ipex or arguments.use_openvino)
allow_rocm = not (arguments.use_cuda or arguments.use_directml or arguments.use_ipex or arguments.use_openvino)
allow_ipex = not (arguments.use_cuda or arguments.use_rocm or arguments.use_directml or arguments.use_openvino)
allow_directml = not (arguments.use_cuda or arguments.use_rocm or arguments.use_ipex or arguments.use_openvino)
allow_openvino = not (arguments.use_cuda or arguments.use_rocm or arguments.use_ipex or arguments.use_directml)
log.debug(f'Torch overrides: cuda={arguments.use_cuda} rocm={arguments.use_rocm} ipex={arguments.use_ipex} directml={arguments.use_directml} openvino={arguments.use_openvino} zluda={arguments.use_zluda}')
# log.debug(f'Torch allowed: cuda={allow_cuda} rocm={allow_rocm} ipex={allow_ipex} diml={allow_directml} openvino={allow_openvino}')
torch_command = os.environ.get('TORCH_COMMAND', '')
if sys.platform != 'win32':
if args.use_zluda:
if arguments.use_zluda:
log.error('ZLUDA is only supported on Windows')
if args.use_directml:
if arguments.use_directml:
log.error('DirectML is only supported on Windows')
if torch_command != '':
@@ -779,21 +779,21 @@ def check_torch():
is_ipex_available = False
is_rocm_available = False
else:
is_cuda_available = allow_cuda and (args.use_cuda or shutil.which('nvidia-smi') is not None or os.path.exists(os.path.join(os.environ.get('SystemRoot') or r'C:\Windows', 'System32', 'nvidia-smi.exe')))
is_ipex_available = allow_ipex and (args.use_ipex or shutil.which('sycl-ls') is not None or shutil.which('sycl-ls.exe') is not None or os.environ.get('ONEAPI_ROOT') is not None or os.path.exists('/opt/intel/oneapi') or os.path.exists("C:/Program Files (x86)/Intel/oneAPI") or os.path.exists("C:/oneAPI") or os.path.exists("C:/Program Files/Intel/Intel Graphics Software"))
is_cuda_available = allow_cuda and (arguments.use_cuda or shutil.which('nvidia-smi') is not None or os.path.exists(os.path.join(os.environ.get('SystemRoot') or r'C:\Windows', 'System32', 'nvidia-smi.exe')))
is_ipex_available = allow_ipex and (arguments.use_ipex or shutil.which('sycl-ls') is not None or shutil.which('sycl-ls.exe') is not None or os.environ.get('ONEAPI_ROOT') is not None or os.path.exists('/opt/intel/oneapi') or os.path.exists("C:/Program Files (x86)/Intel/oneAPI") or os.path.exists("C:/oneAPI") or os.path.exists("C:/Program Files/Intel/Intel Graphics Software"))
is_rocm_available = False
if not is_cuda_available and not is_ipex_available and allow_rocm:
from modules import rocm
is_rocm_available = allow_rocm and (args.use_rocm or args.use_zluda or rocm.is_installed) # late eval to avoid unnecessary import
is_rocm_available = allow_rocm and (arguments.use_rocm or arguments.use_zluda or rocm.is_installed) # late eval to avoid unnecessary import
if is_cuda_available and args.use_cuda: # prioritize cuda
if is_cuda_available and arguments.use_cuda: # prioritize cuda
torch_command = install_cuda()
elif is_rocm_available and (args.use_rocm or args.use_zluda): # prioritize rocm
elif is_rocm_available and (arguments.use_rocm or arguments.use_zluda): # prioritize rocm
torch_command = install_rocm_zluda()
elif allow_ipex and args.use_ipex: # prioritize ipex
elif allow_ipex and arguments.use_ipex: # prioritize ipex
torch_command = install_ipex()
elif allow_openvino and args.use_openvino: # prioritize openvino
elif allow_openvino and arguments.use_openvino: # prioritize openvino
torch_command = install_openvino()
elif is_cuda_available:
torch_command = install_cuda()
@@ -805,17 +805,17 @@ def check_torch():
machine = platform.machine()
if sys.platform == 'darwin':
torch_command = os.environ.get('TORCH_COMMAND', 'torch torchvision')
elif allow_directml and args.use_directml and ('arm' not in machine and 'aarch' not in machine):
elif allow_directml and arguments.use_directml and ('arm' not in machine and 'aarch' not in machine):
log.info('DirectML: selected')
torch_command = os.environ.get('TORCH_COMMAND', 'torch==2.4.1 torchvision torch-directml==0.2.4.dev240913')
if 'torch' in torch_command and not args.version:
if 'torch' in torch_command and not arguments.version:
install(torch_command, 'torch torchvision')
install('onnxruntime-directml', 'onnxruntime-directml', ignore=True)
else:
log.warning('Torch: CPU-only version installed')
torch_command = os.environ.get('TORCH_COMMAND', 'torch torchvision')
if args.version:
if arguments.version:
return
if 'torch' in torch_command:
@@ -833,13 +833,13 @@ def check_torch():
pass
if 'cpu' in torch.__version__:
if is_cuda_available:
if args.use_cuda:
if arguments.use_cuda:
log.warning(f'Torch: version="{torch.__version__}" CPU version installed and CUDA is selected - reinstalling')
install(torch_command, 'torch torchvision', quiet=True, reinstall=True, force=True) # foce reinstall
else:
log.warning(f'Torch: version="{torch.__version__}" CPU version installed and CUDA is available - consider reinstalling')
elif is_rocm_available:
if args.use_rocm:
if arguments.use_rocm:
log.warning(f'Torch: version="{torch.__version__}" CPU version installed and ROCm is selected - reinstalling')
install(torch_command, 'torch torchvision', quiet=True, reinstall=True, force=True) # foce reinstall
else:
@@ -860,7 +860,7 @@ def check_torch():
log.info(f'Torch detected: gpu="{torch.cuda.get_device_name(device)}" vram={round(torch.cuda.get_device_properties(device).total_memory / 1024 / 1024)} arch={torch.cuda.get_device_capability(device)} cores={torch.cuda.get_device_properties(device).multi_processor_count}')
else:
try:
if args.use_directml and allow_directml:
if arguments.use_directml and allow_directml:
import torch_directml # pylint: disable=import-error
dml_ver = package_version("torch-directml")
log.warning(f'Torch backend: DirectML ({dml_ver})')
@@ -871,15 +871,15 @@ def check_torch():
log.warning("Torch reports CUDA not available")
except Exception as e:
log.error(f'Torch cannot load: {e}')
if not args.ignore:
if not arguments.ignore:
sys.exit(1)
if is_rocm_available:
rocm.postinstall()
if not args.skip_all:
if not arguments.skip_all:
install_torch_addons()
check_cudnn()
if args.profile:
if arguments.profile:
pr.disable()
print_profile(pr, 'Torch')
ts('torch', t_start)
@@ -888,9 +888,9 @@ def check_torch():
# check modified files
def check_modified_files():
t_start = time.time()
if args.quick:
if arguments.quick:
return
if args.skip_git:
if arguments.skip_git:
return
try:
res = git('status --porcelain')
@@ -952,7 +952,7 @@ def list_extensions_folder(folder, quiet=False):
# run installer for each installed and enabled extension and optionally update them
def install_extensions(force=False):
if args.profile:
if arguments.profile:
pr = cProfile.Profile()
pr.enable()
pkgs = [f"{d.metadata['Name']}=={d.version}" for d in importlib.metadata.distributions()]
@@ -961,7 +961,7 @@ def install_extensions(force=False):
extensions_duplicates = []
extensions_enabled = []
extensions_disabled = [e.lower() for e in opts.get('disabled_extensions', [])]
extension_folders = [extensions_builtin_dir] if args.safe else [extensions_builtin_dir, extensions_dir]
extension_folders = [extensions_builtin_dir] if arguments.safe else [extensions_builtin_dir, extensions_dir]
res = []
for folder in extension_folders:
if not os.path.isdir(folder):
@@ -976,13 +976,13 @@ def install_extensions(force=False):
extensions_duplicates.append(ext)
continue
extensions_enabled.append(ext)
if args.upgrade or force:
if arguments.upgrade or force:
try:
res.append(update(os.path.join(folder, ext)))
except Exception:
res.append(f'Extension update error: {os.path.join(folder, ext)}')
log.error(f'Extension update error: {os.path.join(folder, ext)}')
if not args.skip_extensions:
if not arguments.skip_extensions:
commit = extensions_commit.get(os.path.basename(ext), None)
if commit is not None:
log.debug(f'Extension force: name="{ext}" commit={commit}')
@@ -1000,7 +1000,7 @@ def install_extensions(force=False):
log.info(f'Extensions enabled: {extensions_enabled}')
if len(extensions_duplicates) > 0:
log.warning(f'Extensions duplicates: {extensions_duplicates}')
if args.profile:
if arguments.profile:
pr.disable()
print_profile(pr, 'Extensions')
# ts('extensions', t_start)
@@ -1010,7 +1010,7 @@ def install_extensions(force=False):
# initialize and optionally update submodules
def install_submodules(force=True):
t_start = time.time()
if args.profile:
if arguments.profile:
pr = cProfile.Profile()
pr.enable()
log.info('Verifying submodules')
@@ -1027,14 +1027,14 @@ def install_submodules(force=True):
for submodule in submodules:
try:
name = submodule.split()[1].strip()
if args.upgrade:
if arguments.upgrade:
res.append(update(name))
else:
branch(name)
except Exception:
log.error(f'Submodule update error: {submodule}')
setup_logging()
if args.profile:
if arguments.profile:
pr.disable()
print_profile(pr, 'Submodule')
ts('submodules', t_start)
@@ -1083,7 +1083,7 @@ def install_pydantic():
def install_scipy():
if args.new or (sys.version_info >= (3, 14)):
if arguments.new or (sys.version_info >= (3, 14)):
install('scipy==1.17.0', ignore=True, quiet=True)
else:
install('scipy==1.14.1', ignore=True, quiet=True)
@@ -1142,9 +1142,9 @@ def install_optional():
def install_requirements():
t_start = time.time()
if args.skip_requirements and not args.requirements:
if arguments.skip_requirements and not arguments.requirements:
return
if args.profile:
if arguments.profile:
pr = cProfile.Profile()
pr.enable()
if int(sys.version_info.minor) >= 13:
@@ -1154,11 +1154,11 @@ def install_requirements():
quick_allowed = False
log.info('Install requirements: this may take a while...')
pip('install -r requirements.txt')
if args.optional:
if arguments.optional:
quick_allowed = False
install_optional()
log.info('Install: verifying requirements')
if args.new:
if arguments.new:
log.debug('Install: flag=new')
with open('requirements.txt', encoding='utf8') as f:
lines = [line.strip() for line in f.readlines() if line.strip() != '' and not line.startswith('#') and line is not None]
@@ -1168,7 +1168,7 @@ def install_requirements():
install_pydantic()
install_opencv()
install_scipy()
if args.profile:
if arguments.profile:
pr.disable()
print_profile(pr, 'Requirements')
ts('requirements', t_start)
@@ -1226,7 +1226,7 @@ def set_environment():
def check_extensions():
newest_all = os.path.getmtime('requirements.txt')
from modules.paths import extensions_builtin_dir, extensions_dir
extension_folders = [extensions_builtin_dir] if args.safe else [extensions_builtin_dir, extensions_dir]
extension_folders = [extensions_builtin_dir] if arguments.safe else [extensions_builtin_dir, extensions_dir]
disabled_extensions_all = opts.get('disable_all_extensions', 'none')
if disabled_extensions_all != 'none':
log.info(f'Extensions: disabled={disabled_extensions_all}')
@@ -1360,27 +1360,27 @@ def check_venv():
def check_version(reset=True): # pylint: disable=unused-argument
if opts.get('offline_mode', False):
log.warning('Offline mode enabled')
args.skip_git = True # pylint: disable=attribute-defined-outside-init
args.skip_all = True # pylint: disable=attribute-defined-outside-init
arguments.skip_git = True # pylint: disable=attribute-defined-outside-init
arguments.skip_all = True # pylint: disable=attribute-defined-outside-init
return
t_start = time.time()
if args.skip_all:
if arguments.skip_all:
return
if not os.path.exists('.git'):
log.warning('Not a git repository')
args.skip_git = True # pylint: disable=attribute-defined-outside-init
arguments.skip_git = True # pylint: disable=attribute-defined-outside-init
ver = get_version()
log.info(f'Version: {print_dict(ver)}')
branch_name = ver.get('branch', None) if ver is not None else 'master'
if branch_name is None or branch_name == 'unknown':
branch_name = 'master'
if args.version or args.skip_git:
if arguments.version or arguments.skip_git:
return
check_ui(ver)
commit = git('rev-parse HEAD')
global git_commit # pylint: disable=global-statement
git_commit = commit[:7]
if args.quick:
if arguments.quick:
return
try:
import requests
@@ -1409,7 +1409,7 @@ def check_version(reset=True): # pylint: disable=unused-argument
latest = commits['commit']['sha']
if len(latest) != 40:
log.error(f'Repository error: commit={latest} invalid')
elif latest != commit and args.upgrade:
elif latest != commit and arguments.upgrade:
global quick_allowed # pylint: disable=global-statement
quick_allowed = False
log.info('Updating main repository')
@@ -1441,7 +1441,7 @@ def check_version(reset=True): # pylint: disable=unused-argument
def update_wiki():
t_start = time.time()
if args.upgrade:
if arguments.upgrade:
log.info('Updating Wiki')
try:
update(os.path.join(os.path.dirname(__file__), "wiki"))
@@ -1472,7 +1472,7 @@ def get_state():
try:
from concurrent.futures.thread import ThreadPoolExecutor
from modules.paths import extensions_builtin_dir, extensions_dir
extension_folders = [extensions_builtin_dir] if args.safe else [extensions_builtin_dir, extensions_dir]
extension_folders = [extensions_builtin_dir] if arguments.safe else [extensions_builtin_dir, extensions_dir]
ext_dirs = []
for folder in extension_folders:
if not os.path.isdir(folder):
@@ -1526,9 +1526,9 @@ def update_state():
def check_timestamp():
if not quick_allowed or not os.path.isfile(log_file):
return False
if args.quick:
if arguments.quick:
return True
if args.skip_git:
if arguments.skip_git:
return True
return check_state()
@@ -1552,28 +1552,28 @@ def add_args(parser):
def parse_args(parser):
# command line args
global args # pylint: disable=global-statement
global arguments # pylint: disable=global-statement
if "USED_VSCODE_COMMAND_PICKARGS" in os.environ:
import shlex
argv = shlex.split(" ".join(sys.argv[1:])) if "USED_VSCODE_COMMAND_PICKARGS" in os.environ else sys.argv[1:]
log.debug('VSCode Launch')
args = parser.parse_args(argv)
arguments = parser.parse_args(argv)
else:
args = parser.parse_args()
return args
arguments = parser.parse_args()
return arguments
def extensions_preload(parser):
t_start = time.time()
if args.profile:
if arguments.profile:
pr = cProfile.Profile()
pr.enable()
if args.safe:
if arguments.safe:
log.info('Running in safe mode without user extensions')
try:
from modules.script_loading import preload_extensions
from modules.paths import extensions_builtin_dir, extensions_dir
extension_folders = [extensions_builtin_dir] if args.safe else [extensions_builtin_dir, extensions_dir]
extension_folders = [extensions_builtin_dir] if arguments.safe else [extensions_builtin_dir, extensions_dir]
preload_time = {}
for ext_dir in extension_folders:
t0 = time.time()
@@ -1583,7 +1583,7 @@ def extensions_preload(parser):
log.debug(f'Extension preload: {preload_time}')
except Exception:
log.error('Error running extension preloading')
if args.profile:
if arguments.profile:
pr.disable()
print_profile(pr, 'Preload')
ts('preload', t_start)
@@ -1612,8 +1612,8 @@ def git_reset(folder='.'):
def read_options():
t_start = time.time()
global opts # pylint: disable=global-statement
if os.path.isfile(args.config):
with open(args.config, encoding="utf8") as file:
if os.path.isfile(arguments.config):
with open(arguments.config, encoding="utf8") as file:
try:
opts = json.load(file)
if type(opts) is str:
launch.py
+1 -1
View File
@@ -233,7 +233,7 @@ def start_server(immediate=True, server=None):
def main():
global args # pylint: disable=global-statement
init_args() # setup argparser and default folders
installer.args = args
installer.arguments = args
installer.setup_logging(debug=args.debug, trace=args.trace, filename=args.log)
log.info('Starting SD.Next')
installer.get_logfile()
modules/zluda_installer.py
+3 -3
View File
@@ -6,7 +6,7 @@ import ctypes
import shutil
import zipfile
import urllib.request
from installer import args
from installer import arguments
from modules.logger import log
from modules import rocm
@@ -82,8 +82,8 @@ def install():
commit = os.environ.get("ZLUDA_HASH", "5e717459179dc272b7d7d23391f0fad66c7459cf")
if os.environ.get("ZLUDA_NIGHTLY", "0") == "1":
log.warning("Environment variable 'ZLUDA_NIGHTLY' will be removed. Please use command-line argument '--use-nightly' instead.")
args.use_nightly = True
if args.use_nightly:
arguments.use_nightly = True
if arguments.use_nightly:
platform = "nightly-" + platform
log.debug(f'Install ZLUDA: rocm={rocm.version} platform={platform} commit={commit}')
ssl._create_default_https_context = ssl._create_unverified_context # pylint: disable=protected-access