jones/facefusion
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert CoreML fallbacks (#841)

Browse Source
This commit is contained in:
Henry Ruhs
2024-12-31 18:34:39 +01:00
committed by GitHub
parent b48eac30d0
commit 8efd7c1fa0
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
facefusion/processors/modules/face_swapper.py
View File

@@ -346,6 +346,9 @@ def clear_inference_pool() -> None:
def get_model_options() -> ModelOptions: def get_model_options() -> ModelOptions:
face_swapper_model = state_manager.get_item('face_swapper_model') face_swapper_model = state_manager.get_item('face_swapper_model')
if has_execution_provider('coreml') and face_swapper_model == 'inswapper_128_fp16':
return create_static_model_set('full').get('inswapper_128')
return create_static_model_set('full').get(face_swapper_model) return create_static_model_set('full').get(face_swapper_model)

9
facefusion/processors/modules/frame_enhancer.py
View File

@@ -11,6 +11,7 @@ import facefusion.processors.core as processors
from facefusion import config, content_analyser, inference_manager, logger, process_manager, state_manager, wording from facefusion import config, content_analyser, inference_manager, logger, process_manager, state_manager, wording
from facefusion.common_helper import create_int_metavar from facefusion.common_helper import create_int_metavar
from facefusion.download import conditional_download_hashes, conditional_download_sources, resolve_download_url from facefusion.download import conditional_download_hashes, conditional_download_sources, resolve_download_url
from facefusion.execution import has_execution_provider
from facefusion.filesystem import in_directory, is_image, is_video, resolve_relative_path, same_file_extension from facefusion.filesystem import in_directory, is_image, is_video, resolve_relative_path, same_file_extension
from facefusion.processors import choices as processors_choices from facefusion.processors import choices as processors_choices
from facefusion.processors.typing import FrameEnhancerInputs from facefusion.processors.typing import FrameEnhancerInputs
@@ -395,6 +396,14 @@ def clear_inference_pool() -> None:
def get_model_options() -> ModelOptions: def get_model_options() -> ModelOptions:
frame_enhancer_model = state_manager.get_item('frame_enhancer_model') frame_enhancer_model = state_manager.get_item('frame_enhancer_model')
if has_execution_provider('coreml'):
if frame_enhancer_model == 'real_esrgan_x2_fp16':
return create_static_model_set('full').get('real_esrgan_x2')
if frame_enhancer_model == 'real_esrgan_x4_fp16':
return create_static_model_set('full').get('real_esrgan_x4')
if frame_enhancer_model == 'real_esrgan_x8_fp16':
return create_static_model_set('full').get('real_esrgan_x8')
return create_static_model_set('full').get(frame_enhancer_model) return create_static_model_set('full').get(frame_enhancer_model)