Add files via upload

scripts/0_setup.sh

@@ -1,32 +1,27 @@
 #!/usr/bin/env bash
 cd "$(dirname $0)/.."
-eval "$(/opt/homebrew/bin/brew shellenv)"
 
 set -e
 
-mkdir -p .dfl
+mkdir -p .venvs
 mkdir -p workspace
 
 is_arm64() {
   [ "$(uname -sm)" == "Darwin arm64" ]
 }
 
-is_arm64 && echo "Running on Apple M1 chip"
-
 if [ ! -d .dfl/DeepFaceLab ]; then
   echo "Cloning DeepFaceLab"
   git clone --no-single-branch --depth 1 "https://github.com/Smiril/DeepFaceLab_Apple-Silicon.git" .dfl/DeepFaceLab
 
-  if is_arm64; then
+    (cd .dfl/DeepFaceLab; git checkout main)
-    (cd .dfl/DeepFaceLab; git checkout master)
-  fi
 fi
 
-if [ ! -d .dfl/env ]; then
+if [ ! -d .venvs/deepfacelab ]; then
-  virtualenv -p python3 .dfl/env
+  venv -p python3 ./venvs/deepfacelab
 fi
 
-source .dfl/env/bin/activate
+source .venvs/deepfacelab/bin/activate
 
 python3 -m pip install --upgrade pip
 

scripts/2_extract_PNG_from_video_data_src.sh

@@ -2,7 +2,7 @@
 cd "$(dirname $0)/.."
 source scripts/env.sh
 
-$DFL_PYTHON "$DFL_SRC" videoed extract-video \
+$DFL_PYTHON "$DFL_MAIN" videoed extract-video \
     --input-file "$DFL_WORKSPACE/data_src.*" \
     --output-dir "$DFL_WORKSPACE/data_src"
 

scripts/3_extract_PNG_from_video_data_dst.sh

@@ -2,7 +2,7 @@
 cd "$(dirname $0)/.."
 source scripts/env.sh
 
-$DFL_PYTHON "$DFL_SRC" videoed extract-video \
+$DFL_PYTHON "$DFL_MAIN" videoed extract-video \
     --input-file "$DFL_WORKSPACE/data_dst.*" \
     --output-dir "$DFL_WORKSPACE/data_dst"
 

scripts/3_other_denoise_extracted_data_dst.sh

@@ -2,6 +2,6 @@
 cd "$(dirname $0)/.."
 source scripts/env.sh
 
-$DFL_PYTHON "$DFL_SRC/main.py" videoed denoise-image-sequence \
+$DFL_PYTHON "$DFL_MAIN" videoed denoise-image-sequence \
     --input-dir "$DFL_WORKSPACE/data_dst"
 

scripts/4.2.0_data_src_sort_by_black.sh

@@ -2,7 +2,7 @@
 cd "$(dirname $0)/.."
 source scripts/env.sh
 
-$DFL_PYTHON "$DFL_SRC" sort \
+$DFL_PYTHON "$DFL_MAIN" sort \
     --input-dir "$DFL_WORKSPACE/data_src/aligned" \
     --by black
 

scripts/4.2.1_data_src_sort_by_blur.sh

@@ -2,7 +2,7 @@
 cd "$(dirname $0)/.."
 source scripts/env.sh
 
-$DFL_PYTHON "$DFL_SRC" sort \
+$DFL_PYTHON "$DFL_MAIN" sort \
     --input-dir "$DFL_WORKSPACE/data_src/aligned" \
     --by blur
 

scripts/4.2.2_data_src_sort_by_similar_histogram.sh

@@ -2,7 +2,7 @@
 cd "$(dirname $0)/.."
 source scripts/env.sh
 
-$DFL_PYTHON "$DFL_SRC" sort \
+$DFL_PYTHON "$DFL_MAIN" sort \
     --input-dir "$DFL_WORKSPACE/data_src/aligned" \
     --by hist
 

scripts/4.2.3_data_src_sort_by_one_face.sh

