From e7cc8534a2b31b99e48210ec31b2aac91b6b7868 Mon Sep 17 00:00:00 2001 From: Smiril Date: Sun, 25 Feb 2024 15:18:55 +0100 Subject: [PATCH] Add files via upload --- scripts/0_setup.sh | 15 +++++---------- scripts/2_extract_PNG_from_video_data_src.sh | 2 +- scripts/3_extract_PNG_from_video_data_dst.sh | 2 +- scripts/3_other_denoise_extracted_data_dst.sh | 2 +- scripts/4.2.0_data_src_sort_by_black.sh | 2 +- scripts/4.2.1_data_src_sort_by_blur.sh | 2 +- .../4.2.2_data_src_sort_by_similar_histogram.sh | 2 +- scripts/4.2.3_data_src_sort_by_one_face.sh | 2 +- scripts/4.2.4_data_src_sort_by_face_pitch.sh | 2 +- scripts/4.2.4_data_src_sort_by_face_yaw.sh | 2 +- scripts/4.2_other_data_src_sort_by_brightness.sh | 6 ++++-- scripts/4.2_other_data_src_sort_by_hue.sh | 6 ++++-- ....2_other_data_src_sort_by_original_filename.sh | 6 ++++-- ...er_data_src_util_add_landmarks_debug_images.sh | 6 ++++-- ...her_data_src_util_recover_original_filename.sh | 2 +- scripts/4_data_src_extract_faces_MANUAL.sh | 1 - scripts/5.2_data_dst_sort_by_black.sh | 2 +- scripts/5.2_data_dst_sort_by_one_face.sh | 2 +- scripts/5.2_data_dst_sort_by_similar_histogram.sh | 2 +- scripts/5.3_data_dst_sort_by_blur.sh | 2 +- .../5.3_data_dst_sort_by_dissimilar_histogram.sh | 2 +- scripts/5.3_data_dst_sort_by_face_pitch.sh | 2 +- scripts/5.3_data_dst_sort_by_face_yaw.sh | 2 +- scripts/5.3_data_dst_sort_by_original_filename.sh | 2 +- ...her_data_dst_util_recover_original_filename.sh | 2 +- scripts/5.4_data_dst_facesettool.sh | 2 +- scripts/5_data_dst_extract_faces_MANUAL.sh | 2 +- ...ces_MANUAL_RE-EXTRACT_DELETED_RESULTS_DEBUG.sh | 2 +- scripts/6_train_AMP.sh | 2 +- scripts/6_train_DF.sh | 2 +- scripts/6_train_FANSegmentator.sh | 2 +- scripts/6_train_H128.sh | 2 +- scripts/6_train_H64.sh | 2 +- scripts/6_train_LIAEF128.sh | 2 +- scripts/6_train_SAE.sh | 2 +- scripts/6_train_XSeg.sh | 2 +- scripts/7_convert_AMP.sh | 2 +- scripts/7_convert_DF.sh | 2 +- scripts/7_convert_H128.sh | 2 +- scripts/7_convert_H64.sh | 2 +- scripts/7_convert_LIAEF128.sh | 2 +- scripts/7_convert_Quick96.sh | 2 +- scripts/7_convert_SAE.sh | 2 +- scripts/7_convert_SAEHD.sh | 2 +- scripts/7_convert_XSeg.sh | 2 +- scripts/8_converted_to_avi.sh | 2 +- scripts/8_converted_to_mov_lossless+alpha.sh | 2 +- scripts/8_converted_to_mp4.sh | 2 +- scripts/8_converted_to_mp4_lossless+alpha.sh | 2 +- scripts/env.sh | 4 +--- 50 files changed, 65 insertions(+), 65 deletions(-) diff --git a/scripts/0_setup.sh b/scripts/0_setup.sh index 6a98675..71c5184 100755 --- a/scripts/0_setup.sh +++ b/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 master) - fi + (cd .dfl/DeepFaceLab; git checkout main) fi -if [ ! -d .dfl/env ]; then - virtualenv -p python3 .dfl/env +if [ ! -d .venvs/deepfacelab ]; then + venv -p python3 ./venvs/deepfacelab fi -source .dfl/env/bin/activate +source .venvs/deepfacelab/bin/activate python3 -m pip install --upgrade pip diff --git a/scripts/2_extract_PNG_from_video_data_src.sh b/scripts/2_extract_PNG_from_video_data_src.sh index 4911ece..33f1d24 100755 --- a/scripts/2_extract_PNG_from_video_data_src.sh +++ b/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" diff --git a/scripts/3_extract_PNG_from_video_data_dst.sh b/scripts/3_extract_PNG_from_video_data_dst.sh index 38d20a7..02271db 100755 --- a/scripts/3_extract_PNG_from_video_data_dst.sh +++ b/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" diff --git a/scripts/3_other_denoise_extracted_data_dst.sh b/scripts/3_other_denoise_extracted_data_dst.sh index 2c7ead7..3c1afb6 100755 --- a/scripts/3_other_denoise_extracted_data_dst.sh +++ b/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" diff --git a/scripts/4.2.0_data_src_sort_by_black.sh b/scripts/4.2.0_data_src_sort_by_black.sh index 30d44da..0c47eb3 100755 --- a/scripts/4.2.0_data_src_sort_by_black.sh +++ b/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 diff --git a/scripts/4.2.1_data_src_sort_by_blur.sh b/scripts/4.2.1_data_src_sort_by_blur.sh index 1ee1bf9..c70ec40 100755 --- a/scripts/4.2.1_data_src_sort_by_blur.sh +++ b/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 diff --git a/scripts/4.2.2_data_src_sort_by_similar_histogram.sh b/scripts/4.2.2_data_src_sort_by_similar_histogram.sh index 902d56c..4e5afa0 100755 --- a/scripts/4.2.2_data_src_sort_by_similar_histogram.sh +++ b/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 diff --git a/scripts/4.2.3_data_src_sort_by_one_face.sh b/scripts/4.2.3_data_src_sort_by_one_face.sh index 799d85c..a16ddf0 100755 --- a/scripts/4.2.3_data_src_sort_by_one_face.sh +++ b/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 diff --git a/scripts/4.2.4_data_src_sort_by_face_pitch.sh b/scripts/4.2.4_data_src_sort_by_face_pitch.sh index 06dd4bd..72cba70 100755 --- a/scripts/4.2.4_data_src_sort_by_face_pitch.sh +++ b/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 diff --git a/scripts/4.2.4_data_src_sort_by_face_yaw.sh b/scripts/4.2.4_data_src_sort_by_face_yaw.sh index 6122e53..ed02be4 100755 --- a/scripts/4.2.4_data_src_sort_by_face_yaw.sh +++ b/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 diff --git a/scripts/4.2_other_data_src_sort_by_brightness.sh b/scripts/4.2_other_data_src_sort_by_brightness.sh index f40b9f9..473bb9d 100755 --- a/scripts/4.2_other_data_src_sort_by_brightness.sh +++ b/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 diff --git a/scripts/4.2_other_data_src_sort_by_hue.sh b/scripts/4.2_other_data_src_sort_by_hue.sh index 81aaba5..70866fe 100755 --- a/scripts/4.2_other_data_src_sort_by_hue.sh +++ b/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 diff --git a/scripts/4.2_other_data_src_sort_by_original_filename.sh b/scripts/4.2_other_data_src_sort_by_original_filename.sh index 8a95487..5069180 100755 --- a/scripts/4.2_other_data_src_sort_by_original_filename.sh +++ b/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 diff --git a/scripts/4.2_other_data_src_util_add_landmarks_debug_images.sh b/scripts/4.2_other_data_src_util_add_landmarks_debug_images.sh index a8f4fdc..7f4e128 100755 --- a/scripts/4.2_other_data_src_util_add_landmarks_debug_images.sh +++ b/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 diff --git a/scripts/4.2_other_data_src_util_recover_original_filename.sh b/scripts/4.2_other_data_src_util_recover_original_filename.sh index 07af95a..29620b4 100755 --- a/scripts/4.2_other_data_src_util_recover_original_filename.sh +++ b/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 diff --git a/scripts/4_data_src_extract_faces_MANUAL.sh b/scripts/4_data_src_extract_faces_MANUAL.sh index b7ba1a5..d96e546 100755 --- a/scripts/4_data_src_extract_faces_MANUAL.sh +++ b/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" diff --git a/scripts/5.2_data_dst_sort_by_black.sh b/scripts/5.2_data_dst_sort_by_black.sh index 00cdf20..3e0c235 100755 --- a/scripts/5.2_data_dst_sort_by_black.sh +++ b/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 diff --git a/scripts/5.2_data_dst_sort_by_one_face.sh b/scripts/5.2_data_dst_sort_by_one_face.sh index f96380b..24aeca2 100755 --- a/scripts/5.2_data_dst_sort_by_one_face.sh +++ b/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 diff --git a/scripts/5.2_data_dst_sort_by_similar_histogram.sh b/scripts/5.2_data_dst_sort_by_similar_histogram.sh index b7f125e..9678bf5 100755 --- a/scripts/5.2_data_dst_sort_by_similar_histogram.sh +++ b/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 diff --git a/scripts/5.3_data_dst_sort_by_blur.sh b/scripts/5.3_data_dst_sort_by_blur.sh index 3d10ae6..67edc80 100755 --- a/scripts/5.3_data_dst_sort_by_blur.sh +++ b/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 diff --git a/scripts/5.3_data_dst_sort_by_dissimilar_histogram.sh b/scripts/5.3_data_dst_sort_by_dissimilar_histogram.sh index 5955c1d..e0ccfc9 100755 --- a/scripts/5.3_data_dst_sort_by_dissimilar_histogram.sh +++ b/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 diff --git a/scripts/5.3_data_dst_sort_by_face_pitch.sh b/scripts/5.3_data_dst_sort_by_face_pitch.sh index 63d83c7..555bdc5 100755 --- a/scripts/5.3_data_dst_sort_by_face_pitch.sh +++ b/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 diff --git a/scripts/5.3_data_dst_sort_by_face_yaw.sh b/scripts/5.3_data_dst_sort_by_face_yaw.sh index dd09ce2..483a17b 100755 --- a/scripts/5.3_data_dst_sort_by_face_yaw.sh +++ b/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 diff --git a/scripts/5.3_data_dst_sort_by_original_filename.sh b/scripts/5.3_data_dst_sort_by_original_filename.sh index fa7ebde..1c3dc52 100755 --- a/scripts/5.3_data_dst_sort_by_original_filename.sh +++ b/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 diff --git a/scripts/5.3_other_data_dst_util_recover_original_filename.sh b/scripts/5.3_other_data_dst_util_recover_original_filename.sh index 5fa0923..57584c9 100755 --- a/scripts/5.3_other_data_dst_util_recover_original_filename.sh +++ b/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 diff --git a/scripts/5.4_data_dst_facesettool.sh b/scripts/5.4_data_dst_facesettool.sh index e8eaed2..1c82711 100755 --- a/scripts/5.4_data_dst_facesettool.sh +++ b/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" diff --git a/scripts/5_data_dst_extract_faces_MANUAL.sh b/scripts/5_data_dst_extract_faces_MANUAL.sh index 166be2d..2182a17 100755 --- a/scripts/5_data_dst_extract_faces_MANUAL.sh +++ b/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 \ diff --git a/scripts/5_data_dst_extract_faces_MANUAL_RE-EXTRACT_DELETED_RESULTS_DEBUG.sh b/scripts/5_data_dst_extract_faces_MANUAL_RE-EXTRACT_DELETED_RESULTS_DEBUG.sh index a329ccb..f8903c6 100755 --- a/scripts/5_data_dst_extract_faces_MANUAL_RE-EXTRACT_DELETED_RESULTS_DEBUG.sh +++ b/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 \ diff --git a/scripts/6_train_AMP.sh b/scripts/6_train_AMP.sh index a3400d1..28462c0 100755 --- a/scripts/6_train_AMP.sh +++ b/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" \ diff --git a/scripts/6_train_DF.sh b/scripts/6_train_DF.sh index 6e63d3b..e9e7992 100755 --- a/scripts/6_train_DF.sh +++ b/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" \ diff --git a/scripts/6_train_FANSegmentator.sh b/scripts/6_train_FANSegmentator.sh index 2eefe87..bdf057e 100755 --- a/scripts/6_train_FANSegmentator.sh +++ b/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" \ diff --git a/scripts/6_train_H128.sh b/scripts/6_train_H128.sh index 85b988d..b9ea54e 100755 --- a/scripts/6_train_H128.sh +++ b/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" \ diff --git a/scripts/6_train_H64.sh b/scripts/6_train_H64.sh index 498421b..3e32837 100755 --- a/scripts/6_train_H64.sh +++ b/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" \ diff --git a/scripts/6_train_LIAEF128.sh b/scripts/6_train_LIAEF128.sh index 7b7559b..5738e89 100755 --- a/scripts/6_train_LIAEF128.sh +++ b/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" \ diff --git a/scripts/6_train_SAE.sh b/scripts/6_train_SAE.sh index 0cc85f5..fd0dd8a 100755 --- a/scripts/6_train_SAE.sh +++ b/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" \ diff --git a/scripts/6_train_XSeg.sh b/scripts/6_train_XSeg.sh index e3552ac..318f129 100755 --- a/scripts/6_train_XSeg.sh +++ b/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" \ diff --git a/scripts/7_convert_AMP.sh b/scripts/7_convert_AMP.sh index 46ebccc..692a00b 100755 --- a/scripts/7_convert_AMP.sh +++ b/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" \ diff --git a/scripts/7_convert_DF.sh b/scripts/7_convert_DF.sh index 27bc39b..4737542 100755 --- a/scripts/7_convert_DF.sh +++ b/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" \ diff --git a/scripts/7_convert_H128.sh b/scripts/7_convert_H128.sh index 2984cf9..638139f 100755 --- a/scripts/7_convert_H128.sh +++ b/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" \ diff --git a/scripts/7_convert_H64.sh b/scripts/7_convert_H64.sh index 8bd64df..ce41ad8 100755 --- a/scripts/7_convert_H64.sh +++ b/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" \ diff --git a/scripts/7_convert_LIAEF128.sh b/scripts/7_convert_LIAEF128.sh index 158e9e9..67d2ace 100755 --- a/scripts/7_convert_LIAEF128.sh +++ b/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" \ diff --git a/scripts/7_convert_Quick96.sh b/scripts/7_convert_Quick96.sh index 38f007b..9ef21d8 100755 --- a/scripts/7_convert_Quick96.sh +++ b/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" \ diff --git a/scripts/7_convert_SAE.sh b/scripts/7_convert_SAE.sh index 33f43bc..fbfe410 100755 --- a/scripts/7_convert_SAE.sh +++ b/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" \ diff --git a/scripts/7_convert_SAEHD.sh b/scripts/7_convert_SAEHD.sh index 4c10c15..68b0e6c 100755 --- a/scripts/7_convert_SAEHD.sh +++ b/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" \ diff --git a/scripts/7_convert_XSeg.sh b/scripts/7_convert_XSeg.sh index 176eb10..d17d5ad 100755 --- a/scripts/7_convert_XSeg.sh +++ b/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" \ diff --git a/scripts/8_converted_to_avi.sh b/scripts/8_converted_to_avi.sh index c11d57e..6c4c88e 100755 --- a/scripts/8_converted_to_avi.sh +++ b/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 \ diff --git a/scripts/8_converted_to_mov_lossless+alpha.sh b/scripts/8_converted_to_mov_lossless+alpha.sh index 26a125c..be8e664 100755 --- a/scripts/8_converted_to_mov_lossless+alpha.sh +++ b/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.*" \ diff --git a/scripts/8_converted_to_mp4.sh b/scripts/8_converted_to_mp4.sh index 8fcc075..f698372 100755 --- a/scripts/8_converted_to_mp4.sh +++ b/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 \ diff --git a/scripts/8_converted_to_mp4_lossless+alpha.sh b/scripts/8_converted_to_mp4_lossless+alpha.sh index 0145f5e..d03d57b 100755 --- a/scripts/8_converted_to_mp4_lossless+alpha.sh +++ b/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.*" \ diff --git a/scripts/env.sh b/scripts/env.sh index ec3e89a..cf63bb0 100644 --- a/scripts/env.sh +++ b/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