diff --git a/modules/metadata.py b/modules/metadata.py index 6a507e3..b6e7b2b 100644 --- a/modules/metadata.py +++ b/modules/metadata.py @@ -1,3 +1,3 @@ name = 'Deep-Live-Cam' -version = '1.8' +version = '1.8.1' edition = 'GitHub Edition' diff --git a/modules/processors/frame/face_swapper.py b/modules/processors/frame/face_swapper.py index 36b83d6..88640b2 100644 --- a/modules/processors/frame/face_swapper.py +++ b/modules/processors/frame/face_swapper.py @@ -28,12 +28,14 @@ models_dir = os.path.join( def pre_check() -> bool: - download_directory_path = abs_dir + 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" + conditional_download( download_directory_path, - [ - "https://huggingface.co/hacksider/deep-live-cam/blob/main/inswapper_128_fp16.onnx" - ], + [model_url], ) return True @@ -60,7 +62,10 @@ def get_face_swapper() -> Any: with THREAD_LOCK: if FACE_SWAPPER is None: - model_path = os.path.join(models_dir, "inswapper_128_fp16.onnx") + 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) FACE_SWAPPER = insightface.model_zoo.get_model( model_path, providers=modules.globals.execution_providers )