mirrors/facefusion
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Next 1.3.1 (#149)

Browse Source 
* Use default flags for installer

* Remove condition for cpu

* Okay, here we have default torch

* Update preview

* Fix CI
This commit is contained in:
Henry Ruhs 2023-10-10 13:18:03 +02:00 committed by GitHub
parent 5591b03a88
commit ea8ecf7db0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
.github/preview.png vendored
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 MiB

After

Width:  |  Height:  |  Size: 1.1 MiB

2
.github/workflows/ci.yml vendored
View File

@ -30,6 +30,6 @@ jobs:
uses: actions/setup-python@v2 uses: actions/setup-python@v2
with: with:
python-version: '3.10' python-version: '3.10'
- run: python install.py --torch cpu --onnxruntime cpu - run: python install.py --torch cpu --onnxruntime default
- run: pip install pytest - run: pip install pytest
- run: pytest - run: pytest

19
facefusion/installer.py
View File

@ -10,13 +10,14 @@ from facefusion import metadata, wording
TORCH : Dict[str, str] =\ TORCH : Dict[str, str] =\
{ {
'cpu': 'https://download.pytorch.org/whl/cpu', 'default': 'default',
'cuda': 'https://download.pytorch.org/whl/cu118', 'cpu': 'cpu',
'rocm': 'https://download.pytorch.org/whl/rocm5.6' 'cuda': 'cu118',
'rocm': 'rocm5.6'
} }
ONNXRUNTIMES : Dict[str, Tuple[str, str]] =\ ONNXRUNTIMES : Dict[str, Tuple[str, str]] =\
{ {
'cpu': ('onnxruntime', '1.16.0 '), 'default': ('onnxruntime', '1.16.0'),
'cuda': ('onnxruntime-gpu', '1.16.0'), 'cuda': ('onnxruntime-gpu', '1.16.0'),
'coreml-legacy': ('onnxruntime-coreml', '1.13.1'), 'coreml-legacy': ('onnxruntime-coreml', '1.13.1'),
'coreml-silicon': ('onnxruntime-silicon', '1.16.0'), 'coreml-silicon': ('onnxruntime-silicon', '1.16.0'),
@ -58,11 +59,13 @@ def run(program : ArgumentParser) -> None:
]) ])
if answers is not None: if answers is not None:
torch = answers['torch'] torch = answers['torch']
torch_url = TORCH[torch] torch_wheel = TORCH[torch]
onnxruntime = answers['onnxruntime'] onnxruntime = answers['onnxruntime']
onnxruntime_name, onnxruntime_version = ONNXRUNTIMES[onnxruntime] onnxruntime_name, onnxruntime_version = ONNXRUNTIMES[onnxruntime]
subprocess.call([ 'pip', 'uninstall', 'torch', '-y' ]) subprocess.call([ 'pip', 'uninstall', 'torch', '-y' ])
subprocess.call([ 'pip', 'install', '-r', 'requirements.txt', '--extra-index-url', torch_url ]) if torch_wheel == 'default':
if onnxruntime != 'cpu': subprocess.call([ 'pip', 'install', '-r', 'requirements.txt' ])
subprocess.call([ 'pip', 'uninstall', 'onnxruntime', onnxruntime_name, '-y' ]) else:
subprocess.call([ 'pip', 'install', '-r', 'requirements.txt', '--extra-index-url', 'https://download.pytorch.org/whl/' + torch_wheel ])
subprocess.call([ 'pip', 'uninstall', 'onnxruntime', onnxruntime_name, '-y' ])
subprocess.call([ 'pip', 'install', onnxruntime_name + '==' + onnxruntime_version ]) subprocess.call([ 'pip', 'install', onnxruntime_name + '==' + onnxruntime_version ])

2
facefusion/metadata.py
View File

@ -2,7 +2,7 @@ METADATA =\
{ {
'name': 'FaceFusion', 'name': 'FaceFusion',
'description': 'Next generation face swapper and enhancer', 'description': 'Next generation face swapper and enhancer',
'version': '1.3.0', 'version': '1.3.1',
'license': 'MIT', 'license': 'MIT',
'author': 'Henry Ruhs', 'author': 'Henry Ruhs',
'url': 'https://facefusion.io' 'url': 'https://facefusion.io'