OSSForks/faceswap
1
0
Fork 0
mirror of https://github.com/zebrajr/faceswap.git synced 2025-12-06 00:20:09 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Compare commits

base: OSSForks:acd0f11749439d7884709492d1527be5569739c3
Branches Tags
OSSForks:master
...
compare: OSSForks:b02075647b774b45d6e06cb33b0b59e800ab5ae5
Branches Tags
OSSForks:master

5 Commits
acd0f11749 ... b02075647b

Author SHA1 Message Date
torzdf
b02075647b Merge branch 'staging'
Some checks failed
ci/build / conda (${{ matrix.os }}, ${{ matrix.backend }}) (cpu, macos-latest) (push) Has been cancelled
Details
ci/build / conda (${{ matrix.os }}, ${{ matrix.backend }}) (cpu, ubuntu-latest) (push) Has been cancelled
Details
ci/build / conda (${{ matrix.os }}, ${{ matrix.backend }}) (cpu, windows-latest) (push) Has been cancelled
Details
ci/build / conda (${{ matrix.os }}, ${{ matrix.backend }}) (directml, windows-latest) (push) Has been cancelled
Details
ci/build / conda (${{ matrix.os }}, ${{ matrix.backend }}) (nvidia, macos-latest) (push) Has been cancelled
Details
ci/build / conda (${{ matrix.os }}, ${{ matrix.backend }}) (nvidia, ubuntu-latest) (push) Has been cancelled
Details
ci/build / conda (${{ matrix.os }}, ${{ matrix.backend }}) (nvidia, windows-latest) (push) Has been cancelled
Details
ci/build / conda (${{ matrix.os }}, ${{ matrix.backend }}) (rocm, ubuntu-latest) (push) Has been cancelled
Details
ci/build / pip (ubuntu-latest, ${{ matrix.backend }}) (cpu, 3.10) (push) Has been cancelled
Details
ci/build / pip (windows-latest, ${{ matrix.backend }}) (cpu, 3.10) (push) Has been cancelled
Details
ci/build / pip (windows-latest, ${{ matrix.backend }}) (directml, 3.10) (push) Has been cancelled
Details
2025-09-18 14:22:18 +01:00
torzdf
0f27fe19cd Installer: Miniconda fix TOS for Windows 2025-09-18 14:12:07 +01:00
torzdf
161c610c01 Install: Miniconda - Auto Accept TOS 2025-09-18 13:10:27 +01:00
torzdf
c3ffa603a7 Merge branch 'staging' 2025-07-11 18:20:07 +01:00
torzdf
9cda7aacae
Bugfix: requirements, pin opencv to prevent numpy2.x install 2025-07-11 18:19:27 +01:00
4 changed files with 7 additions and 3 deletions
Show Stats Expand all files Collapse all files

3
.install/linux/faceswap_setup_x64.sh
View File

@ -338,10 +338,11 @@ conda_install() {
info "Installing Miniconda3..."
yellow ; fname="$(basename -- $DL_CONDA)"
bash "$TMP_DIR/$fname" -b -p "$DIR_CONDA"
"$CONDA_EXECUTABLE" tos accept
if $CONDA_TO_PATH ; then
info "Adding Miniconda3 to PATH..."
yellow ; "$CONDA_EXECUTABLE" init
"$CONDA_EXECUTABLE" config --set auto_activate_base false
"$CONDA_EXECUTABLE" config --set auto_activate false
fi
fi
}

3
.install/macos/faceswap_setup_macos.sh
View File

@ -379,10 +379,11 @@ conda_install() {
info "Installing Miniconda3..."
yellow ; fname="$(basename -- $DL_CONDA)"
bash "$TMP_DIR/$fname" -b -p "$DIR_CONDA"
"$CONDA_EXECUTABLE" tos accept
if $CONDA_TO_PATH ; then
info "Adding Miniconda3 to PATH..."
yellow ; "$CONDA_EXECUTABLE" init zsh bash
"$CONDA_EXECUTABLE" config --set auto_activate_base false
"$CONDA_EXECUTABLE" config --set auto_activate false
fi
fi
}

2
.install/windows/install.nsi
View File

@ -361,6 +361,8 @@ FunctionEnd
Function SetEnvironment
DetailPrint "Initializing Conda..."
SetDetailsPrint listonly
ExecDos::exec /NOUNLOAD /ASYNC /DETAILED "$\"$dirConda\Scripts\conda.exe$\" tos accept"
pop $0
ExecDos::exec /NOUNLOAD /ASYNC /DETAILED "$\"$dirConda\scripts\activate.bat$\" && conda update -y -n base -c defaults conda && conda deactivate"
pop $0
ExecDos::wait $0

2
requirements/_requirements_base.txt
View File

@ -2,7 +2,7 @@ tqdm>=4.65
psutil>=5.9.0
numexpr>=2.8.7
numpy>=1.26.0,<2.0.0
opencv-python>=4.9.0.0
opencv-python>=4.9.0.0,<4.12.0.0 # >=4.12 pulls in numpy2.x
pillow>=9.4.0,<10.0.0
scikit-learn>=1.3.0
fastcluster>=1.2.6