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

Fix multi model context in inference pool part2

Browse Source
This commit is contained in:
henryruhs 2024-09-05 17:28:13 +02:00
parent 1e35330798
commit 9120b0ba7a
10 changed files with 19 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
facefusion/face_detector.py
View File

@ -75,14 +75,12 @@ MODEL_SET : ModelSet =\
def get_inference_pool() -> InferencePool: def get_inference_pool() -> InferencePool:
_, model_sources = collect_model_downloads() _, model_sources = collect_model_downloads()
face_detector_model = state_manager.get_item('face_detector_model') model_context = __name__ + '.' + state_manager.get_item('face_detector_model')
model_context = __name__ + '.' + face_detector_model
return inference_manager.get_inference_pool(model_context, model_sources) return inference_manager.get_inference_pool(model_context, model_sources)
def clear_inference_pool() -> None: def clear_inference_pool() -> None:
face_detector_model = state_manager.get_item('face_detector_model') model_context = __name__ + '.' + state_manager.get_item('face_detector_model')
model_context = __name__ + '.' + face_detector_model
inference_manager.clear_inference_pool(model_context) inference_manager.clear_inference_pool(model_context)

6
facefusion/face_landmarker.py
View File

@ -76,14 +76,12 @@ MODEL_SET : ModelSet =\
def get_inference_pool() -> InferencePool: def get_inference_pool() -> InferencePool:
_, model_sources = collect_model_downloads() _, model_sources = collect_model_downloads()
face_landmarker_model = state_manager.get_item('face_landmarker_model') model_context = __name__ + '.' + state_manager.get_item('face_landmarker_model')
model_context = __name__ + '.' + face_landmarker_model
return inference_manager.get_inference_pool(model_context, model_sources) return inference_manager.get_inference_pool(model_context, model_sources)
def clear_inference_pool() -> None: def clear_inference_pool() -> None:
face_landmarker_model = state_manager.get_item('face_landmarker_model') model_context = __name__ + '.' + state_manager.get_item('face_landmarker_model')
model_context = __name__ + '.' + face_landmarker_model
inference_manager.clear_inference_pool(model_context) inference_manager.clear_inference_pool(model_context)

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

@ -53,14 +53,12 @@ MODEL_SET : ModelSet =\
def get_inference_pool() -> InferencePool: def get_inference_pool() -> InferencePool:
model_sources = get_model_options().get('sources') model_sources = get_model_options().get('sources')
age_modifier_model = state_manager.get_item('age_modifier_model') model_context = __name__ + '.' + state_manager.get_item('age_modifier_model')
model_context = __name__ + '.' + age_modifier_model
return inference_manager.get_inference_pool(model_context, model_sources) return inference_manager.get_inference_pool(model_context, model_sources)
def clear_inference_pool() -> None: def clear_inference_pool() -> None:
age_modifier_model = state_manager.get_item('age_modifier_model') model_context = __name__ + '.' + state_manager.get_item('age_modifier_model')
model_context = __name__ + '.' + age_modifier_model
inference_manager.clear_inference_pool(model_context) inference_manager.clear_inference_pool(model_context)

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

@ -73,8 +73,7 @@ MODEL_SET : ModelSet =\
def get_inference_pool() -> InferencePool: def get_inference_pool() -> InferencePool:
model_sources = get_model_options().get('sources') model_sources = get_model_options().get('sources')
expression_restorer_model = state_manager.get_item('expression_restorer_model') model_context = __name__ + '.' + state_manager.get_item('expression_restorer_model')
model_context = __name__ + '.' + expression_restorer_model
return inference_manager.get_inference_pool(model_context, model_sources) return inference_manager.get_inference_pool(model_context, model_sources)

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

@ -92,14 +92,12 @@ MODEL_SET : ModelSet =\
def get_inference_pool() -> InferencePool: def get_inference_pool() -> InferencePool:
model_sources = get_model_options().get('sources') model_sources = get_model_options().get('sources')
face_editor_model = state_manager.get_item('face_editor_model') model_context = __name__ + '.' + state_manager.get_item('face_editor_model')
model_context = __name__ + '.' + face_editor_model
return inference_manager.get_inference_pool(model_context, model_sources) return inference_manager.get_inference_pool(model_context, model_sources)
def clear_inference_pool() -> None: def clear_inference_pool() -> None:
face_editor_model = state_manager.get_item('face_editor_model') model_context = __name__ + '.' + state_manager.get_item('face_editor_model')
model_context = __name__ + '.' + face_editor_model
inference_manager.clear_inference_pool(model_context) inference_manager.clear_inference_pool(model_context)

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

