From e38324e6f6b2cf3591d2814d61524de7e844039c Mon Sep 17 00:00:00 2001 From: henryruhs Date: Wed, 18 Dec 2024 00:42:35 +0100 Subject: [PATCH] Simplify model context --- facefusion/face_detector.py | 6 ++---- facefusion/face_landmarker.py | 6 ++---- facefusion/processors/modules/age_modifier.py | 6 ++---- facefusion/processors/modules/deep_swapper.py | 6 ++---- facefusion/processors/modules/expression_restorer.py | 3 +-- facefusion/processors/modules/face_editor.py | 6 ++---- facefusion/processors/modules/face_enhancer.py | 6 ++---- facefusion/processors/modules/face_swapper.py | 6 ++---- facefusion/processors/modules/frame_colorizer.py | 6 ++---- facefusion/processors/modules/frame_enhancer.py | 6 ++---- facefusion/processors/modules/lip_syncer.py | 6 ++---- 11 files changed, 21 insertions(+), 42 deletions(-) diff --git a/facefusion/face_detector.py b/facefusion/face_detector.py index 8801ec35..8787b161 100644 --- a/facefusion/face_detector.py +++ b/facefusion/face_detector.py @@ -79,13 +79,11 @@ def create_static_model_set(download_scope : DownloadScope) -> ModelSet: def get_inference_pool() -> InferencePool: _, model_sources = collect_model_downloads() - model_context = __name__ + '.' + state_manager.get_item('face_detector_model') - return inference_manager.get_inference_pool(model_context, model_sources) + return inference_manager.get_inference_pool(__name__, model_sources) def clear_inference_pool() -> None: - model_context = __name__ + '.' + state_manager.get_item('face_detector_model') - inference_manager.clear_inference_pool(model_context) + inference_manager.clear_inference_pool(__name__) def collect_model_downloads() -> Tuple[DownloadSet, DownloadSet]: diff --git a/facefusion/face_landmarker.py b/facefusion/face_landmarker.py index cd660d19..4a87fe1b 100644 --- a/facefusion/face_landmarker.py +++ b/facefusion/face_landmarker.py @@ -80,13 +80,11 @@ def create_static_model_set(download_scope : DownloadScope) -> ModelSet: def get_inference_pool() -> InferencePool: _, model_sources = collect_model_downloads() - model_context = __name__ + '.' + state_manager.get_item('face_landmarker_model') - return inference_manager.get_inference_pool(model_context, model_sources) + return inference_manager.get_inference_pool(__name__, model_sources) def clear_inference_pool() -> None: - model_context = __name__ + '.' + state_manager.get_item('face_landmarker_model') - inference_manager.clear_inference_pool(model_context) + inference_manager.clear_inference_pool(__name__) def collect_model_downloads() -> Tuple[DownloadSet, DownloadSet]: diff --git a/facefusion/processors/modules/age_modifier.py b/facefusion/processors/modules/age_modifier.py index 94c012ab..ed4e9316 100755 --- a/facefusion/processors/modules/age_modifier.py +++ b/facefusion/processors/modules/age_modifier.py @@ -65,13 +65,11 @@ def create_static_model_set(download_scope : DownloadScope) -> ModelSet: def get_inference_pool() -> InferencePool: model_sources = get_model_options().get('sources') - model_context = __name__ + '.' + state_manager.get_item('age_modifier_model') - return inference_manager.get_inference_pool(model_context, model_sources) + return inference_manager.get_inference_pool(__name__, model_sources) def clear_inference_pool() -> None: - model_context = __name__ + '.' + state_manager.get_item('age_modifier_model') - inference_manager.clear_inference_pool(model_context) + inference_manager.clear_inference_pool(__name__) def get_model_options() -> ModelOptions: diff --git a/facefusion/processors/modules/deep_swapper.py b/facefusion/processors/modules/deep_swapper.py index 0cc98fa8..cd5cd5e0 100755 --- a/facefusion/processors/modules/deep_swapper.py +++ b/facefusion/processors/modules/deep_swapper.py @@ -240,13 +240,11 @@ def create_static_model_set(download_scope : DownloadScope) -> ModelSet: def get_inference_pool() -> InferencePool: model_sources = get_model_options().get('sources') - model_context = __name__ + '.' + state_manager.get_item('deep_swapper_model') - return inference_manager.get_inference_pool(model_context, model_sources) + return inference_manager.get_inference_pool(__name__, model_sources) def clear_inference_pool() -> None: - model_context = __name__ + '.' + state_manager.get_item('deep_swapper_model') - inference_manager.clear_inference_pool(model_context) + inference_manager.clear_inference_pool(__name__) def get_model_options() -> ModelOptions: diff --git a/facefusion/processors/modules/expression_restorer.py b/facefusion/processors/modules/expression_restorer.py index a7770065..2dd0547e 100755 --- a/facefusion/processors/modules/expression_restorer.py +++ b/facefusion/processors/modules/expression_restorer.py @@ -77,8 +77,7 @@ def create_static_model_set(download_scope : DownloadScope) -> ModelSet: def get_inference_pool() -> InferencePool: model_sources = get_model_options().get('sources') - model_context = __name__ + '.' + state_manager.get_item('expression_restorer_model') - return inference_manager.get_inference_pool(model_context, model_sources) + return inference_manager.get_inference_pool(__name__, model_sources) def clear_inference_pool() -> None: diff --git a/facefusion/processors/modules/face_editor.py b/facefusion/processors/modules/face_editor.py index b82ce174..e55b9420 100755 --- a/facefusion/processors/modules/face_editor.py +++ b/facefusion/processors/modules/face_editor.py @@ -106,13 +106,11 @@ def create_static_model_set(download_scope : DownloadScope) -> ModelSet: def get_inference_pool() -> InferencePool: model_sources = get_model_options().get('sources') - model_context = __name__ + '.' + state_manager.get_item('face_editor_model') - return inference_manager.get_inference_pool(model_context, model_sources) + return inference_manager.get_inference_pool(__name__, model_sources) def clear_inference_pool() -> None: - model_context = __name__ + '.' + state_manager.get_item('face_editor_model') - inference_manager.clear_inference_pool(model_context) + inference_manager.clear_inference_pool(__name__) def get_model_options() -> ModelOptions: diff --git a/facefusion/processors/modules/face_enhancer.py b/facefusion/processors/modules/face_enhancer.py index 79fb2400..ce8de8a3 100755 --- a/facefusion/processors/modules/face_enhancer.py +++ b/facefusion/processors/modules/face_enhancer.py @@ -223,13 +223,11 @@ def create_static_model_set(download_scope : DownloadScope) -> ModelSet: def get_inference_pool() -> InferencePool: model_sources = get_model_options().get('sources') - model_context = __name__ + '.' + state_manager.get_item('face_enhancer_model') - return inference_manager.get_inference_pool(model_context, model_sources) + return inference_manager.get_inference_pool(__name__, model_sources) def clear_inference_pool() -> None: - model_context = __name__ + '.' + state_manager.get_item('face_enhancer_model') - inference_manager.clear_inference_pool(model_context) + inference_manager.clear_inference_pool(__name__) def get_model_options() -> ModelOptions: diff --git a/facefusion/processors/modules/face_swapper.py b/facefusion/processors/modules/face_swapper.py index 5fd6dd78..bcd2b4e8 100755 --- a/facefusion/processors/modules/face_swapper.py +++ b/facefusion/processors/modules/face_swapper.py @@ -337,13 +337,11 @@ def create_static_model_set(download_scope : DownloadScope) -> ModelSet: def get_inference_pool() -> InferencePool: model_sources = get_model_options().get('sources') - model_context = __name__ + '.' + state_manager.get_item('face_swapper_model') - return inference_manager.get_inference_pool(model_context, model_sources) + return inference_manager.get_inference_pool(__name__, model_sources) def clear_inference_pool() -> None: - model_context = __name__ + '.' + state_manager.get_item('face_swapper_model') - inference_manager.clear_inference_pool(model_context) + inference_manager.clear_inference_pool(__name__) def get_model_options() -> ModelOptions: diff --git a/facefusion/processors/modules/frame_colorizer.py b/facefusion/processors/modules/frame_colorizer.py index c09ea555..f61cc275 100644 --- a/facefusion/processors/modules/frame_colorizer.py +++ b/facefusion/processors/modules/frame_colorizer.py @@ -129,13 +129,11 @@ def create_static_model_set(download_scope : DownloadScope) -> ModelSet: def get_inference_pool() -> InferencePool: model_sources = get_model_options().get('sources') - model_context = __name__ + '.' + state_manager.get_item('frame_colorizer_model') - return inference_manager.get_inference_pool(model_context, model_sources) + return inference_manager.get_inference_pool(__name__, model_sources) def clear_inference_pool() -> None: - model_context = __name__ + '.' + state_manager.get_item('frame_colorizer_model') - inference_manager.clear_inference_pool(model_context) + inference_manager.clear_inference_pool(__name__) def get_model_options() -> ModelOptions: diff --git a/facefusion/processors/modules/frame_enhancer.py b/facefusion/processors/modules/frame_enhancer.py index 5179ebb4..33df5f16 100644 --- a/facefusion/processors/modules/frame_enhancer.py +++ b/facefusion/processors/modules/frame_enhancer.py @@ -386,13 +386,11 @@ def create_static_model_set(download_scope : DownloadScope) -> ModelSet: def get_inference_pool() -> InferencePool: model_sources = get_model_options().get('sources') - model_context = __name__ + '.' + state_manager.get_item('frame_enhancer_model') - return inference_manager.get_inference_pool(model_context, model_sources) + return inference_manager.get_inference_pool(__name__, model_sources) def clear_inference_pool() -> None: - model_context = __name__ + '.' + state_manager.get_item('frame_enhancer_model') - inference_manager.clear_inference_pool(model_context) + inference_manager.clear_inference_pool(__name__) def get_model_options() -> ModelOptions: diff --git a/facefusion/processors/modules/lip_syncer.py b/facefusion/processors/modules/lip_syncer.py index db672d10..27794566 100755 --- a/facefusion/processors/modules/lip_syncer.py +++ b/facefusion/processors/modules/lip_syncer.py @@ -75,13 +75,11 @@ def create_static_model_set(download_scope : DownloadScope) -> ModelSet: def get_inference_pool() -> InferencePool: model_sources = get_model_options().get('sources') - model_context = __name__ + '.' + state_manager.get_item('lip_syncer_model') - return inference_manager.get_inference_pool(model_context, model_sources) + return inference_manager.get_inference_pool(__name__, model_sources) def clear_inference_pool() -> None: - model_context = __name__ + '.' + state_manager.get_item('lip_syncer_model') - inference_manager.clear_inference_pool(model_context) + inference_manager.clear_inference_pool(__name__) def get_model_options() -> ModelOptions: