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

improve xformers installer

Browse Source
This commit is contained in:
Vladimir Mandic
2024-03-02 09:12:19 -05:00
parent c29b76fde3
commit dc8ce0723d
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGELOG.md
+1
View File
@@ -53,6 +53,7 @@
- improve model cpu offload compatibility
- improve model sequential offload compatibility
- improve bfloat16 compatibility
- improve xformers installer to match cuda version and install triton
- fix extra networks refresh
- fix sdp memory attention in backend original
- fix autodetect sd21 models
installer.py
+4 -3
View File
@@ -425,9 +425,12 @@ def check_torch():
log.info('nVidia CUDA toolkit detected: nvidia-smi present')
if not args.use_xformers:
torch_command = os.environ.get('TORCH_COMMAND', 'torch torchvision --index-url https://download.pytorch.org/whl/cu121')
xformers_package = os.environ.get('XFORMERS_PACKAGE', '--pre triton xformers --index-url https://download.pytorch.org/whl/cu121')
else:
torch_command = os.environ.get('TORCH_COMMAND', 'torch torchvision --index-url https://download.pytorch.org/whl/cu118')
xformers_package = os.environ.get('XFORMERS_PACKAGE', '--pre xformers' if opts.get('cross_attention_optimization', '') == 'xFormers' else 'none')
xformers_package = os.environ.get('XFORMERS_PACKAGE', '--pre triton xformers --index-url https://download.pytorch.org/whl/cu118')
if opts.get('cross_attention_optimization', '') != 'xFormers':
xformers_package = 'none'
install('onnxruntime-gpu', 'onnxruntime-gpu', ignore=True)
elif is_rocm_available():
is_windows = platform.system() == 'Windows'
@@ -629,8 +632,6 @@ def check_torch():
install(f'--no-deps {xformers_package}', ignore=True)
import torch
import xformers
if torch.__version__ != '2.0.1+cu118' and xformers.__version__ in ['0.0.22', '0.0.21', '0.0.20']:
log.warning(f'Likely incompatible torch with: xformers=={xformers.__version__} installed: torch=={torch.__version__} required: torch==2.1.0+cu118 - build xformers manually or downgrade torch')
elif not args.experimental and not args.use_xformers:
uninstall('xformers')
except Exception as e: