[pull] master from deepfakes:master

.github/workflows/pytest.yml

@@ -0,0 +1,161 @@
+name: ci/build
+
+on:
+  push:
+  pull_request:
+    paths-ignore:
+      - docs/**
+      - "**/README.md"
+
+jobs:
+  build_conda:
+    name: conda (${{ matrix.os }}, ${{ matrix.backend }})
+    runs-on: ${{ matrix.os }}
+    defaults:
+      run:
+        shell: bash -el {0}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: ["ubuntu-latest", "macos-latest", "windows-latest"]
+        backend: ["nvidia", "cpu"]
+        include:
+          - os: "ubuntu-latest"
+            backend: "rocm"
+          - os: "windows-latest"
+            backend: "directml"
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set cache date
+        run: echo "DATE=$(date +'%Y%m%d')" >> $GITHUB_ENV
+      - name: Cache conda
+        uses: actions/cache@v3
+        env:
+          # Increase this value to manually reset cache
+          CACHE_NUMBER: 1
+          REQ_FILE: ./requirements/requirements_${{ matrix.backend }}.txt
+        with:
+          path: ~/conda_pkgs_dir
+          key: ${{ runner.os }}-${{ matrix.backend }}-conda-${{ env.CACHE_NUMBER }}-${{ env.DATE }}-${{ hashFiles('./requirements/requirements.txt', env.REQ_FILE) }}
+      - name: Set up Conda
+        uses: conda-incubator/setup-miniconda@v2
+        with:
+          python-version: "3.10"
+          auto-update-conda: true
+          activate-environment: faceswap
+      - name: Conda info
+        run: conda info && conda list
+      - name: Install
+        run: |
+          python setup.py --installer --${{ matrix.backend }}
+          pip install flake8 pylint mypy pytest pytest-mock wheel pytest-xvfb
+          pip install types-attrs types-cryptography types-pyOpenSSL types-PyYAML types-setuptools
+      - name: Lint with flake8
+        run: |
+          # stop the build if there are Python syntax errors or undefined names
+          flake8 . --select=E9,F63,F7,F82 --show-source
+          flake8 . --exit-zero
+      - name: MyPy Typing
+        continue-on-error: true
+        run: |
+          mypy .
+      - name: SysInfo
+        run: python -c "from lib.sysinfo import sysinfo ;  print(sysinfo)"
+      - name: Simple Tests
+        # These backends will fail as GPU drivers not available
+        if: matrix.backend != 'rocm' && matrix.backend != 'nvidia' && matrix.backend != 'directml'
+        run: |
+          FACESWAP_BACKEND="${{ matrix.backend }}" py.test -v tests/;
+      - name: End to End Tests
+        # These backends will fail as GPU drivers not available
+        # macOS fails on first extract test with 'died with <Signals.SIGSEGV: 11>'
+        if: matrix.backend != 'rocm' && matrix.backend != 'nvidia' && matrix.backend != 'directml' && matrix.os != 'macos-latest'
+        run: |
+          FACESWAP_BACKEND="${{ matrix.backend }}" python tests/simple_tests.py;
+
+  build_linux:
+    name: "pip (ubuntu-latest, ${{ matrix.backend }})"
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        python-version: ["3.10"]
+        backend: ["cpu"]
+        include:
+          - backend: "cpu"
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v3
+        with:
+          python-version: ${{ matrix.python-version }}
+          cache: 'pip'
+          cache-dependency-path: './requirements/requirements_${{ matrix.backend }}.txt'
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install flake8 pylint mypy pytest pytest-mock pytest-xvfb wheel
+          pip install types-attrs types-cryptography types-pyOpenSSL types-PyYAML types-setuptools
+          pip install -r ./requirements/requirements_${{ matrix.backend }}.txt
+      - name: List installed packages
+        run: pip freeze
+      - name: Lint with flake8
+        run: |
+          # stop the build if there are Python syntax errors or undefined names
+          flake8 . --select=E9,F63,F7,F82 --show-source
+          # exit-zero treats all errors as warnings.
+          flake8 . --exit-zero
+      - name: MyPy Typing
+        continue-on-error: true
+        run: |
+          mypy .
+      - name: Simple Tests
+        run: |
+          FACESWAP_BACKEND="${{ matrix.backend }}" py.test -v tests/;
+      - name: End to End Tests
+        run: |
+          FACESWAP_BACKEND="${{ matrix.backend }}" python tests/simple_tests.py;
+
+  build_windows:
+    name: "pip (windows-latest, ${{ matrix.backend }})"
+    runs-on: windows-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        python-version: ["3.10"]
+        backend: ["cpu", "directml"]
+        include:
+          - backend: "cpu"
+          - backend: "directml"
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v3
+        with:
+          python-version: ${{ matrix.python-version }}
+          cache: 'pip'
+          cache-dependency-path: './requirements/requirements_${{ matrix.backend }}.txt'
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install flake8 pylint mypy pytest pytest-mock wheel
+          pip install types-attrs types-cryptography types-pyOpenSSL types-PyYAML types-setuptools
+          pip install -r ./requirements/requirements_${{ matrix.backend }}.txt
+      - name: List installed packages
+        run: pip freeze
+      - name: Set Backend EnvVar
+        run: echo "FACESWAP_BACKEND=${{ matrix.backend }}" | Out-File -FilePath $env:GITHUB_ENV -Append
+      - name: Lint with flake8
+        run: |
+          # stop the build if there are Python syntax errors or undefined names
+          flake8 . --select=E9,F63,F7,F82 --show-source
+          # exit-zero treats all errors as warnings.
+          flake8 . --exit-zero
+      - name: MyPy Typing
+        continue-on-error: true
+        run: |
+          mypy .
+      - name: Simple Tests
+        run: py.test -v tests
+      - name: End to End Tests
+        run: python tests/simple_tests.py

