From 9eaeecaab5966a666a5719f143a2585b4ce5a00f Mon Sep 17 00:00:00 2001
From: henryruhs <info@henryruhs.com>
Date: Sun, 4 Jun 2023 17:58:47 +0200
Subject: [PATCH] Skip cpu pool for one cpu core to be used

---
 roop/core.py    | 9 ++++++---
 roop/swapper.py | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/roop/core.py b/roop/core.py
index 0957d05..30507e2 100755
--- a/roop/core.py
+++ b/roop/core.py
@@ -32,7 +32,7 @@ parser.add_argument('--keep-fps', help='maintain original fps', dest='keep_fps',
 parser.add_argument('--keep-frames', help='keep frames directory', dest='keep_frames', action='store_true', default=False)
 parser.add_argument('--all-faces', help='swap all faces in frame', dest='all_faces', action='store_true', default=False)
 parser.add_argument('--max-memory', help='maximum amount of RAM in GB to be used', dest='max_memory', type=int)
-parser.add_argument('--cpu-cores', help='number of CPU cores to use', dest='cpu_cores', type=int, default=max(psutil.cpu_count() - 2, 2))
+parser.add_argument('--cpu-cores', help='number of CPU cores to use', dest='cpu_cores', type=int, default=max(psutil.cpu_count() / 2, 2))
 parser.add_argument('--gpu-threads', help='number of threads to be use for the GPU', dest='gpu_threads', type=int, default=4)
 parser.add_argument('--gpu-vendor', help='choice your GPU vendor', dest='gpu_vendor', choices=['apple', 'amd', 'intel', 'nvidia'])
 
@@ -47,6 +47,9 @@ if 'all_faces' in args:
 if args['cpu_cores']:
     roop.globals.cpu_cores = args['cpu_cores']
 
+if sys.platform == 'darwin':
+    roop.globals.cpu_cores = 1
+
 if args['gpu_threads']:
     roop.globals.gpu_threads = args['gpu_threads']
 
@@ -195,12 +198,12 @@ def start(preview_callback = None):
         key=lambda x: int(x.split(sep)[-1].replace(".png", ""))
     ))
     status("swapping in progress...")
-    if sys.platform != 'darwin' and roop.globals.gpu_vendor is None:
+    if roop.globals.cpu_cores > 0 and roop.globals.gpu_vendor is None:
         global POOL
         POOL = mp.Pool(roop.globals.cpu_cores)
         process_video_multi_cores(args['source_img'], args['frame_paths'])
     else:
-        process_video(args['source_img'], args["frame_paths"], preview_callback)
+        process_video(args['source_img'], args["frame_paths"])
     status("creating video...")
     create_video(video_name, exact_fps, output_dir)
     status("adding audio...")
diff --git a/roop/swapper.py b/roop/swapper.py
index c5328a3..769a39e 100644
--- a/roop/swapper.py
+++ b/roop/swapper.py
@@ -85,7 +85,7 @@ def process_img(source_img, target_path, output_file):
     print("\n\nImage saved as:", output_file, "\n\n")
 
 
-def process_video(source_img, frame_paths, preview_callback):
+def process_video(source_img, frame_paths):
     progress_bar_format = '{l_bar}{bar}| {n_fmt}/{total_fmt} [{elapsed}<{remaining}, {rate_fmt}{postfix}]'
     with tqdm(total=len(frame_paths), desc="Processing", unit="frame", dynamic_ncols=True, bar_format=progress_bar_format) as progress:
         if roop.globals.gpu_vendor is not None and roop.globals.gpu_threads > 0: