github/DeepFaceLab
1
0
Fork 0
mirror of https://github.com/iperov/DeepFaceLab.git synced 2025-07-06 04:52:13 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merger: added option “Number of workers?”

Browse source 
Specify the number of threads to process.
A low value may affect performance.
A high value may result in memory error.
The value may not be greater than CPU cores.
This commit is contained in:
Colombo 2020-07-17 15:46:01 +04:00
parent dd21880ecd
commit 3930073e32
2 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
mainscripts/Merger.py
View file

@ -1,4 +1,5 @@
import math import math
import multiprocessing
import traceback import traceback
from pathlib import Path from pathlib import Path
@ -13,7 +14,8 @@ from core.joblib import MPClassFuncOnDemand, MPFunc
from core.leras import nn from core.leras import nn
from DFLIMG import DFLIMG from DFLIMG import DFLIMG
from facelib import FaceEnhancer, FaceType, LandmarksProcessor, XSegNet from facelib import FaceEnhancer, FaceType, LandmarksProcessor, XSegNet
from merger import FrameInfo, MergerConfig, InteractiveMergerSubprocessor from merger import FrameInfo, InteractiveMergerSubprocessor, MergerConfig
def main (model_class_name=None, def main (model_class_name=None,
saved_models_path=None, saved_models_path=None,
@ -71,6 +73,9 @@ def main (model_class_name=None,
if not is_interactive: if not is_interactive:
cfg.ask_settings() cfg.ask_settings()
subprocess_count = io.input_int("Number of workers?", max(8, multiprocessing.cpu_count()),
valid_range=[1, multiprocessing.cpu_count()], help_message="Specify the number of threads to process. A low value may affect performance. A high value may result in memory error. The value may not be greater than CPU cores." )
input_path_image_paths = pathex.get_image_paths(input_path) input_path_image_paths = pathex.get_image_paths(input_path)
if cfg.type == MergerConfig.TYPE_MASKED: if cfg.type == MergerConfig.TYPE_MASKED:
@ -199,7 +204,8 @@ def main (model_class_name=None,
frames_root_path = input_path, frames_root_path = input_path,
output_path = output_path, output_path = output_path,
output_mask_path = output_mask_path, output_mask_path = output_mask_path,
model_iter = model.get_iter() model_iter = model.get_iter(),
subprocess_count = subprocess_count,
).run() ).run()
model.finalize() model.finalize()

4
merger/InteractiveMergerSubprocessor.py
View file

@ -140,7 +140,7 @@ class InteractiveMergerSubprocessor(Subprocessor):
#override #override
def __init__(self, is_interactive, merger_session_filepath, predictor_func, predictor_input_shape, face_enhancer_func, xseg_256_extract_func, merger_config, frames, frames_root_path, output_path, output_mask_path, model_iter): def __init__(self, is_interactive, merger_session_filepath, predictor_func, predictor_input_shape, face_enhancer_func, xseg_256_extract_func, merger_config, frames, frames_root_path, output_path, output_mask_path, model_iter, subprocess_count=4):
if len (frames) == 0: if len (frames) == 0:
raise ValueError ("len (frames) == 0") raise ValueError ("len (frames) == 0")
@ -161,7 +161,7 @@ class InteractiveMergerSubprocessor(Subprocessor):
self.output_mask_path = output_mask_path self.output_mask_path = output_mask_path
self.model_iter = model_iter self.model_iter = model_iter
self.prefetch_frame_count = self.process_count = multiprocessing.cpu_count() self.prefetch_frame_count = self.process_count = subprocess_count
session_data = None session_data = None
if self.is_interactive and self.merger_session_filepath.exists(): if self.is_interactive and self.merger_session_filepath.exists():