Core Development Reset

scripts/0_setup.sh

@@ -15,7 +15,7 @@ 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
+  git clone --no-single-branch --depth 1 "https://github.com/iperov/DeepFaceLab.git" .dfl/DeepFaceLab
 
   if is_arm64; then
     (cd .dfl/DeepFaceLab; git checkout support-arm64)
@@ -28,9 +28,9 @@ fi
 
 source .dfl/env/bin/activate
 
-python -m pip install --upgrade pip
+python3 -m pip install --upgrade pip
 
-version=$(python -V | cut -f 2 -d ' ' | cut -f 1,2 -d .)
+version=$(python3 -V | cut -f 2 -d ' ' | cut -f 1,2 -d .)
 reqs_file='requirements.txt'
 
 version_suffix=''
@@ -45,7 +45,7 @@ fi
 
 reqs_file="requirements${version_suffix}${architecture_suffix}.txt"
 
-echo "Using $reqs_file for $(python -V)"
+echo "Using $reqs_file for $(python3 -V)"
 
 if is_arm64; then
   if [[ -z "$(brew ls --versions hdf5)" ]]; then

scripts/2_extract_PNG_from_video_data_src.sh

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+cd "$(dirname $0)/.."
+source scripts/env.sh
+
+$DFL_PYTHON "$DFL_SRC" videoed extract-video \
+    --input-file "$DFL_WORKSPACE/data_src.*" \
+    --output-dir "$DFL_WORKSPACE/data_src"
+

scripts/3_extract_PNG_from_video_data_dst.sh

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+cd "$(dirname $0)/.."
+source scripts/env.sh
+
+$DFL_PYTHON "$DFL_SRC" videoed extract-video \
+    --input-file "$DFL_WORKSPACE/data_dst.*" \
+    --output-dir "$DFL_WORKSPACE/data_dst"
+

scripts/3_other_denoise_extracted_data_dst.sh

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+cd "$(dirname $0)/.."
+source scripts/env.sh
+
+$DFL_PYTHON "$DFL_SRC/main.py" videoed denoise-image-sequence \
+    --input-dir "$DFL_WORKSPACE/data_dst"
+

scripts/4.2.0_data_src_sort_by_black.sh

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

scripts/4.2.1_data_src_sort_by_blur.sh

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

scripts/4.2.2_data_src_sort_by_similar_histogram.sh

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

scripts/4.2.3_data_src_sort_by_one_face.sh

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

scripts/4.2.4_data_src_sort_by_dissimilar_face.sh

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+cd "$(dirname $0)/.."
+source scripts/env.sh
+
+$DFL_PYTHON "$DFL_SRC" sort \
+    --input-dir "$DFL_WORKSPACE/data_src/aligned" \
+    --by face-dissim
+

scripts/4.2.4_data_src_sort_by_dissimilar_histogram.sh

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+cd "$(dirname $0)/.."
+source scripts/env.sh
+
+$DFL_PYTHON "$DFL_SRC" sort \
+    --input-dir "$DFL_WORKSPACE/data_src/aligned" \
+    --by hist-dissim
+

scripts/4.2.5_data_src_sort_by_face_pitch.sh

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+cd "$(dirname $0)/.."
+source scripts/env.sh
+
+$DFL_PYTHON "$DFL_SRC" sort \
+    --input-dir "$DFL_WORKSPACE/data_src/aligned" \
+    --by face-pitch
+

scripts/4.2.5_data_src_sort_by_face_yaw.sh

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+cd "$(dirname $0)/.."
+source scripts/env.sh
+
+$DFL_PYTHON "$DFL_SRC" sort \
+    --input-dir "$DFL_WORKSPACE/data_src/aligned" \
+    --by face-yaw
+

scripts/4.2.6_data_src_sort_by_final.sh

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

scripts/4.2_other_data_src_sort_by_brightness.sh

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

scripts/4.2_other_data_src_sort_by_hue.sh

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

scripts/4.2_other_data_src_sort_by_original_filename.sh

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

scripts/4.2_other_data_src_util_add_landmarks_debug_images.sh

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

scripts/4.2_other_data_src_util_recover_original_filename.sh

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+cd "$(dirname $0)/.."
+source scripts/env.sh
+
+$DFL_PYTHON "$DFL_SRC" util \
+    --input-dir "$DFL_WORKSPACE/data_src/aligned" \
+    --recover-original-aligned-filename

scripts/4_data_src_extract_faces_MANUAL.sh

@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+source env.sh
+
+$DFL_PYTHON "$DFL_SRC/main.py" 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/4_data_src_extract_faces_MT_all_GPU.sh

@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+source env.sh
+
+$DFL_PYTHON "$DFL_SRC/main.py" extract \
+    --input-dir "$DFL_WORKSPACE/data_src" \
+    --output-dir "$DFL_WORKSPACE/data_src/aligned" \
+    --multi-gpu \
+    --detector mt
+

scripts/4_data_src_extract_faces_MT_all_GPU_debug.sh

@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+source env.sh
+
+$DFL_PYTHON "$DFL_SRC/main.py" extract \
+    --input-dir "$DFL_WORKSPACE/data_src" \
+    --output-dir "$DFL_WORKSPACE/data_src/aligned" \
+    --multi-gpu \
+    --detector mt \
+    --debug-dir "$DFL_WORKSPACE/data_src/aligned_debug"
+

scripts/4_data_src_extract_faces_MT_best_GPU.sh

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+source env.sh
+
+$DFL_PYTHON "$DFL_SRC/main.py" extract \
+    --input-dir "$DFL_WORKSPACE/data_src" \
+    --output-dir "$DFL_WORKSPACE/data_src/aligned" \
+    --detector mt
+