@@ -2,7 +2,7 @@
 cd "$(dirname $0)/.."
 source scripts/env.sh
 
-$DFL_PYTHON "$DFL_SRC" sort \
+$DFL_PYTHON "$DFL_MAIN" sort \
     --input-dir "$DFL_WORKSPACE/data_src/aligned" \
     --by oneface
 

scripts/4.2.4_data_src_sort_by_face_pitch.sh

@@ -2,7 +2,7 @@
 cd "$(dirname $0)/.."
 source scripts/env.sh
 
-$DFL_PYTHON "$DFL_SRC" sort \
+$DFL_PYTHON "$DFL_MAIN" sort \
     --input-dir "$DFL_WORKSPACE/data_src/aligned" \
     --by face-pitch
 

scripts/4.2.4_data_src_sort_by_face_yaw.sh

@@ -2,7 +2,7 @@
 cd "$(dirname $0)/.."
 source scripts/env.sh
 
-$DFL_PYTHON "$DFL_SRC" sort \
+$DFL_PYTHON "$DFL_MAIN" sort \
     --input-dir "$DFL_WORKSPACE/data_src/aligned" \
     --by face-yaw
 

scripts/4.2_other_data_src_sort_by_brightness.sh

@@ -1,7 +1,9 @@
 #!/usr/bin/env bash
-source env.sh
+cd "$(dirname $0)/.."
+source scripts/env.sh
 
-$DFL_PYTHON "$DFL_SRC/main.py" sort \
+
+$DFL_PYTHON "$DFL_MAIN" sort \
     --input-dir "$DFL_WORKSPACE/data_src/aligned" \
     --by brightness
 

scripts/4.2_other_data_src_sort_by_hue.sh

@@ -1,7 +1,9 @@
 #!/usr/bin/env bash
-source env.sh
+cd "$(dirname $0)/.."
+source scripts/env.sh
 
-$DFL_PYTHON "$DFL_SRC/main.py" sort \
+
+$DFL_PYTHON "$DFL_MAIN" sort \
     --input-dir "$DFL_WORKSPACE/data_src/aligned" \
     --by hue
 

scripts/4.2_other_data_src_sort_by_original_filename.sh

@@ -1,7 +1,9 @@
 #!/usr/bin/env bash
-source env.sh
+cd "$(dirname $0)/.."
+source scripts/env.sh
 
-$DFL_PYTHON "$DFL_SRC/main.py" sort \
+
+$DFL_PYTHON "$DFL_MAIN" sort \
     --input-dir "$DFL_WORKSPACE/data_src/aligned" \
     --by origname
 

scripts/4.2_other_data_src_util_add_landmarks_debug_images.sh

@@ -1,7 +1,9 @@
 #!/usr/bin/env bash
-source env.sh
+cd "$(dirname $0)/.."
+source scripts/env.sh
 
-$DFL_PYTHON "$DFL_SRC/main.py" util \
+
+$DFL_PYTHON "$DFL_MAIN" util \
     --input-dir "$DFL_WORKSPACE/data_src/aligned" \
     --add-landmarks-debug-images
 

scripts/4.2_other_data_src_util_recover_original_filename.sh

@@ -2,6 +2,6 @@
 cd "$(dirname $0)/.."
 source scripts/env.sh
 
-$DFL_PYTHON "$DFL_SRC" util \
+$DFL_PYTHON "$DFL_MAIN" util \
     --input-dir "$DFL_WORKSPACE/data_src/aligned" \
     --recover-original-aligned-filename

scripts/4_data_src_extract_faces_MANUAL.sh

@@ -5,7 +5,6 @@ source scripts/env.sh
 $DFL_PYTHON "$DFL_MAIN" extract \
     --input-dir "$DFL_WORKSPACE/data_src" \
     --output-dir "$DFL_WORKSPACE/data_src/aligned" \
-    --multi-gpu \
     --detector manual \
     --debug-dir "$DFL_WORKSPACE/data_src/aligned_debug"
 

scripts/5.2_data_dst_sort_by_black.sh