.gitignore

@@ -19,8 +19,9 @@
 !/update_deps.py
 
 # Support files
-!_travis/
-!_travis/*.py
+!/.github/
+!/.github/workflows/
+!/.github/workflows/*.yml
 !.install/
 !.install/**
 !config/
@@ -35,11 +36,13 @@
 !tests/**/*.py
 
 # Core files
+!.fs_cache
 !lib/
 !lib/**/
 !lib/**/*.py
 !lib/gui/**/icons/*.png
 !lib/gui/**/themes/default.json
+!lib/gui/**/presets/**/*.json
 !plugins/
 !plugins/**/
 !plugins/**/*.py

.install/linux/faceswap_setup_x64.sh

@@ -12,7 +12,7 @@ DIR_CONDA="$HOME/miniconda3"
 CONDA_EXECUTABLE="${DIR_CONDA}/bin/conda"
 CONDA_TO_PATH=false
 ENV_NAME="faceswap"
-PYENV_VERSION="3.9"
+PYENV_VERSION="3.10"
 
 DIR_FACESWAP="$HOME/faceswap"
 VERSION="nvidia"
@@ -35,6 +35,13 @@ info () {
     done <<< "$(echo "$1" | fmt -cu -w 70)"
 }
 
+warn () {
+    # output warning message
+    while read -r line ; do
+        echo -e "\e[33mWARNING\e[97m $line"
+    done <<< "$(echo "$1" | fmt -cu -w 70)"
+}
+
 error () {
     # output error message.
     while read -r line ; do
@@ -127,11 +134,11 @@ ask_version() {
     # Ask which version of faceswap to install
     while true; do
         default=1
-        read -rp $'\e[36m'"Select: 1 (NVIDIA), 2 (AMD), 3 (CPU) [default: $default]: "$'\e[97m' vers
+        read -rp $'\e[36mSelect:\t1: NVIDIA\n\t2: AMD (ROCm)\n\t3: CPU\n'"[default: $default]: "$'\e[97m' vers
         vers="${vers:-${default}}"
         case $vers in
             1) VERSION="nvidia" ; break ;;
-            2) VERSION="amd" ; PYENV_VERSION="3.8" ; break ;;
+            2) VERSION="rocm" ; break ;;
             3) VERSION="cpu" ; break ;;
             * ) echo "Invalid selection." ;;
         esac
@@ -259,7 +266,7 @@ conda_opts () {
     echo ""
     info "Faceswap will be installed inside a Conda Environment. If an environment already\
     exists with the name specified then it will be deleted."
-    ask "Please specify a name for the Faceswap Conda Environmnet" "ENV_NAME"
+    ask "Please specify a name for the Faceswap Conda Environment" "ENV_NAME"
 }
 
 faceswap_opts () {
@@ -273,6 +280,12 @@ faceswap_opts () {
     latest graphics card drivers installed from the relevant vendor. Please select the version\
     of Faceswap you wish to install."
     ask_version
+    if [ $VERSION == "rocm" ] ; then
+        warn "ROCm support is experimental. Please make sure that your GPU is supported by ROCm and that \
+        ROCm has been installed on your system before proceeding. Installation instructions: \
+        https://docs.amd.com/bundle/ROCm_Installation_Guidev5.0/page/Overview_of_ROCm_Installation_Methods.html"
+        sleep 2
+    fi
 }
 
 post_install_opts() {
@@ -309,6 +322,10 @@ review() {
     fi
     echo "        - Faceswap will be installed in '$DIR_FACESWAP'"
     echo "        - Installing for '$VERSION'"
+    if [ $VERSION == "rocm" ] ; then
+        echo -e "          \e[33m- Note: Please ensure that ROCm is supported by your GPU\e[97m"
+        echo -e "          \e[33m  and is installed prior to proceeding.\e[97m"
+    fi
     if $DESKTOP ; then echo "        - A Desktop shortcut will be created" ; fi
     if ! ask_yesno "Do you wish to continue?" "No" ;  then exit ; fi
 }
@@ -346,7 +363,7 @@ delete_env() {
 }
 
 create_env() {
-    # Create Python 3.8 env for faceswap
+    # Create Python 3.10 env for faceswap
     delete_env
     info "Creating Conda Virtual Environment..."
     yellow ; "$CONDA_EXECUTABLE" create -n "$ENV_NAME" -q python="$PYENV_VERSION" -y
@@ -363,7 +380,9 @@ activate_env() {
 install_git() {
     # Install git inside conda environment
     info "Installing Git..."
-    yellow ; conda install git -q -y
+    # TODO On linux version 2.45.2 makes the font fixed TK pull in Python from
+    # graalpy, which breaks pretty much everything
+    yellow ; conda install "git<2.45" -q -y
 }
 
 delete_faceswap() {
@@ -384,8 +403,7 @@ clone_faceswap() {
 setup_faceswap() {
     # Run faceswap setup script
     info "Setting up Faceswap..."
-    if [ $VERSION != "cpu" ] ; then args="--$VERSION" ; else args="" ; fi
-    python "$DIR_FACESWAP/setup.py" --installer $args
+    python -u "$DIR_FACESWAP/setup.py" --installer --$VERSION
 }
 
 create_gui_launcher () {