Merge 2d0c5bc8d0 into 2b70131e6a

modules/metadata.py

@@ -1,3 +1,3 @@
 name = 'Deep-Live-Cam'
-version = '1.8.1'
+version = '1.8'
 edition = 'GitHub Edition'

modules/processors/frame/face_swapper.py

@@ -28,14 +28,12 @@ models_dir = os.path.join(
 
 
 def pre_check() -> bool:
-    download_directory_path = models_dir
-    model_url = "https://huggingface.co/hacksider/deep-live-cam/resolve/main/inswapper_128.onnx"
-    if "CUDAExecutionProvider" in modules.globals.execution_providers:
-        model_url = "https://huggingface.co/hacksider/deep-live-cam/resolve/main/inswapper_128_fp16.onnx"
-
+    download_directory_path = abs_dir
     conditional_download(
         download_directory_path,
-        [model_url],
+        [
+            "https://huggingface.co/hacksider/deep-live-cam/blob/main/inswapper_128_fp16.onnx"
+        ],
     )
     return True
 
@@ -62,10 +60,7 @@ def get_face_swapper() -> Any:
 
     with THREAD_LOCK:
         if FACE_SWAPPER is None:
-            model_name = "inswapper_128.onnx"
-            if "CUDAExecutionProvider" in modules.globals.execution_providers:
-                model_name = "inswapper_128_fp16.onnx"
-            model_path = os.path.join(models_dir, model_name)
+            model_path = os.path.join(models_dir, "inswapper_128_fp16.onnx")
             FACE_SWAPPER = insightface.model_zoo.get_model(
                 model_path, providers=modules.globals.execution_providers
             )