@@ -2,6 +2,6 @@
 cd "$(dirname $0)/.."
 source scripts/env.sh
 
-$DFL_PYTHON "$DFL_SRC" sort \
+$DFL_PYTHON "$DFL_MAIN" sort \
     --input-dir "$DFL_WORKSPACE/data_dst/aligned" \
     --by black

scripts/5.2_data_dst_sort_by_one_face.sh

@@ -2,7 +2,7 @@
 cd "$(dirname $0)/.."
 source scripts/env.sh
 
-$DFL_PYTHON "$DFL_SRC" sort \
+$DFL_PYTHON "$DFL_MAIN" sort \
     --input-dir "$DFL_WORKSPACE/data_dst/aligned" \
     --by oneface
 

scripts/5.2_data_dst_sort_by_similar_histogram.sh

@@ -2,7 +2,7 @@
 cd "$(dirname $0)/.."
 source scripts/env.sh
 
-$DFL_PYTHON "$DFL_SRC" sort \
+$DFL_PYTHON "$DFL_MAIN" sort \
     --input-dir "$DFL_WORKSPACE/data_dst/aligned" \
     --by hist
 

scripts/5.3_data_dst_sort_by_blur.sh

@@ -2,7 +2,7 @@
 cd "$(dirname $0)/.."
 source scripts/env.sh
 
-$DFL_PYTHON "$DFL_SRC" sort \
+$DFL_PYTHON "$DFL_MAIN" sort \
     --input-dir "$DFL_WORKSPACE/data_dst/aligned" \
     --by blur
 

scripts/5.3_data_dst_sort_by_dissimilar_histogram.sh

@@ -2,7 +2,7 @@
 cd "$(dirname $0)/.."
 source scripts/env.sh
 
-$DFL_PYTHON "$DFL_SRC" sort \
+$DFL_PYTHON "$DFL_MAIN" sort \
     --input-dir "$DFL_WORKSPACE/data_dst/aligned" \
     --by hist-dissim
 

scripts/5.3_data_dst_sort_by_face_pitch.sh

@@ -2,7 +2,7 @@
 cd "$(dirname $0)/.."
 source scripts/env.sh
 
-$DFL_PYTHON "$DFL_SRC" sort \
+$DFL_PYTHON "$DFL_MAIN" sort \
     --input-dir "$DFL_WORKSPACE/data_dst/aligned" \
     --by face-pitch
 

scripts/5.3_data_dst_sort_by_face_yaw.sh

@@ -2,7 +2,7 @@
 cd "$(dirname $0)/.."
 source scripts/env.sh
 
-$DFL_PYTHON "$DFL_SRC" sort \
+$DFL_PYTHON "$DFL_MAIN" sort \
     --input-dir "$DFL_WORKSPACE/data_dst/aligned" \
     --by face-yaw
 

scripts/5.3_data_dst_sort_by_original_filename.sh

@@ -2,7 +2,7 @@
 cd "$(dirname $0)/.."
 source scripts/env.sh
 
-$DFL_PYTHON "$DFL_SRC" sort \
+$DFL_PYTHON "$DFL_MAIN" sort \
     --input-dir "$DFL_WORKSPACE/data_dst/aligned" \
     --by origname
 

scripts/5.3_other_data_dst_util_recover_original_filename.sh

@@ -2,6 +2,6 @@
 cd "$(dirname $0)/.."
 source scripts/env.sh
 
-$DFL_PYTHON "$DFL_SRC" util \
+$DFL_PYTHON "$DFL_MAIN" util \
     --input-dir "$DFL_WORKSPACE/data_dst/aligned" \
     --recover-original-aligned-filename

scripts/5.4_data_dst_facesettool.sh

@@ -2,5 +2,5 @@
 cd "$(dirname $0)/.."
 source scripts/env.sh
 
-$DFL_PYTHON "$DFL_SRC" facesettool enhance \
+$DFL_PYTHON "$DFL_MAIN" facesettool enhance \
     --input-dir "$DFL_WORKSPACE/data_dst/aligned" 

scripts/5_data_dst_extract_faces_MANUAL.sh

@@ -2,7 +2,7 @@
 cd "$(dirname $0)/.."
 source scripts/env.sh
 
-$DFL_PYTHON "$DFL_SRC" extract \
+$DFL_PYTHON "$DFL_MAIN" extract \
     --input-dir "$DFL_WORKSPACE/data_dst" \
     --output-dir "$DFL_WORKSPACE/data_dst/aligned" \
     --multi-gpu \

scripts/5_data_dst_extract_faces_MANUAL_RE-EXTRACT_DELETED_RESULTS_DEBUG.sh

@@ -2,7 +2,7 @@
 cd "$(dirname $0)/.."
 source scripts/env.sh
 
-$DFL_PYTHON "$DFL_SRC" extract \
+$DFL_PYTHON "$DFL_MAIN" extract \
     --input-dir "$DFL_WORKSPACE/data_dst" \
     --output-dir "$DFL_WORKSPACE/data_dst/aligned" \
     --multi-gpu \

scripts/6_train_AMP.sh

@@ -2,7 +2,7 @@
 cd "$(dirname $0)/.."
 source scripts/env.sh
 
-$DFL_PYTHON "$DFL_SRC" train \
+$DFL_PYTHON "$DFL_MAIN" train \
     --training-data-src-dir "$DFL_WORKSPACE/data_src" \
     --training-data-dst-dir "$DFL_WORKSPACE/data_dst" \
     --model-dir "$DFL_WORKSPACE/model" \

scripts/6_train_DF.sh

@@ -2,7 +2,7 @@
 cd "$(dirname $0)/.."
 source scripts/env.sh
 
-$DFL_PYTHON "$DFL_SRC" train \
+$DFL_PYTHON "$DFL_MAIN" train \
     --training-data-src-dir "$DFL_WORKSPACE/data_src" \
     --training-data-dst-dir "$DFL_WORKSPACE/data_dst" \
     --model-dir "$DFL_WORKSPACE/model" \

scripts/6_train_FANSegmentator.sh

@@ -2,7 +2,7 @@
 cd "$(dirname $0)/.."
 source scripts/env.sh
 
-$DFL_PYTHON "$DFL_SRC" train \
+$DFL_PYTHON "$DFL_MAIN" train \
     --training-data-src-dir "$DFL_WORKSPACE/data_src" \
     --training-data-dst-dir "$DFL_WORKSPACE/data_dst" \
     --model-dir "$DFL_WORKSPACE/model" \

scripts/6_train_H128.sh

@@ -2,7 +2,7 @@
 cd "$(dirname $0)/.."
 source scripts/env.sh
 
-$DFL_PYTHON "$DFL_SRC" train \
+$DFL_PYTHON "$DFL_MAIN" train \
     --training-data-src-dir "$DFL_WORKSPACE/data_src" \
     --training-data-dst-dir "$DFL_WORKSPACE/data_dst" \
     --model-dir "$DFL_WORKSPACE/model" \

scripts/6_train_H64.sh

@@ -2,7 +2,7 @@
 cd "$(dirname $0)/.."
 source scripts/env.sh
 
-$DFL_PYTHON "$DFL_SRC" train \
+$DFL_PYTHON "$DFL_MAIN" train \
     --training-data-src-dir "$DFL_WORKSPACE/data_src" \
     --training-data-dst-dir "$DFL_WORKSPACE/data_dst" \
     --model-dir "$DFL_WORKSPACE/model" \

scripts/6_train_LIAEF128.sh

@@ -2,7 +2,7 @@
 cd "$(dirname $0)/.."
 source scripts/env.sh
 
-$DFL_PYTHON "$DFL_SRC" train \
+$DFL_PYTHON "$DFL_MAIN" train \
     --training-data-src-dir "$DFL_WORKSPACE/data_src" \
     --training-data-dst-dir "$DFL_WORKSPACE/data_dst" \
     --model-dir "$DFL_WORKSPACE/model" \

scripts/6_train_SAE.sh

@@ -2,7 +2,7 @@
 cd "$(dirname $0)/.."
 source scripts/env.sh
 