@ -219,14 +219,12 @@ MODEL_SET : ModelSet =\
def get_inference_pool() -> InferencePool: def get_inference_pool() -> InferencePool:
model_sources = get_model_options().get('sources') model_sources = get_model_options().get('sources')
face_enhancer_model = state_manager.get_item('face_enhancer_model') model_context = __name__ + '.' + state_manager.get_item('face_enhancer_model')
model_context = __name__ + '.' + face_enhancer_model
return inference_manager.get_inference_pool(model_context, model_sources) return inference_manager.get_inference_pool(model_context, model_sources)
def clear_inference_pool() -> None: def clear_inference_pool() -> None:
face_enhancer_model = state_manager.get_item('face_enhancer_model') model_context = __name__ + '.' + state_manager.get_item('face_enhancer_model')
model_context = __name__ + '.' + face_enhancer_model
inference_manager.clear_inference_pool(model_context) inference_manager.clear_inference_pool(model_context)

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

@ -338,14 +338,12 @@ MODEL_SET : ModelSet =\
def get_inference_pool() -> InferencePool: def get_inference_pool() -> InferencePool:
model_sources = get_model_options().get('sources') model_sources = get_model_options().get('sources')
face_swapper_model = state_manager.get_item('face_swapper_model') model_context = __name__ + '.' + state_manager.get_item('face_swapper_model')
model_context = __name__ + '.' + face_swapper_model
return inference_manager.get_inference_pool(model_context, model_sources) return inference_manager.get_inference_pool(model_context, model_sources)
def clear_inference_pool() -> None: def clear_inference_pool() -> None:
face_swapper_model = state_manager.get_item('face_swapper_model') model_context = __name__ + '.' + state_manager.get_item('face_swapper_model')
model_context = __name__ + '.' + face_swapper_model
inference_manager.clear_inference_pool(model_context) inference_manager.clear_inference_pool(model_context)

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

@ -125,14 +125,12 @@ MODEL_SET : ModelSet =\
def get_inference_pool() -> InferencePool: def get_inference_pool() -> InferencePool:
model_sources = get_model_options().get('sources') model_sources = get_model_options().get('sources')
frame_colorizer_model = state_manager.get_item('frame_colorizer_model') model_context = __name__ + '.' + state_manager.get_item('frame_colorizer_model')
model_context = __name__ + '.' + frame_colorizer_model
return inference_manager.get_inference_pool(model_context, model_sources) return inference_manager.get_inference_pool(model_context, model_sources)
def clear_inference_pool() -> None: def clear_inference_pool() -> None:
frame_colorizer_model = state_manager.get_item('frame_colorizer_model') model_context = __name__ + '.' + state_manager.get_item('frame_colorizer_model')
model_context = __name__ + '.' + frame_colorizer_model
inference_manager.clear_inference_pool(model_context) inference_manager.clear_inference_pool(model_context)

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

@ -277,14 +277,12 @@ MODEL_SET : ModelSet =\
def get_inference_pool() -> InferencePool: def get_inference_pool() -> InferencePool:
model_sources = get_model_options().get('sources') model_sources = get_model_options().get('sources')
frame_enhancer_model = state_manager.get_item('frame_enhancer_model') model_context = __name__ + '.' + state_manager.get_item('frame_enhancer_model')
model_context = __name__ + '.' + frame_enhancer_model
return inference_manager.get_inference_pool(model_context, model_sources) return inference_manager.get_inference_pool(model_context, model_sources)
def clear_inference_pool() -> None: def clear_inference_pool() -> None:
frame_enhancer_model = state_manager.get_item('frame_enhancer_model') model_context = __name__ + '.' + state_manager.get_item('frame_enhancer_model')
model_context = __name__ + '.' + frame_enhancer_model
inference_manager.clear_inference_pool(model_context) inference_manager.clear_inference_pool(model_context)

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

@ -71,14 +71,12 @@ MODEL_SET : ModelSet =\
def get_inference_pool() -> InferencePool: def get_inference_pool() -> InferencePool:
model_sources = get_model_options().get('sources') model_sources = get_model_options().get('sources')
lip_syncer_model = state_manager.get_item('lip_syncer_model') model_context = __name__ + '.' + state_manager.get_item('lip_syncer_model')
model_context = __name__ + '.' + lip_syncer_model
return inference_manager.get_inference_pool(model_context, model_sources) return inference_manager.get_inference_pool(model_context, model_sources)
def clear_inference_pool() -> None: def clear_inference_pool() -> None:
lip_syncer_model = state_manager.get_item('lip_syncer_model') model_context = __name__ + '.' + state_manager.get_item('lip_syncer_model')
model_context = __name__ + '.' + lip_syncer_model
inference_manager.clear_inference_pool(model_context) inference_manager.clear_inference_pool(model_context)