Merge branch 'next' of https://github.com/K1llMan/roop into next

README.md

@@ -40,14 +40,17 @@ options:
                         replace this face
   -o OUTPUT_FILE, --output OUTPUT_FILE
                         save output to this file
-  --gpu                 use gpu
   --keep-fps            maintain original fps
   --keep-frames         keep frames directory
+  --all-faces           swap all faces in frame
   --max-memory MAX_MEMORY
                         maximum amount of RAM in GB to be used
-  --max-cores CORES_COUNT
+  --cpu-threads CPU_THREADS
-                        number of cores to be use for CPU mode
+                        number of threads to be use for CPU mode
-  --all-faces           swap all faces in frame
+  --gpu-threads GPU_THREADS
+                        number of threads to be use for GPU moded
+  --gpu-vendor {amd,intel,nvidia}
+                        choice your gpu vendor
 ```
 
 Looking for a CLI mode? Using the -f/--face argument will make the program in cli mode.

roop/analyser.py

@@ -1,4 +1,5 @@
 import insightface
+import onnxruntime
 import roop.globals
 
 FACE_ANALYSER = None
@@ -7,6 +8,12 @@ FACE_ANALYSER = None
 def get_face_analyser():
     global FACE_ANALYSER
     if FACE_ANALYSER is None:
+        session_options = onnxruntime.SessionOptions()
+        if roop.globals.gpu_vendor is not None:
+            session_options.intra_op_num_threads = roop.globals.gpu_threads
+        else:
+            session_options.intra_op_num_threads = roop.globals.cpu_threads
+        session_options.execution_mode = onnxruntime.ExecutionMode.ORT_PARALLEL
         FACE_ANALYSER = insightface.app.FaceAnalysis(name='buffalo_l', providers=roop.globals.providers)
         FACE_ANALYSER.prepare(ctx_id=0, det_size=(640, 640))
     return FACE_ANALYSER

roop/core.py

@@ -6,7 +6,6 @@ import sys
 import shutil
 import glob
 import argparse
-import multiprocessing as mp
 import os
 import torch
 from pathlib import Path
@@ -15,7 +14,6 @@ from tkinter import filedialog
 from opennsfw2 import predict_video_frames, predict_image
 from tkinter.filedialog import asksaveasfilename
 import webbrowser
-import psutil
 import cv2
 import threading
 from PIL import Image, ImageTk
@@ -29,30 +27,35 @@ import roop.ui as ui
 if 'ROCMExecutionProvider' in roop.globals.providers:
     del torch
 
-pool = None
-args = {}
-
 signal.signal(signal.SIGINT, lambda signal_number, frame: quit())
 parser = argparse.ArgumentParser()
 parser.add_argument('-f', '--face', help='use this face', dest='source_img')
 parser.add_argument('-t', '--target', help='replace this face', dest='target_path')
 parser.add_argument('-o', '--output', help='save output to this file', dest='output_file')
-parser.add_argument('--gpu', help='choice your gpu vendor', dest='gpu', choices=['amd', 'nvidia'])
 parser.add_argument('--keep-fps', help='maintain original fps', dest='keep_fps', action='store_true', default=False)
 parser.add_argument('--keep-frames', help='keep frames directory', dest='keep_frames', action='store_true', default=False)
-parser.add_argument('--max-memory', help='maximum amount of RAM in GB to be used', type=int)
-parser.add_argument('--max-cores', help='number of cores to be use for CPU mode', dest='cores_count', type=int, default=max(psutil.cpu_count() - 2, 2))
 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-threads', help='number of threads to be use for CPU mode', dest='cpu_threads', type=int)
+parser.add_argument('--gpu-threads', help='number of threads to be use for GPU mode', dest='gpu_threads', type=int)
+parser.add_argument('--gpu-vendor', help='choice your gpu vendor', dest='gpu_vendor', choices=['amd', 'intel', 'nvidia'])
 
+args = {}
 for name, value in vars(parser.parse_args()).items():
     args[name] = value
 
-if 'gpu' in args:
+if 'all_faces' in args:
-    roop.globals.gpu = args['gpu']
-
-if 'all-faces' in args:
     roop.globals.all_faces = True
 
+if 'cpu_threads' in args and args['cpu_threads']:
+    roop.globals.cpu_threads = args['cpu_threads']
+
+if 'gpu_threads' in args and args['gpu_threads']:
+    roop.globals.gpu_threads = args['gpu_threads']
+
+if 'gpu_vendor' in args and args['gpu_vendor']:
+    roop.globals.gpu_vendor = args['gpu_vendor']
+
 sep = "/"
 if os.name == "nt":
     sep = "\\"
@@ -78,10 +81,10 @@ def pre_check():
     model_path = os.path.join(os.path.abspath(os.path.dirname(__file__)), '../inswapper_128.onnx')
     if not os.path.isfile(model_path):
         quit('File "inswapper_128.onnx" does not exist!')
-    if roop.globals.gpu == 'amd':
+    if roop.globals.gpu_vendor == 'amd':
         if 'ROCMExecutionProvider' not in roop.globals.providers:
             quit("You are using --gpu=amd flag but ROCM isn't available or properly installed on your system.")
-    if roop.globals.gpu == 'nvidia':
+    if roop.globals.gpu_vendor == 'nvidia':
         CUDA_VERSION = torch.version.cuda
         CUDNN_VERSION = torch.backends.cudnn.version()
         if not torch.cuda.is_available() or not CUDA_VERSION:
@@ -98,25 +101,6 @@ def pre_check():
         roop.globals.providers = ['CPUExecutionProvider']
 
 
-def start_processing():
-    frame_paths = args["frame_paths"]
-    n = len(frame_paths) // (args['cores_count'])
-    # single thread
-    if roop.globals.gpu == 'amd' or roop.globals.gpu == 'nvidia' or n < 2:
-        process_video(args['source_img'], args["frame_paths"], preview.update)
-        return
-    # multithread if total frames to cpu cores ratio is greater than 2
-    if n > 2:
-        processes = []
-        for i in range(0, len(frame_paths), n):
-            p = pool.apply_async(process_video, args=(args['source_img'], frame_paths[i:i+n], preview.update,))
-            processes.append(p)
-        for p in processes:
-            p.get()
-        pool.close()
-        pool.join()
-
-
 def preview_image(image_path):
     img = Image.open(image_path)
     img = img.resize((180, 180), Image.ANTIALIAS)
@@ -229,8 +213,6 @@ def start():
     if not args['output_file']:
         target_path = args['target_path']
         args['output_file'] = rreplace(target_path, "/", "/swapped-", 1) if "/" in target_path else "swapped-" + target_path
-    global pool
-    pool = mp.Pool(args['cores_count'])
     target_path = args['target_path']
     test_face = get_face_single(cv2.imread(args['source_img']))
     if not test_face:
@@ -264,7 +246,7 @@ def start():
         key=lambda x: int(x.split(sep)[-1].replace(".png", ""))
     ))
     status("swapping in progress...")
-    start_processing()
+    process_video(args['source_img'], args["frame_paths"], preview.update)
     status("creating video...")
     create_video(video_name, exact_fps, output_dir)
     status("adding audio...")
@@ -293,7 +275,6 @@ def run():
 
     pre_check()
     limit_resources()
-
     if args['source_img']:
         args['cli_mode'] = True
         start()

roop/globals.py

@@ -1,8 +1,11 @@
 import onnxruntime
+import psutil
 
-gpu = None
 all_faces = False
 log_level = 'error'
+cpu_threads = max(psutil.cpu_count() - 2, 2)
+gpu_threads = 8
+gpu_vendor = None
 providers = onnxruntime.get_available_providers()
 
 if 'TensorrtExecutionProvider' in providers:

roop/swapper.py

@@ -4,6 +4,7 @@ import cv2
 import insightface
 import roop.globals
 from roop.analyser import get_face_single, get_face_many
+import onnxruntime
 
 FACE_SWAPPER = None
 
@@ -11,8 +12,14 @@ FACE_SWAPPER = None
 def get_face_swapper():
     global FACE_SWAPPER
     if FACE_SWAPPER is None:
+        session_options = onnxruntime.SessionOptions()
+        if roop.globals.gpu_vendor is not None:
+            session_options.intra_op_num_threads = roop.globals.gpu_threads
+        else:
+            session_options.intra_op_num_threads = roop.globals.cpu_threads
+        session_options.execution_mode = onnxruntime.ExecutionMode.ORT_PARALLEL
         model_path = os.path.join(os.path.abspath(os.path.dirname(__file__)), '../inswapper_128.onnx')
-        FACE_SWAPPER = insightface.model_zoo.get_model(model_path, providers=roop.globals.providers)
+        FACE_SWAPPER = insightface.model_zoo.get_model(model_path, providers=roop.globals.providers, session_options=session_options)
     return FACE_SWAPPER
 
 

roop/utils.py

@@ -43,13 +43,13 @@ def set_fps(input_path, output_path, fps):
 
 
 def create_video(video_name, fps, output_dir):
-    hwaccel_option = '-hwaccel cuda' if roop.globals.gpu == 'nvidia' else ''
+    hwaccel_option = '-hwaccel cuda' if roop.globals.gpu_vendor == 'nvidia' else ''
     output_dir = path(output_dir)
     run_ffmpeg(f'{hwaccel_option} -framerate "{fps}" -i "{output_dir}{sep}%04d.png" -c:v libx264 -crf 7 -pix_fmt yuv420p -y "{output_dir}{sep}output.mp4"')
 
 
 def extract_frames(input_path, output_dir):
-    hwaccel_option = '-hwaccel cuda' if roop.globals.gpu == 'nvidia' else ''
+    hwaccel_option = '-hwaccel cuda' if roop.globals.gpu_vendor == 'nvidia' else ''
     input_path, output_dir = path(input_path), path(output_dir)
     run_ffmpeg(f' {hwaccel_option} -i "{input_path}" "{output_dir}{sep}%04d.png"')