-$DFL_PYTHON "$DFL_SRC" train \
+$DFL_PYTHON "$DFL_MAIN" train \
     --training-data-src-dir "$DFL_WORKSPACE/data_src" \
     --training-data-dst-dir "$DFL_WORKSPACE/data_dst" \
     --model-dir "$DFL_WORKSPACE/model" \

scripts/6_train_XSeg.sh

@@ -2,7 +2,7 @@
 cd "$(dirname $0)/.."
 source scripts/env.sh
 
-$DFL_PYTHON "$DFL_SRC" train \
+$DFL_PYTHON "$DFL_MAIN" train \
     --training-data-src-dir "$DFL_WORKSPACE/data_src" \
     --training-data-dst-dir "$DFL_WORKSPACE/data_dst" \
     --model-dir "$DFL_WORKSPACE/model" \

scripts/7_convert_AMP.sh

@@ -2,7 +2,7 @@
 cd "$(dirname $0)/.."
 source scripts/env.sh
 
-$DFL_PYTHON "$DFL_SRC" merge \
+$DFL_PYTHON "$DFL_MAIN" merge \
     --input-dir "$DFL_WORKSPACE/data_dst" \
     --output-dir "$DFL_WORKSPACE/data_dst/merged" \
     --output-mask-dir "$DFL_WORKSPACE/data_dst/masked" \

scripts/7_convert_DF.sh

@@ -2,7 +2,7 @@
 cd "$(dirname $0)/.."
 source scripts/env.sh
 
-$DFL_PYTHON "$DFL_SRC" convert \
+$DFL_PYTHON "$DFL_MAIN" convert \
     --input-dir "$DFL_WORKSPACE/data_dst" \
     --output-dir "$DFL_WORKSPACE/data_dst/merged" \
     --aligned-dir "$DFL_WORKSPACE/data_dst/aligned" \

scripts/7_convert_H128.sh

@@ -2,7 +2,7 @@
 cd "$(dirname $0)/.."
 source scripts/env.sh
 
-$DFL_PYTHON "$DFL_SRC" convert \
+$DFL_PYTHON "$DFL_MAIN" convert \
     --input-dir "$DFL_WORKSPACE/data_dst" \
     --output-dir "$DFL_WORKSPACE/data_dst/merged" \
     --aligned-dir "$DFL_WORKSPACE/data_dst/aligned" \

scripts/7_convert_H64.sh

@@ -2,7 +2,7 @@
 cd "$(dirname $0)/.."
 source scripts/env.sh
 
-$DFL_PYTHON "$DFL_SRC" convert \
+$DFL_PYTHON "$DFL_MAIN" convert \
     --input-dir "$DFL_WORKSPACE/data_dst" \
     --output-dir "$DFL_WORKSPACE/data_dst/merged" \
     --aligned-dir "$DFL_WORKSPACE/data_dst/aligned" \

scripts/7_convert_LIAEF128.sh

@@ -2,7 +2,7 @@
 cd "$(dirname $0)/.."
 source scripts/env.sh
 
-$DFL_PYTHON "$DFL_SRC" convert \
+$DFL_PYTHON "$DFL_MAIN" convert \
     --input-dir "$DFL_WORKSPACE/data_dst" \
     --output-dir "$DFL_WORKSPACE/data_dst/merged" \
     --aligned-dir "$DFL_WORKSPACE/data_dst/aligned" \

scripts/7_convert_Quick96.sh

@@ -2,7 +2,7 @@
 cd "$(dirname $0)/.."
 source scripts/env.sh
 
-$DFL_PYTHON "$DFL_SRC" merge \
+$DFL_PYTHON "$DFL_MAIN" merge \
     --input-dir "$DFL_WORKSPACE/data_src" \
     --output-dir "$DFL_WORKSPACE/data_dst/merged" \
     --output-mask-dir "$DFL_WORKSPACE/data_dst/masked" \

scripts/7_convert_SAE.sh

