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

Use module_name everywhere

Browse Source
This commit is contained in:
henryruhs
2025-04-16 12:06:36 +02:00
parent 84b9b60e6e
commit 72a0edb6ba
10 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
facefusion/face_masker.py
View File

@@ -171,8 +171,8 @@ def create_static_box_mask(crop_size : Size, face_mask_blur : float, face_mask_p
def create_occlusion_mask(crop_vision_frame : VisionFrame) -> Mask: def create_occlusion_mask(crop_vision_frame : VisionFrame) -> Mask:
face_occluder_model = state_manager.get_item('face_occluder_model') model_name = state_manager.get_item('face_occluder_model')
model_size = create_static_model_set('full').get(face_occluder_model).get('size') model_size = create_static_model_set('full').get(model_name).get('size')
prepare_vision_frame = cv2.resize(crop_vision_frame, model_size) prepare_vision_frame = cv2.resize(crop_vision_frame, model_size)
prepare_vision_frame = numpy.expand_dims(prepare_vision_frame, axis = 0).astype(numpy.float32) / 255.0 prepare_vision_frame = numpy.expand_dims(prepare_vision_frame, axis = 0).astype(numpy.float32) / 255.0
prepare_vision_frame = prepare_vision_frame.transpose(0, 1, 2, 3) prepare_vision_frame = prepare_vision_frame.transpose(0, 1, 2, 3)
@@ -184,8 +184,8 @@ def create_occlusion_mask(crop_vision_frame : VisionFrame) -> Mask:
def create_region_mask(crop_vision_frame : VisionFrame, face_mask_regions : List[FaceMaskRegion]) -> Mask: def create_region_mask(crop_vision_frame : VisionFrame, face_mask_regions : List[FaceMaskRegion]) -> Mask:
face_parser_model = state_manager.get_item('face_parser_model') model_name = state_manager.get_item('face_parser_model')
model_size = create_static_model_set('full').get(face_parser_model).get('size') model_size = create_static_model_set('full').get(model_name).get('size')
prepare_vision_frame = cv2.resize(crop_vision_frame, model_size) prepare_vision_frame = cv2.resize(crop_vision_frame, model_size)
prepare_vision_frame = prepare_vision_frame[:, :, ::-1].astype(numpy.float32) / 255.0 prepare_vision_frame = prepare_vision_frame[:, :, ::-1].astype(numpy.float32) / 255.0
prepare_vision_frame = numpy.subtract(prepare_vision_frame, numpy.array([ 0.485, 0.456, 0.406 ]).astype(numpy.float32)) prepare_vision_frame = numpy.subtract(prepare_vision_frame, numpy.array([ 0.485, 0.456, 0.406 ]).astype(numpy.float32))
@@ -209,8 +209,8 @@ def create_mouth_mask(face_landmark_68 : FaceLandmark68) -> Mask:
def forward_occlude_face(prepare_vision_frame : VisionFrame) -> Mask: def forward_occlude_face(prepare_vision_frame : VisionFrame) -> Mask:
face_occluder_model = state_manager.get_item('face_occluder_model') model_name = state_manager.get_item('face_occluder_model')
face_occluder = get_inference_pool().get(face_occluder_model) face_occluder = get_inference_pool().get(model_name)
with conditional_thread_semaphore(): with conditional_thread_semaphore():
occlusion_mask : Mask = face_occluder.run(None, occlusion_mask : Mask = face_occluder.run(None,
@@ -222,8 +222,8 @@ def forward_occlude_face(prepare_vision_frame : VisionFrame) -> Mask:
def forward_parse_face(prepare_vision_frame : VisionFrame) -> Mask: def forward_parse_face(prepare_vision_frame : VisionFrame) -> Mask:
face_parser_model = state_manager.get_item('face_parser_model') model_name = state_manager.get_item('face_parser_model')
face_parser = get_inference_pool().get(face_parser_model) face_parser = get_inference_pool().get(model_name)
with conditional_thread_semaphore(): with conditional_thread_semaphore():
region_mask : Mask = face_parser.run(None, region_mask : Mask = face_parser.run(None,

4
facefusion/processors/modules/age_modifier.py
View File

@@ -76,8 +76,8 @@ def clear_inference_pool() -> None:
def get_model_options() -> ModelOptions: def get_model_options() -> ModelOptions:
age_modifier_model = state_manager.get_item('age_modifier_model') model_name = state_manager.get_item('age_modifier_model')
return create_static_model_set('full').get(age_modifier_model) return create_static_model_set('full').get(model_name)
def register_args(program : ArgumentParser) -> None: def register_args(program : ArgumentParser) -> None:

4
facefusion/processors/modules/deep_swapper.py
View File

@@ -252,8 +252,8 @@ def clear_inference_pool() -> None:
def get_model_options() -> ModelOptions: def get_model_options() -> ModelOptions:
deep_swapper_model = state_manager.get_item('deep_swapper_model') model_name = state_manager.get_item('deep_swapper_model')
return create_static_model_set('full').get(deep_swapper_model) return create_static_model_set('full').get(model_name)
def get_model_size() -> Size: def get_model_size() -> Size:

4
facefusion/processors/modules/expression_restorer.py
View File

@@ -87,8 +87,8 @@ def clear_inference_pool() -> None:
def get_model_options() -> ModelOptions: def get_model_options() -> ModelOptions:
expression_restorer_model = state_manager.get_item('expression_restorer_model') model_name = state_manager.get_item('expression_restorer_model')
return create_static_model_set('full').get(expression_restorer_model) return create_static_model_set('full').get(model_name)
def register_args(program : ArgumentParser) -> None: def register_args(program : ArgumentParser) -> None:

4
facefusion/processors/modules/face_editor.py
View File

@@ -117,8 +117,8 @@ def clear_inference_pool() -> None:
def get_model_options() -> ModelOptions: def get_model_options() -> ModelOptions:
face_editor_model = state_manager.get_item('face_editor_model') model_name = state_manager.get_item('face_editor_model')
return create_static_model_set('full').get(face_editor_model) return create_static_model_set('full').get(model_name)
def register_args(program : ArgumentParser) -> None: def register_args(program : ArgumentParser) -> None:

4
facefusion/processors/modules/face_enhancer.py
View File

@@ -234,8 +234,8 @@ def clear_inference_pool() -> None:
def get_model_options() -> ModelOptions: def get_model_options() -> ModelOptions:
face_enhancer_model = state_manager.get_item('face_enhancer_model') model_name = state_manager.get_item('face_enhancer_model')
return create_static_model_set('full').get(face_enhancer_model) return create_static_model_set('full').get(model_name)
def register_args(program : ArgumentParser) -> None: def register_args(program : ArgumentParser) -> None:

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

@@ -336,28 +336,28 @@ def create_static_model_set(download_scope : DownloadScope) -> ModelSet:
def get_inference_pool() -> InferencePool: def get_inference_pool() -> InferencePool:
model_names = [ get_face_swapper_model() ] model_names = [ get_model_name() ]
model_source_set = get_model_options().get('sources') model_source_set = get_model_options().get('sources')
return inference_manager.get_inference_pool(__name__, model_names, model_source_set) return inference_manager.get_inference_pool(__name__, model_names, model_source_set)
def clear_inference_pool() -> None: def clear_inference_pool() -> None:
model_names = [ get_face_swapper_model() ] model_names = [ get_model_name() ]
inference_manager.clear_inference_pool(__name__, model_names) inference_manager.clear_inference_pool(__name__, model_names)
def get_model_options() -> ModelOptions: def get_model_options() -> ModelOptions:
face_swapper_model = get_face_swapper_model() model_name = get_model_name()
return create_static_model_set('full').get(face_swapper_model) return create_static_model_set('full').get(model_name)
def get_face_swapper_model() -> str: def get_model_name() -> str:
face_swapper_model = state_manager.get_item('face_swapper_model') model_name = state_manager.get_item('face_swapper_model')
if has_execution_provider('coreml') and face_swapper_model == 'inswapper_128_fp16': if has_execution_provider('coreml') and model_name == 'inswapper_128_fp16':
return 'inswapper_128' return 'inswapper_128'
return face_swapper_model return model_name
def register_args(program : ArgumentParser) -> None: def register_args(program : ArgumentParser) -> None:

4
facefusion/processors/modules/frame_colorizer.py
View File

@@ -147,8 +147,8 @@ def resolve_execution_providers() -> List[ExecutionProvider]:
def get_model_options() -> ModelOptions: def get_model_options() -> ModelOptions:
frame_colorizer_model = state_manager.get_item('frame_colorizer_model') model_name = state_manager.get_item('frame_colorizer_model')
return create_static_model_set('full').get(frame_colorizer_model) return create_static_model_set('full').get(model_name)
def register_args(program : ArgumentParser) -> None: def register_args(program : ArgumentParser) -> None:

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

@@ -398,8 +398,8 @@ def clear_inference_pool() -> None:
def get_model_options() -> ModelOptions: def get_model_options() -> ModelOptions:
frame_enhancer_model = get_frame_enhancer_model() model_name = get_frame_enhancer_model()
return create_static_model_set('full').get(frame_enhancer_model) return create_static_model_set('full').get(model_name)
def get_frame_enhancer_model() -> str: def get_frame_enhancer_model() -> str:

4
facefusion/processors/modules/lip_syncer.py
View File

@@ -86,8 +86,8 @@ def clear_inference_pool() -> None:
def get_model_options() -> ModelOptions: def get_model_options() -> ModelOptions:
lip_syncer_model = state_manager.get_item('lip_syncer_model') model_name = state_manager.get_item('lip_syncer_model')
return create_static_model_set('full').get(lip_syncer_model) return create_static_model_set('full').get(model_name)
def register_args(program : ArgumentParser) -> None: def register_args(program : ArgumentParser) -> None: