From 216d1f05cd62c07a10f57d946b732a195d3ae968 Mon Sep 17 00:00:00 2001 From: henryruhs Date: Sat, 23 Nov 2024 22:59:03 +0100 Subject: [PATCH] Kill resolve_execution_provider_keys() and move fallbacks where they belong --- facefusion/processors/modules/age_modifier.py | 2 +- facefusion/processors/modules/face_swapper.py | 2 +- facefusion/processors/modules/frame_colorizer.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/facefusion/processors/modules/age_modifier.py b/facefusion/processors/modules/age_modifier.py index 4e38c592..b5888280 100755 --- a/facefusion/processors/modules/age_modifier.py +++ b/facefusion/processors/modules/age_modifier.py @@ -163,7 +163,7 @@ def forward(crop_vision_frame : VisionFrame, extend_vision_frame : VisionFrame, age_modifier_inputs = {} if has_execution_provider('coreml'): - age_modifier.set_providers(execution_provider_set.get('cpu')) + age_modifier.set_providers([ execution_provider_set.get('cpu') ]) for age_modifier_input in age_modifier.get_inputs(): if age_modifier_input.name == 'target': diff --git a/facefusion/processors/modules/face_swapper.py b/facefusion/processors/modules/face_swapper.py index e39dfcb8..44d63075 100755 --- a/facefusion/processors/modules/face_swapper.py +++ b/facefusion/processors/modules/face_swapper.py @@ -449,7 +449,7 @@ def forward_swap_face(source_face : Face, crop_vision_frame : VisionFrame) -> Vi face_swapper_inputs = {} if has_execution_provider('coreml') and model_type in [ 'ghost', 'uniface' ]: - face_swapper.set_providers(execution_provider_set.get('cpu')) + face_swapper.set_providers([ execution_provider_set.get('cpu') ]) for face_swapper_input in face_swapper.get_inputs(): if face_swapper_input.name == 'source': diff --git a/facefusion/processors/modules/frame_colorizer.py b/facefusion/processors/modules/frame_colorizer.py index ee6f29a6..37e0ea29 100644 --- a/facefusion/processors/modules/frame_colorizer.py +++ b/facefusion/processors/modules/frame_colorizer.py @@ -200,7 +200,7 @@ def forward(color_vision_frame : VisionFrame) -> VisionFrame: frame_colorizer = get_inference_pool().get('frame_colorizer') if has_execution_provider('coreml'): - frame_colorizer.set_providers(execution_provider_set.get('cpu')) + frame_colorizer.set_providers([ execution_provider_set.get('cpu') ]) with thread_semaphore(): color_vision_frame = frame_colorizer.run(None,