@@ -2,7 +2,7 @@
 cd "$(dirname $0)/.."
 source scripts/env.sh
 
-$DFL_PYTHON "$DFL_SRC" convert \
+$DFL_PYTHON "$DFL_MAIN" convert \
     --input-dir "$DFL_WORKSPACE/data_dst" \
     --output-dir "$DFL_WORKSPACE/data_dst/merged" \
     --aligned-dir "$DFL_WORKSPACE/data_dst/aligned" \

scripts/7_convert_SAEHD.sh

@@ -2,7 +2,7 @@
 cd "$(dirname $0)/.."
 source scripts/env.sh
 
-$DFL_PYTHON "$DFL_SRC" convert \
+$DFL_PYTHON "$DFL_MAIN" convert \
     --input-dir "$DFL_WORKSPACE/data_dst" \
     --output-dir "$DFL_WORKSPACE/data_dst/merged" \
     --aligned-dir "$DFL_WORKSPACE/data_dst/aligned" \

scripts/7_convert_XSeg.sh

@@ -2,7 +2,7 @@
 cd "$(dirname $0)/.."
 source scripts/env.sh
 
-$DFL_PYTHON "$DFL_SRC" convert \
+$DFL_PYTHON "$DFL_MAIN" convert \
     --input-dir "$DFL_WORKSPACE/data_dst" \
     --output-dir "$DFL_WORKSPACE/data_dst/merged" \
     --aligned-dir "$DFL_WORKSPACE/data_dst/aligned" \

scripts/8_converted_to_avi.sh

@@ -2,7 +2,7 @@
 cd "$(dirname $0)/.."
 source scripts/env.sh
 
-$DFL_PYTHON "$DFL_SRC" videoed video-from-sequence \
+$DFL_PYTHON "$DFL_MAIN" videoed video-from-sequence \
     --input-dir "$DFL_WORKSPACE/data_dst/aligned" \
     --output-file "$DFL_WORKSPACE/result.avi" \
     --include-audio \

scripts/8_converted_to_mov_lossless+alpha.sh

@@ -2,7 +2,7 @@
 cd "$(dirname $0)/.."
 source scripts/env.sh
 
-$DFL_PYTHON "$DFL_SRC" videoed video-from-sequence \
+$DFL_PYTHON "$DFL_MAIN" videoed video-from-sequence \
     --input-dir "$DFL_WORKSPACE/data_dst/merged" \
     --output-file "$DFL_WORKSPACE/result.mov" \
     --reference-file "$DFL_WORKSPACE/data_dst.*" \

scripts/8_converted_to_mp4.sh

@@ -2,7 +2,7 @@
 cd "$(dirname $0)/.."
 source scripts/env.sh
 
-$DFL_PYTHON "$DFL_SRC" videoed video-from-sequence \
+$DFL_PYTHON "$DFL_MAIN" videoed video-from-sequence \
     --input-dir "$DFL_WORKSPACE/data_dst/merged" \
     --output-file "$DFL_WORKSPACE/result.mp4" \
     --include-audio \

scripts/8_converted_to_mp4_lossless+alpha.sh

@@ -2,7 +2,7 @@
 cd "$(dirname $0)/.."
 source scripts/env.sh
 
-$DFL_PYTHON "$DFL_SRC" videoed video-from-sequence \
+$DFL_PYTHON "$DFL_MAIN" videoed video-from-sequence \
     --input-dir "$DFL_WORKSPACE/data_dst/merged" \
     --output-file "$DFL_WORKSPACE/result.mp4" \
     --reference-file "$DFL_WORKSPACE/data_dst.*" \

scripts/env.sh

@@ -1,10 +1,8 @@
-eval "$(/opt/homebrew/bin/brew shellenv)"
 DFL_PYTHON=python
 DFL_MAIN=.dfl/DeepFaceLab/main.py
-DFL_SRC=.dfl/DeepFaceLab/main.py
 WORKSPACE=workspace
 DFL_WORKSPACE=workspace
-source .dfl/env/bin/activate
+source .venvs/deepfacelab/bin/activate
 
 set -e