scripts/4_data_src_extract_faces_S3FD_all_GPU.sh

@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+source env.sh
+
+$DFL_PYTHON "$DFL_SRC/main.py" extract \
+    --input-dir "$DFL_WORKSPACE/data_src" \
+    --output-dir "$DFL_WORKSPACE/data_src/aligned" \
+    --multi-gpu \
+    --detector s3fd
+

scripts/4_data_src_extract_faces_S3FD_all_GPU_debug.sh

@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+source env.sh
+
+$DFL_PYTHON "$DFL_SRC/main.py" extract \
+    --input-dir "$DFL_WORKSPACE/data_src" \
+    --output-dir "$DFL_WORKSPACE/data_src/aligned" \
+    --multi-gpu \
+    --detector s3fd \
+    --debug-dir "$DFL_WORKSPACE/data_src/aligned_debug"
+

scripts/4_data_src_extract_faces_S3FD_best_GPU.sh

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+source env.sh
+
+$DFL_PYTHON "$DFL_SRC/main.py" extract \
+    --input-dir "$DFL_WORKSPACE/data_src" \
+    --output-dir "$DFL_WORKSPACE/data_src/aligned" \
+    --detector s3fd
+

scripts/5_data_dst_extract_faces_MANUAL.sh

@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+cd "$(dirname $0)/.."
+source scripts/env.sh
+
+$DFL_PYTHON "$DFL_SRC" extract \
+    --input-dir "$DFL_WORKSPACE/data_dst" \
+    --output-dir "$DFL_WORKSPACE/data_dst/aligned" \
+    --multi-gpu \
+    --detector manual \
+    --debug-dir "$DFL_WORKSPACE/data_dst/aligned_debug"

scripts/5_data_dst_extract_faces_MANUAL_RE-EXTRACT_DELETED_RESULTS_DEBUG.sh

@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+cd "$(dirname $0)/.."
+source scripts/env.sh
+
+$DFL_PYTHON "$DFL_SRC" extract \
+    --input-dir "$DFL_WORKSPACE/data_dst" \
+    --output-dir "$DFL_WORKSPACE/data_dst/aligned" \
+    --multi-gpu \
+    --detector manual \
+    --manual-output-debug-fix \
+    --debug-dir "$DFL_WORKSPACE/data_dst/aligned_debug"
+

scripts/5_data_dst_extract_faces_MT_all_GPU+manual_fix.sh

@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+cd "$(dirname $0)/.."
+source scripts/env.sh
+
+$DFL_PYTHON "$DFL_SRC" extract \
+    --input-dir "$DFL_WORKSPACE/data_dst" \
+    --output-dir "$DFL_WORKSPACE/data_dst/aligned" \
+    --multi-gpu \
+    --detector mt \
+    --manual-fix \
+    --debug-dir "$DFL_WORKSPACE/data_dst/aligned_debug"
+

scripts/5_data_dst_extract_faces_MT_all_GPU.sh

@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+cd "$(dirname $0)/.."
+source scripts/env.sh
+
+$DFL_PYTHON "$DFL_SRC" extract \
+    --input-dir "$DFL_WORKSPACE/data_dst" \
+    --output-dir "$DFL_WORKSPACE/data_dst/aligned" \
+    --multi-gpu \
+    --detector mt \
+    --debug-dir "$DFL_WORKSPACE/data_dst/aligned_debug"

scripts/5_data_dst_extract_faces_MT_best_GPU.sh

@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+cd "$(dirname $0)/.."
+source scripts/env.sh
+
+$DFL_PYTHON "$DFL_SRC" extract \
+    --input-dir "$DFL_WORKSPACE/data_dst" \
+    --output-dir "$DFL_WORKSPACE/data_dst/aligned" \
+    --detector mt \
+    --debug-dir "$DFL_WORKSPACE/data_dst/aligned_debug"

scripts/5_data_dst_extract_faces_S3FD_all_GPU+manual_fix.sh

@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+cd "$(dirname $0)/.."
+source scripts/env.sh
+
+$DFL_PYTHON "$DFL_SRC" extract \
+    --input-dir "$DFL_WORKSPACE/data_dst" \
+    --output-dir "$DFL_WORKSPACE/data_dst/aligned" \
+    --multi-gpu \
+    --detector s3fd \
+    --manual-fix \
+    --debug-dir "$DFL_WORKSPACE/data_dst/aligned_debug"
+

scripts/5_data_dst_extract_faces_S3FD_all_GPU.sh

@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+cd "$(dirname $0)/.."
+source scripts/env.sh
+
+$DFL_PYTHON "$DFL_SRC" extract \
+    --input-dir "$DFL_WORKSPACE/data_dst" \
+    --output-dir "$DFL_WORKSPACE/data_dst/aligned" \
+    --multi-gpu \
+    --detector s3fd \
+    --debug-dir "$DFL_WORKSPACE/data_dst/aligned_debug"
+

scripts/5_data_dst_extract_faces_S3FD_best_GPU.sh

@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+cd "$(dirname $0)/.."
+source scripts/env.sh
+
+$DFL_PYTHON "$DFL_SRC" extract \
+    --input-dir "$DFL_WORKSPACE/data_dst" \
+    --output-dir "$DFL_WORKSPACE/data_dst/aligned" \
+    --detector s3fd \
+    --debug-dir "$DFL_WORKSPACE/data_dst/aligned_debug"
+