diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 420a32db0..04c04a0e6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,7 +17,10 @@ jobs: - run: flake8 run.py roop - run: mypy run.py roop test: - runs-on: ubuntu-latest + strategy: + matrix: + os: [ubuntu-latest, windows-latest, macos-latest] + runs-on: ${{ matrix.os }} steps: - name: Checkout uses: actions/checkout@v2 @@ -28,6 +31,11 @@ jobs: with: python-version: 3.9 - run: pip install -r requirements-ci.txt - - run: python run.py -s=.github/examples/source.jpg -t=.github/examples/target.mp4 -o=.github/examples/output.mp4 + - run: python run.py -s .github/examples/source.jpg -t .github/examples/target.mp4 -o .github/examples/output.mp4 + if: matrix.os != 'windows-latest' + - run: python run.py -s .github\examples\source.jpg -t .github\examples\target.mp4 -o .github\examples\output.mp4 + if: matrix.os == 'windows-latest' - run: ffmpeg -i .github/examples/snapshot.mp4 -i .github/examples/output.mp4 -filter_complex psnr -f null - - + if: matrix.os != 'windows-latest' + - run: ffmpeg -i .github\examples\snapshot.mp4 -i .github\examples\output.mp4 -filter_complex psnr -f null - + if: matrix.os == 'windows-latest' diff --git a/gui-demo.png b/gui-demo.png index 59b24c592..ede8fb745 100644 Binary files a/gui-demo.png and b/gui-demo.png differ diff --git a/requirements-ci.txt b/requirements-ci.txt index c924b6a26..ce287f52d 100644 --- a/requirements-ci.txt +++ b/requirements-ci.txt @@ -1,4 +1,4 @@ -numpy==1.23.5 +numpy==1.24.3 opencv-python==4.8.0.74 onnx==1.14.0 insightface==0.7.3 @@ -6,10 +6,8 @@ psutil==5.9.5 tk==0.1.0 customtkinter==5.2.0 tkinterdnd2==0.3.0 -torch==2.0.1 -torchvision==0.15.2 onnxruntime==1.15.0 tensorflow==2.13.0 opennsfw2==0.10.2 protobuf==4.23.4 -tqdm==4.65.0 \ No newline at end of file +tqdm==4.65.0 diff --git a/requirements.txt b/requirements.txt index ae21038f2..9f289fda3 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ --extra-index-url https://download.pytorch.org/whl/cu118 -numpy==1.23.5 +numpy==1.24.3 opencv-python==4.8.0.74 onnx==1.14.0 insightface==0.7.3 @@ -10,10 +10,6 @@ customtkinter==5.2.0 tkinterdnd2==0.3.0; sys_platform != 'darwin' and platform_machine != 'arm64' tkinterdnd2-universal==1.7.3; sys_platform == 'darwin' and platform_machine == 'arm64' pillow==10.0.0 -torch==2.0.1+cu118; sys_platform != 'darwin' -torch==2.0.1; sys_platform == 'darwin' -torchvision==0.15.2+cu118; sys_platform != 'darwin' -torchvision==0.15.2; sys_platform == 'darwin' onnxruntime==1.15.1; python_version != '3.9' and sys_platform == 'darwin' and platform_machine != 'arm64' onnxruntime-coreml==1.13.1; python_version == '3.9' and sys_platform == 'darwin' and platform_machine != 'arm64' onnxruntime-silicon==1.13.1; sys_platform == 'darwin' and platform_machine == 'arm64' @@ -22,4 +18,4 @@ tensorflow==2.13.0 opennsfw2==0.10.2 protobuf==4.23.4 tqdm==4.65.0 -gfpgan==1.3.8 \ No newline at end of file +gfpgan==1.3.8 diff --git a/roop/core.py b/roop/core.py index 1843545cc..7e5a46fbd 100755 --- a/roop/core.py +++ b/roop/core.py @@ -13,12 +13,8 @@ import signal import shutil import argparse -import torch import onnxruntime -if not 'CUDAExecutionProvider' in onnxruntime.get_available_providers(): - del torch import tensorflow - import roop.globals import roop.metadata import roop.ui as ui diff --git a/roop/metadata.py b/roop/metadata.py index 03f321bc2..aea9e16d8 100644 --- a/roop/metadata.py +++ b/roop/metadata.py @@ -1,2 +1,2 @@ name = 'roop' -version = '1.3.1' +version = '1.3.2'