Bump numpy from 1.21.4 to 1.24.2

Bumps [numpy](https://github.com/numpy/numpy) from 1.21.4 to 1.24.2.
- [Release notes](https://github.com/numpy/numpy/releases)
- [Changelog](https://github.com/numpy/numpy/blob/main/doc/RELEASE_WALKTHROUGH.rst)
- [Commits](https://github.com/numpy/numpy/compare/v1.21.4...v1.24.2)

---
updated-dependencies:
- dependency-name: numpy
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

.github/dependabot.yml

@@ -0,0 +1,12 @@
+# See https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+version: 2
+updates:
+  - package-ecosystem: "pip"
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "daily"
+    open-pull-requests-limit: 5
+    pull-request-branch-name:
+      separator: "-"
+    reviewers:
+      - "chychkan"

.github/workflows/verify-setup-catalina.yml

@@ -0,0 +1,35 @@
+# This workflow will install Python dependencies, run tests and lint with a variety of Python versions
+# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
+
+name: Verify setup
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+
+    runs-on: macos-10.15
+    strategy:
+      fail-fast: true
+      matrix:
+        python-version: ["3.6", "3.7", "3.8", "3.9", "3.10"]
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v2
+      with:
+        python-version: ${{ matrix.python-version }}
+    - name: Install dependencies
+      run: |
+        python --version
+        python -m pip install --upgrade pip
+        python -m pip install virtualenv
+        virtualenv --version
+    - name: Run 0_setup.sh
+      run: |
+        ./scripts/0_setup.sh

README.md

@@ -4,6 +4,10 @@ This project provides scripts inspired by [DeepFaceLab_Linux](https://github.com
 
 You'll need `git`, `ffmpeg`, `python3` and python module `virtualenv` available to be able to execute these scripts. The scripts will create a virtual env sandbox and will install all necessary dependencies there, so your main installation of `python3` will be left intact.
 
+## NOTE: Apple M1 chip
+
+Currently there's limited support for Apple M1 laptops. You can do model training, but the XSeg editor currently does not work (the DeepFaceLab codebase is not compatible with PyQt6).
+
 ## Setup
 
 **Tools**
@@ -14,6 +18,9 @@ Make sure you have installed:
 - [Python 3](https://www.python.org/) (check with `python3 --version`)
 - [Virtualenv](https://github.com/pypa/virtualenv) (check with `virtualenv --version`)
 
+For **Apple M1** laptops you also need [hdf5](https://formulae.brew.sh/formula/hdf5) lib installed.
+Check if you have it with `brew ls --versions hdf5`. Install it with `brew install hdf5`.
+
 **Clone and setup**
 
 1. Clone this repository (`git clone https://github.com/chychkan/DeepFaceLab_MacOS.git`)

requirements.txt

@@ -1,10 +1,12 @@
-numpy==1.17.0
-opencv-python==4.1.0.25
-scipy==1.4.1
-tensorflow==1.15.2
-colorama==0.4.3
-tqdm==4.47.0
+numpy==1.24.2
+opencv-contrib-python-headless==4.1.2.30
+scipy==1.7.2
+tensorflow==2.7.4
+colorama==0.4.4
+tqdm==4.62.3
 ffmpeg-python==0.2.0
-Pillow==7.2.0
-scikit-image==0.17.2
-h5py==2.10.0
+Pillow==8.4.0
+scikit-image==0.18.3
+h5py==3.1.0
+PyQt5==5.15.4
+numexpr==2.7.3

requirements_3.10.txt

@@ -0,0 +1,12 @@
+numpy==1.24.2
+numexpr==2.8.1
+opencv-python==4.5.5.62
+scipy==1.8.0
+tensorflow==2.8.4
+colorama==0.4.4
+tqdm==4.62.3
+ffmpeg-python==0.2.0
+Pillow==8.4.0
+scikit-image==0.19.2
+h5py==3.6.0
+PyQt5==5.15.4

requirements_3.6.txt

@@ -0,0 +1,12 @@
+numpy==1.24.2
+opencv-contrib-python-headless==4.1.2.30
+scipy==1.5.4
+tensorflow==2.6.2
+colorama==0.4.4
+tqdm==4.62.3
+ffmpeg-python==0.2.0
+Pillow==8.4.0
+scikit-image==0.17.2
+h5py==3.1.0
+PyQt5==5.15.4
+numexpr==2.7.3

requirements_3.9.txt

@@ -0,0 +1,12 @@
+numpy==1.24.2
+opencv-contrib-python-headless==4.5.1.48
+scipy==1.7.2
+tensorflow==2.7.4
+colorama==0.4.4
+tqdm==4.62.3
+ffmpeg-python==0.2.0
+Pillow==8.4.0
+scikit-image==0.18.3
+h5py==3.1.0
+PyQt5==5.15.4
+numexpr==2.7.3

requirements_3.9_arm64.txt

@@ -0,0 +1,13 @@
+numpy==1.24.2
+opencv-python==4.5.5.62
+numexpr==2.8.1
+h5py==3.1.0
+tqdm==4.62.3
+colorama==0.4.4
+cython==0.29.26
+ffmpeg-python==0.2.0
+Pillow==8.4.0
+scikit-image==0.19.1
+scipy==1.8.0
+tensorflow-macos==2.7.0
+PyQt6==6.2.3

scripts/0_setup.sh

@@ -1,13 +1,24 @@
 #!/usr/bin/env bash
 cd "$(dirname $0)/.."
 
+set -e
+
 mkdir -p .dfl
 mkdir -p workspace
 
+is_arm64() {
+  [ "$(uname -m)" == "arm64" ]
+}
+
+is_arm64 && echo "Running on Apple M1 chip"
+
 if [ ! -d .dfl/DeepFaceLab ]; then
   echo "Cloning DeepFaceLab"
-  cd .dfl
-  git clone "https://github.com/iperov/DeepFaceLab.git"
+  git clone --no-single-branch --depth 1 "https://github.com/chychkan/DeepFaceLab.git" .dfl/DeepFaceLab
+
+  if is_arm64; then
+    (cd .dfl/DeepFaceLab; git checkout support-arm64)
+  fi
 fi
 
 if [ ! -d .dfl/env ]; then
@@ -16,6 +27,48 @@ fi
 
 source .dfl/env/bin/activate
 
-pip install -r requirements.txt
+python -m pip install --upgrade pip
+
+version=$(python -V | cut -f 2 -d ' ' | cut -f 1,2 -d .)
+reqs_file='requirements.txt'
+
+version_suffix=''
+if [[ ! -z "$version" && -f "requirements_$version.txt" ]]; then
+  version_suffix="_$version"
+fi
+
+architecture_suffix=''
+if is_arm64 && [ -f "requirements${version_suffix}_arm64.txt" ]; then
+  architecture_suffix="_arm64"
+fi
+
+reqs_file="requirements${version_suffix}${architecture_suffix}.txt"
+
+echo "Using $reqs_file for $(python -V)"
+
+if is_arm64; then
+  if [[ -z "$(brew ls --versions hdf5)" ]]; then
+    echo "ERROR: HDF5 needs to be installed to run DeepFaceLab on M1 chip."
+    echo "You can install it with 'brew install hdf5'. For more details, see https://formulae.brew.sh/formula/hdf5"
+    echo "Once it is installed, run ./scripts/0_setup.sh again"
+    exit 1
+  fi
+
+  cython_pkg="$(cat $reqs_file | grep -E 'cython==.+')"
+  pip --no-cache-dir install "$cython_pkg"
+
+  numpy_pkg="$(cat $reqs_file | grep -E 'numpy==.+')"
+  pip install "$numpy_pkg"
+
+  h5py_pkg="$(cat $reqs_file | grep -E 'h5py==.+')"
+  HDF5_DIR="$(brew --prefix hdf5)" pip --no-cache-dir install --no-build-isolation "$h5py_pkg"
+elif [ "$version" == "3.10" ]; then
+  (cd .dfl/DeepFaceLab; git checkout support-opencv45)
+
+  numpy_pkg="$(cat $reqs_file | grep -E 'numpy==.+')"
+  pip install "$numpy_pkg"
+fi
+
+pip --no-cache-dir install -r $reqs_file
 
 echo "Done."

scripts/1_clean_workspace.sh

@@ -2,6 +2,6 @@
 cd "$(dirname $0)/.."
 source scripts/env.sh
 
-rm -fr "$WORKSPACE/data_src/*"
-rm -fr "$WORKSPACE/data_dst/*"
-rm -fr "$WORKSPACE/model/*"
+rm -fr $WORKSPACE/data_src/*
+rm -fr $WORKSPACE/data_dst/*
+rm -fr $WORKSPACE/model/*

scripts/5_XSeg_data_dst_mask_edit.sh

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+cd "$(dirname $0)/.."
+source scripts/env.sh
+
+python "$DFL_MAIN" xseg editor \
+  --input-dir "$WORKSPACE/data_dst/aligned"

scripts/5_XSeg_data_dst_mask_fetch.sh

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+cd "$(dirname $0)/.."
+source scripts/env.sh
+
+python "$DFL_MAIN" xseg fetch \
+  --input-dir "$WORKSPACE/data_dst/aligned"

scripts/5_XSeg_data_dst_mask_remove.sh

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+cd "$(dirname $0)/.."
+source scripts/env.sh
+
+python "$DFL_MAIN" xseg remove_labels \
+  --input-dir "$WORKSPACE/data_dst/aligned"

scripts/5_XSeg_data_dst_trained_mask_apply.sh

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+cd "$(dirname $0)/.."
+source scripts/env.sh
+
+python "$DFL_MAIN" xseg apply \
+  --input-dir "$WORKSPACE/data_dst/aligned" \
+  --model-dir "$WORKSPACE/model"

scripts/5_XSeg_data_dst_trained_mask_remove.sh

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+cd "$(dirname $0)/.."
+source scripts/env.sh
+
+python "$DFL_MAIN" xseg remove \
+  --input-dir "$WORKSPACE/data_dst/aligned"

scripts/5_XSeg_data_src_mask_edit.sh

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+cd "$(dirname $0)/.."
+source scripts/env.sh
+
+python "$DFL_MAIN" xseg editor \
+  --input-dir "$WORKSPACE/data_src/aligned"

scripts/5_XSeg_data_src_mask_fetch.sh

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+cd "$(dirname $0)/.."
+source scripts/env.sh
+
+python "$DFL_MAIN" xseg fetch \
+  --input-dir "$WORKSPACE/data_src/aligned"

scripts/5_XSeg_data_src_mask_remove.sh

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+cd "$(dirname $0)/.."
+source scripts/env.sh
+
+python "$DFL_MAIN" xseg remove_labels \
+  --input-dir "$WORKSPACE/data_src/aligned"

scripts/5_XSeg_data_src_trained_mask_apply.sh

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+cd "$(dirname $0)/.."
+source scripts/env.sh
+
+python "$DFL_MAIN" xseg apply \
+  --input-dir "$WORKSPACE/data_src/aligned" \
+  --model-dir "$WORKSPACE/model"

scripts/5_XSeg_data_src_trained_mask_remove.sh

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+cd "$(dirname $0)/.."
+source scripts/env.sh
+
+python "$DFL_MAIN" xseg remove \
+  --input-dir "$WORKSPACE/data_src/aligned"

scripts/5_XSeg_train.sh

@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+cd "$(dirname $0)/.."
+source scripts/env.sh
+
+python "$DFL_MAIN" train \
+  --training-data-src-dir "$WORKSPACE/data_src/aligned" \
+  --training-data-dst-dir "$WORKSPACE/data_dst/aligned" \
+  --model-dir "$WORKSPACE/model" \
+  --model XSeg

scripts/env.sh

@@ -2,3 +2,5 @@ DFL_MAIN=.dfl/DeepFaceLab/main.py
 WORKSPACE=workspace
 
 source .dfl/env/bin/activate
+
+set -e

scripts/xseg.sh

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+cd "$(dirname $0)/.."
+source scripts/env.sh
+
+python "$DFL_MAIN" xseg editor \
+  --input-dir "$WORKSPACE/data_src/aligned"