github/DeepFaceLive
1
0
Fork 0
mirror of https://github.com/iperov/DeepFaceLive synced 2025-07-06 13:02:16 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

update packages versions. Fix paths in windows build

Browse source
This commit is contained in:
iperov 2022-03-08 09:00:49 +04:00
parent eb21373f60
commit af002c8c9a
2 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
build/linux/Dockerfile
View file

@ -9,7 +9,7 @@ RUN ln -s /usr/bin/python3 /usr/bin/python
RUN git clone https://github.com/iperov/DeepFaceLive.git RUN git clone https://github.com/iperov/DeepFaceLive.git
RUN python -m pip install --upgrade pip RUN python -m pip install --upgrade pip
RUN python -m pip install onnxruntime-gpu==1.10.0 numpy==1.21.2 h5py numexpr opencv-python==4.5.3.56 opencv-contrib-python==4.5.3.56 pyqt6==6.2.1 onnx==1.10.1 torch==1.8.1 torchvision==0.9.1 RUN python -m pip install onnxruntime-gpu==1.10.0 numpy==1.21.5 h5py numexpr opencv-python==4.5.5.62 opencv-contrib-python==4.5.5.62 pyqt6==6.2.3 onnx==1.11.0 torch==1.8.1 torchvision==0.9.1
WORKDIR /app/DeepFaceLive WORKDIR /app/DeepFaceLive
COPY example.sh example.sh COPY example.sh example.sh

18
build/windows/WindowsBuilder.py
View file

@ -447,7 +447,7 @@ fr'''{{
fr"""@echo off fr"""@echo off
cd /D %~dp0 cd /D %~dp0
call {self.DIRNAME_INTERNAL}\setenv.bat call {self.DIRNAME_INTERNAL}\setenv.bat
%PYTHONEXECUTABLE% {self.DIRNAME_INTERNAL}\{internal_relative_path} {args_str} "%PYTHONEXECUTABLE%" {self.DIRNAME_INTERNAL}\{internal_relative_path} {args_str}
pause pause
""") """)
@ -457,7 +457,7 @@ pause
fr"""@echo off fr"""@echo off
cd /D %~dp0 cd /D %~dp0
call setenv.bat call setenv.bat
%PYTHONEXECUTABLE% {internal_relative_path} {args_str} "%PYTHONEXECUTABLE%" {internal_relative_path} {args_str}
pause pause
""") """)
@ -471,13 +471,13 @@ def build_deepfacelive_windows(release_dir, cache_dir, python_ver='3.7.9', backe
# PIP INSTALLATIONS # PIP INSTALLATIONS
builder.install_pip_package('numpy==1.21.3') builder.install_pip_package('numpy==1.21.5')
builder.install_pip_package('h5py') builder.install_pip_package('h5py')
builder.install_pip_package('numexpr') builder.install_pip_package('numexpr')
builder.install_pip_package('opencv-python==4.5.3.56') builder.install_pip_package('opencv-python==4.5.5.62')
builder.install_pip_package('opencv-contrib-python==4.5.3.56') builder.install_pip_package('opencv-contrib-python==4.5.5.62')
builder.install_pip_package('pyqt6==6.2.1') builder.install_pip_package('pyqt6==6.2.3')
builder.install_pip_package('onnx==1.10.1') builder.install_pip_package('onnx==1.11.0')
if backend == 'cuda': if backend == 'cuda':
builder.install_pip_package('torch==1.8.1+cu111 torchvision==0.9.1+cu111 -f https://download.pytorch.org/whl/torch_stable.html') builder.install_pip_package('torch==1.8.1+cu111 torchvision==0.9.1+cu111 -f https://download.pytorch.org/whl/torch_stable.html')
@ -523,9 +523,9 @@ def build_deepfacelive_windows(release_dir, cache_dir, python_ver='3.7.9', backe
shutil.copytree( str(Path(__file__).parent.parent / 'samples'), str(userdata_path / 'samples') ) shutil.copytree( str(Path(__file__).parent.parent / 'samples'), str(userdata_path / 'samples') )
if backend == 'cuda': if backend == 'cuda':
builder.create_run_python_script('DeepFaceLive.bat', 'DeepFaceLive\\main.py', 'run DeepFaceLive --userdata-dir=%~dp0userdata') builder.create_run_python_script('DeepFaceLive.bat', 'DeepFaceLive\\main.py', 'run DeepFaceLive --userdata-dir="%~dp0userdata"')
elif backend == 'directml': elif backend == 'directml':
builder.create_run_python_script('DeepFaceLive.bat', 'DeepFaceLive\\main.py', 'run DeepFaceLive --userdata-dir=%~dp0userdata --no-cuda') builder.create_run_python_script('DeepFaceLive.bat', 'DeepFaceLive\\main.py', 'run DeepFaceLive --userdata-dir="%~dp0userdata" --no-cuda')
builder.create_internal_run_python_script('build DeepFaceLive NVIDIA.bat', 'DeepFaceLive\\build\\windows\\WindowsBuilder.py', '--build-type dfl-windows --release-dir Builds\DeepFaceLive_NVIDIA --cache-dir _cache --backend cuda') builder.create_internal_run_python_script('build DeepFaceLive NVIDIA.bat', 'DeepFaceLive\\build\\windows\\WindowsBuilder.py', '--build-type dfl-windows --release-dir Builds\DeepFaceLive_NVIDIA --cache-dir _cache --backend cuda')
builder.create_internal_run_python_script('build DeepFaceLive DirectX12.bat', 'DeepFaceLive\\build\\windows\\WindowsBuilder.py', '--build-type dfl-windows --release-dir Builds\DeepFaceLive_DirectX12 --cache-dir _cache --backend directml') builder.create_internal_run_python_script('build DeepFaceLive DirectX12.bat', 'DeepFaceLive\\build\\windows\\WindowsBuilder.py', '--build-type dfl-windows --release-dir Builds\DeepFaceLive_DirectX12 --cache-dir _cache --backend directml')