From 7f69889c95a7098d903f11bb9362a7e846399f9b Mon Sep 17 00:00:00 2001 From: Henry Ruhs Date: Thu, 7 Sep 2023 01:26:33 +0200 Subject: [PATCH] Hotfix torch installation (#83) * Hotfix torch installation * Hotfix torch installation --- .github/workflows/ci.yml | 3 ++- facefusion/installer.py | 6 +++++- requirements-ci.txt | 11 ----------- requirements.txt | 2 -- 4 files changed, 7 insertions(+), 15 deletions(-) delete mode 100644 requirements-ci.txt diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a0016eab..8248d5df 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -30,5 +30,6 @@ jobs: uses: actions/setup-python@v2 with: python-version: '3.10' - - run: pip install -r requirements-ci.txt + - run: pip install -r requirements.txt + - run: pip install pytest - run: pytest diff --git a/facefusion/installer.py b/facefusion/installer.py index 4ddee60b..58d088e1 100644 --- a/facefusion/installer.py +++ b/facefusion/installer.py @@ -35,7 +35,11 @@ def run() -> None: onnxruntime_key = answers['onnxruntime_key'] onnxruntime_name, onnxruntime_version = ONNXRUNTIMES[onnxruntime_key] python_id = 'cp' + str(sys.version_info.major) + str(sys.version_info.minor) - subprocess.call([ 'pip', 'install', '-r', 'requirements.txt' ]) + subprocess.call([ 'pip', 'uninstall', 'torch', '-y' ]) + if onnxruntime_key == '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': subprocess.call([ 'pip', 'uninstall', 'onnxruntime', onnxruntime_name, '-y' ]) if onnxruntime_key != 'coreml-silicon': diff --git a/requirements-ci.txt b/requirements-ci.txt deleted file mode 100644 index f74abad6..00000000 --- a/requirements-ci.txt +++ /dev/null @@ -1,11 +0,0 @@ -insightface==0.7.3 -numpy==1.24.3 -onnx==1.14.1 -onnxruntime==1.15.1 -opencv-python==4.8.0.76 -opennsfw2==0.10.2 -protobuf==4.24.2 -pytest==7.4.0 -psutil==5.9.5 -tensorflow==2.13.0 -tqdm==4.66.1 diff --git a/requirements.txt b/requirements.txt index e4f4e130..34b39c80 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,3 @@ ---extra-index-url https://download.pytorch.org/whl/cu118 - gfpgan==1.3.8 gradio==3.42.0 insightface==0.7.3