Next (#107)
* Allow passing the onnxruntime to install.py * Fix CI * Disallow none execution providers in the UI * Use CV2 to detect fps * Respect trim on videos with audio * Respect trim on videos with audio (finally) * Implement caching to speed up preview and webcam * Define webcam UI and webcam performance * Remove layout from components * Add primary buttons * Extract benchmark and webcam settings * Introduce compact UI settings * Caching for IO and **** prediction * Caching for IO and **** prediction * Introduce face analyser caching * Fix some typing * Improve setup for benchmark * Clear image cache via post process * Fix settings in UI, Simplify restore_audio() using shortest * Select resolution and fps via webcam ui * Introduce read_static_image() to stop caching temp images * Use DirectShow under Windows * Multi-threading for webcam * Fix typing * Refactor frame processor * Refactor webcam processing * Avoid warnings due capture.isOpened() * Resume downloads (#110) * Introduce resumable downloads * Fix CURL commands * Break execution_settings into pieces * Cosmetic changes on cv2 webcam * Update Gradio * Move face cache to own file * Uniform namings for threading * Fix sorting of get_temp_frame_paths(), extend get_temp_frames_pattern() * Minor changes from the review * Looks stable to tme * Update the disclaimer * Update the disclaimer * Update the disclaimer
This commit is contained in:
@@ -1,4 +1,5 @@
|
||||
from typing import Dict, Tuple
|
||||
import argparse
|
||||
import os
|
||||
import sys
|
||||
import subprocess
|
||||
@@ -8,7 +9,7 @@ subprocess.call([ 'pip', 'install' , 'inquirer', '-q' ])
|
||||
|
||||
import inquirer
|
||||
|
||||
from facefusion import wording
|
||||
from facefusion import metadata, wording
|
||||
|
||||
ONNXRUNTIMES : Dict[str, Tuple[str, str]] =\
|
||||
{
|
||||
@@ -22,27 +23,38 @@ ONNXRUNTIMES : Dict[str, Tuple[str, str]] =\
|
||||
|
||||
|
||||
def run() -> None:
|
||||
answers : Dict[str, str] = inquirer.prompt(
|
||||
[
|
||||
inquirer.List(
|
||||
'onnxruntime_key',
|
||||
message = wording.get('select_onnxruntime_install'),
|
||||
choices = list(ONNXRUNTIMES.keys())
|
||||
)
|
||||
])
|
||||
program = argparse.ArgumentParser(formatter_class = lambda prog: argparse.HelpFormatter(prog, max_help_position = 120))
|
||||
program.add_argument('--onnxruntime', help = wording.get('onnxruntime_help'), dest = 'onnxruntime', choices = ONNXRUNTIMES.keys())
|
||||
program.add_argument('-v', '--version', version = metadata.get('name') + ' ' + metadata.get('version'), action = 'version')
|
||||
args = program.parse_args()
|
||||
|
||||
if args.onnxruntime:
|
||||
answers =\
|
||||
{
|
||||
'onnxruntime': args.onnxruntime
|
||||
}
|
||||
else:
|
||||
answers = inquirer.prompt(
|
||||
[
|
||||
inquirer.List(
|
||||
'onnxruntime',
|
||||
message = wording.get('onnxruntime_help'),
|
||||
choices = list(ONNXRUNTIMES.keys())
|
||||
)
|
||||
])
|
||||
|
||||
if answers is not None:
|
||||
onnxruntime_key = answers['onnxruntime_key']
|
||||
onnxruntime_name, onnxruntime_version = ONNXRUNTIMES[onnxruntime_key]
|
||||
onnxruntime = answers['onnxruntime']
|
||||
onnxruntime_name, onnxruntime_version = ONNXRUNTIMES[onnxruntime]
|
||||
python_id = 'cp' + str(sys.version_info.major) + str(sys.version_info.minor)
|
||||
subprocess.call([ 'pip', 'uninstall', 'torch', '-y' ])
|
||||
if onnxruntime_key == 'cuda':
|
||||
if onnxruntime == 'cuda':
|
||||
subprocess.call([ 'pip', 'install', '-r', 'requirements.txt', '--extra-index-url', 'https://download.pytorch.org/whl/cu118' ])
|
||||
else:
|
||||
subprocess.call([ 'pip', 'install', '-r', 'requirements.txt' ])
|
||||
if onnxruntime_key != 'cpu':
|
||||
if onnxruntime != 'cpu':
|
||||
subprocess.call([ 'pip', 'uninstall', 'onnxruntime', onnxruntime_name, '-y' ])
|
||||
if onnxruntime_key != 'coreml-silicon':
|
||||
if onnxruntime != 'coreml-silicon':
|
||||
subprocess.call([ 'pip', 'install', onnxruntime_name + '==' + onnxruntime_version ])
|
||||
elif python_id in [ 'cp39', 'cp310', 'cp311' ]:
|
||||
wheel_name = '-'.join([ 'onnxruntime_silicon', onnxruntime_version, python_id, python_id, 'macosx_12_0_arm64.whl' ])
|
||||
|
||||
Reference in New Issue
Block a user