Create requirements_3.10_arm64.txt

README.md

@@ -1,12 +1,29 @@
 ## Intro
 
-This project provides scripts inspired by [DeepFaceLab_Linux](https://github.com/lbfs/DeepFaceLab_Linux) to setup and run [DeepFaceLab](https://github.com/iperov/DeepFaceLab) on MacOS.
+This project provides scripts inspired by [DeepFaceLab_Linux](https://github.com/nagadit/DeepFaceLab_Linux) to setup and run [DeepFaceLab](https://github.com/Smiril/DeepFaceLab_Apple-Silicon) on MacOS.
 
 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).
+Currently there's limited support for Apple M1 laptops. You can do model training, and the XSeg editor currently does work (the DeepFaceLab codebase is not compatible with PyQt6 but with PyQt5).
+
+## NOTE: FULL RUN M1
+
+```
+
+cd scripts
+./0_setup.sh
+./0_patch.sh
+./2_extract_images_from_video_data_src.sh  
+./3_extract_images_from_video_data_dst.sh
+./4.1_data_src_extract_faces_S3FD.sh
+./5.1_data_dst_extract_faces_S3FD.sh
+./6_train_Quick96.sh 
+./7_convert_Quick96.sh
+./8_converted_to_avi.sh 
+
+```
 
 ## Setup
 
@@ -23,8 +40,8 @@ Check if you have it with `brew ls --versions hdf5`. Install it with `brew insta
 
 **Clone and setup**
 
-1. Clone this repository (`git clone https://github.com/chychkan/DeepFaceLab_MacOS.git`)
-2. Run script `./scripts/0_setup.sh` to get [DeepFaceLab](https://github.com/iperov/DeepFaceLab), create virtual env and install necessary Python dependencies. This may take several minutes to run.
+1. Clone this repository (`git clone https://github.com/Smiril/DeepFaceLab_MacOS.git`)
+2. Run script `./scripts/0_setup.sh` to get [DeepFaceLab](https://github.com/Smiril/DeepFaceLab_apple-Silicon.git), create virtual env and install necessary Python dependencies. This may take several minutes to run.
 
 Now you can put your `data_src.mp4` and `data_dst.mp4` files into the `workspace/` dir and start running scripts from the `scripts/` dir.
 

requirements.txt

@@ -1,7 +1,7 @@
 numpy==1.21.4
 opencv-contrib-python-headless==4.1.2.30
 scipy==1.7.2
-tensorflow==2.7.0
+tensorflow==2.7.4
 colorama==0.4.4
 tqdm==4.62.3
 ffmpeg-python==0.2.0

requirements_3.10.txt

@@ -2,11 +2,11 @@ numpy==1.22.2
 numexpr==2.8.1
 opencv-python==4.5.5.62
 scipy==1.8.0
-tensorflow==2.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
+PyQt5==5.15.4

requirements_3.10_arm64.txt

@@ -0,0 +1,100 @@
+psutil>=5.8.0
+numpy==1.23.3
+numexpr<=2.8.1
+opencv-python<=4.6.0.66
+scikit-image<=0.19.3
+scikit-learn<=1.0.2
+scipy<=1.8.1
+tifffile<=2022.5.4
+pyparsing==3.0.9
+pillow
+tqdm<=4.64.0
+colorama<=0.4.4
+cython<=0.29.26
+PyWavelets<=1.3.0
+imageio<=2.19.3
+networkx<=2.8.4
+packaging<=21.3
+image
+timm
+PlL
+moviepy
+absl-py<=1.1.0
+astunparse
+cachetools<=5.2.0
+certifi<=2022.6.15
+charset-normalizer<=2.1.0
+flatbuffers<=1.12
+gast
+google-auth
+google-auth-oauthlib<=0.4.6
+google-pasta<=0.2.0
+grpcio
+h5py<=3.7.0
+idna<=3.3
+keras<=2.9.0
+keras-preprocessing
+libclang<=14.0.1
+markdown<=3.3.7
+oauthlib<=3.2.0
+opt-einsum<=3.3.0
+pyasn1==0.4.8
+pyasn1-modules<=0.2.8
+requests<=2.28.1
+requests-oauthlib<=1.3.1
+rsa<=4.8
+six
+Flask<=2.1.3
+Jinja2<=3.1.2
+Mako<=1.2.1
+MarkupSafe<=2.1.1
+alembic<=1.8.1
+click<=8.1.3
+cloudpickle<=2.1.0
+databricks-cli
+docker<=5.0.3
+entrypoints<=0.4
+gitdb<=4.0.9
+gitpython<=3.1.27
+gunicorn<=20.1.0
+importlib-metadata<=4.12.0
+itsdangerous<=2.1.2
+mlflow<=1.27.0
+pandas<=1.4.3
+prometheus-client<=0.14.1
+prometheus-flask-exporter<=0.20.2
+pyjwt<=2.4.0
+python-dateutil<=2.8.2
+pytz<=2022.1
+pyyaml<=6.0
+querystring-parser<=1.2.4
+smmap<=5.0.0
+sqlalchemy<=1.4.39
+sqlparse<=0.4.2
+tabulate<=0.8.10
+websocket-client<=1.3.3
+zipp<=3.8.1
+tensorboard<=2.9.1
+tensorboard-data-server<=0.6.1
+tensorboard-plugin-wit<=1.8.1
+tensorflow-estimator<=2.9.0
+tensorflow-macos<=2.9.0 
+tensorflow-metal
+termcolor<=1.1.0
+typing-extensions<=4.3.0
+urllib3<=1.26.10
+werkzeug<=2.1.2
+wrapt<=1.14.1
+fastcluster>=1.2.4
+matplotlib>=3.5.1
+ffmpeg-python==0.2.0
+imageio-ffmpeg>=0.4.7
+ffmpy
+torch<=1.12.0
+torchvision<=0.13.0
+torchaudio<=0.12.0
+insightface<=0.2.1
+ipython<=7.21.0
+PyQt5
+PyQt6<=6.2.3
+git+https://www.github.com/keras-team/keras-contrib.git

requirements_3.11.txt

@@ -0,0 +1,12 @@
+numpy==1.22.2
+numexpr==2.8.1
+opencv-python==4.5.5.62
+scipy==1.8.0
+tensorflow==2.9.0
+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.11_arm64.txt

@@ -0,0 +1,100 @@
+psutil>=5.8.0
+numpy==1.23.3
+numexpr<=2.8.1
+opencv-python<=4.6.0.66
+scikit-image<=0.19.3
+scikit-learn==1.4.1.post1
+scipy<=1.8.1
+tifffile<=2022.5.4
+pyparsing==3.0.9
+pillow
+future
+tqdm<=4.64.0
+colorama<=0.4.4
+cython<=0.29.26
+PyWavelets<=1.3.0
+imageio<=2.19.3
+networkx<=2.8.4
+packaging<=21.3
+image
+timm
+moviepy
+absl-py<=1.1.0
+astunparse
+cachetools<=5.2.0
+certifi<=2022.6.15
+charset-normalizer<=2.1.0
+flatbuffers<=23.5.26
+gast
+google-auth
+google-auth-oauthlib>=0.5.0
+google-pasta<=0.2.0
+grpcio
+h5py<=3.7.0
+idna<=3.3
+keras<=2.15.0
+keras-preprocessing
+libclang<=14.0.1
+markdown<=3.3.7
+oauthlib<=3.2.0
+opt-einsum<=3.3.0
+pyasn1==0.4.8
+pyasn1-modules<=0.2.8
+requests<=2.28.1
+requests-oauthlib<=1.3.1
+rsa<=4.8
+six
+Flask<=2.1.3
+Jinja2<=3.1.2
+Mako<=1.2.1
+MarkupSafe<=2.1.1
+alembic<=1.8.1
+click<=8.1.3
+cloudpickle<=2.1.0
+databricks-cli
+docker<=5.0.3
+entrypoints<=0.4
+gitdb<=4.0.9
+gitpython<=3.1.27
+gunicorn<=20.1.0
+importlib-metadata<=4.12.0
+itsdangerous<=2.1.2
+mlflow<=1.27.0
+pandas>1.3.3<=1.5.3
+prometheus-client<=0.14.1
+prometheus-flask-exporter<=0.20.2
+pyjwt<=2.4.0
+python-dateutil<=2.8.2
+pytz<=2022.1
+pyyaml<=6.0
+querystring-parser<=1.2.4
+smmap<=5.0.0
+sqlalchemy<=1.4.39
+sqlparse<=0.4.2
+tabulate<=0.8.10
+websocket-client<=1.3.3
+zipp<=3.8.1
+tensorboard<=2.15.0
+tensorboard-data-server<=0.8.0
+tensorboard-plugin-wit<=1.8.1
+tensorflow-estimator<=2.15.0
+tensorflow-macos<=2.15.0 
+tensorflow-metal
+termcolor<=1.1.0
+typing-extensions<=4.3.0
+urllib3<=1.26.10
+werkzeug<=2.1.2
+wrapt<=1.14.1
+fastcluster>=1.2.4
+matplotlib>=3.5.1
+ffmpeg-python==0.2.0
+imageio-ffmpeg>=0.4.7
+ffmpy
+torch<=2.2.1
+torchvision<=0.17.1
+torchaudio<=2.2.1
+insightface<=0.2.1
+ipython<=7.21.0
+PyQt5
+PyQt6<=6.2.3
+git+https://www.github.com/keras-team/keras-contrib.git

requirements_3.6.txt

@@ -1,7 +1,7 @@
 numpy==1.19.2
 opencv-contrib-python-headless==4.1.2.30
 scipy==1.5.4
-tensorflow==2.6.1
+tensorflow==2.6.2
 colorama==0.4.4
 tqdm==4.62.3
 ffmpeg-python==0.2.0

requirements_3.9.txt

@@ -1,7 +1,7 @@
 numpy==1.21.4
 opencv-contrib-python-headless==4.5.1.48
 scipy==1.7.2
-tensorflow==2.7.0
+tensorflow==2.8.4
 colorama==0.4.4
 tqdm==4.62.3
 ffmpeg-python==0.2.0

requirements_3.9_arm64.txt

@@ -9,5 +9,5 @@ ffmpeg-python==0.2.0
 Pillow==8.4.0
 scikit-image==0.19.1
 scipy==1.8.0
-tensorflow-macos==2.7.0
+tensorflow-macos==2.8.4
 PyQt6==6.2.3

scripts/0_patch.sh

@@ -0,0 +1,21 @@
+#!/usr/bin/env bash
+cd "$(dirname $0)/.."
+eval "$(/opt/homebrew/bin/brew shellenv)"
+
+set -e
+
+source .dfl/deep/bin/activate
+
+set -e
+
+python3.11 -m pip install --upgrade pip numpy==1.23.3 numexpr opencv-python colorama tqdm future tensorflow-macos scipy pillow PyQt5
+
+source .dfl/env/bin/activate
+
+set -e
+
+python3.10 -m pip install --upgrade pip numpy==1.23.3 numexpr opencv-python colorama tqdm future tensorflow-macos scipy pillow PyQt5 onnx protobuf>=3.12.2
+
+cp -R .dfl/ffmpeg/ffmpeg .dfl/deep/lib/python3.11/site-packages/
+
+echo "Done."