Next (#810)

* Fix dependency conflict (#790)

* Remove (direct) torch and torchvision dependencies

* Change version to next

* Multi OS in CI (#808)

* Run CI on multi OS

* Run CI on multi OS

* Run CI on multi OS

* Run CI on multi OS

* Run CI on multi OS

* Bump version

---------

Co-authored-by: Wu Tingfeng <wu.tingfeng@u.nus.edu>

.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'

requirements-ci.txt

@@ -1,15 +1,13 @@
-numpy==1.23.5
+numpy==1.24.3
 opencv-python==4.8.0.74
 onnx==1.14.0
 insightface==0.7.3
 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
+tqdm==4.65.0

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
+gfpgan==1.3.8

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

roop/metadata.py

@@ -1,2 +1,2 @@
 name = 'roop'
-version = '1.3.1'
+version = '1.3.2'