Industry leading face manipulation platform
Patch 3.9.1 (#1245)
Henry Ruhs34df83262615
diff --git a/facefusion/execution.py b/facefusion/execution.pyindex 061866e9..746c7019 100644--- a/facefusion/execution.py+++ b/facefusion/execution.py@@ -20,10 +20,10 @@ def has_execution_provider(execution_provider : ExecutionProvider) -> bool:@lru_cache()def get_onnxruntime_version() -> Tuple[int, int, int]:- version_split = onnxruntime.__version__.split('.')+ version_split = onnxruntime.get_version_string().split('.')major_version = int(version_split[0])minor_version = int(version_split[1])- patch_version = int(version_split[2].split('+')[0])+ patch_version = int(version_split[2])return major_version, minor_version, patch_versiondiff --git a/facefusion/inference_manager.py b/facefusion/inference_manager.pyindex ff5bbb03..65ae0fb6 100644--- a/facefusion/inference_manager.py+++ b/facefusion/inference_manager.py@@ -28,7 +28,7 @@ def get_inference_pool(module_name : str, model_names : List[str], model_source_execution_device_ids = state_manager.get_item('execution_device_ids')execution_providers = state_manager.get_item('execution_providers')- has_arena_leak = has_execution_provider('cuda') and get_onnxruntime_version() > (1, 24, 4)+ has_arena_leak = has_execution_provider('cuda') and (1, 25, 1) < get_onnxruntime_version() < (1, 29, 0)app_context = detect_app_context()for execution_device_id in execution_device_ids:diff --git a/facefusion/metadata.py b/facefusion/metadata.pyindex d63ad8bd..d1921c69 100644--- a/facefusion/metadata.py+++ b/facefusion/metadata.py@@ -4,7 +4,7 @@ METADATA =\{'name': 'FaceFusion','description': 'Industry leading face manipulation platform',- 'version': '3.9.0',+ 'version': '3.9.1','license': 'OpenRAIL-AS','author': 'Henry Ruhs','url': 'https://facefusion.io'diff --git a/tests/test_inference_manager.py b/tests/test_inference_manager.pyindex 611bc625..401e6287 100644--- a/tests/test_inference_manager.py+++ b/tests/test_inference_manager.py@@ -1,4 +1,5 @@from types import SimpleNamespace+from typing import Tuplefrom unittest.mock import Mock, patchimport pytest@@ -6,7 +7,7 @@ from onnxruntime import InferenceSessionfrom facefusion import content_analyser, state_managerfrom facefusion.execution import resolve_cache_path-from facefusion.inference_manager import get_inference_pool, resolve_static_inference_providers+from facefusion.inference_manager import clear_inference_pool, get_inference_pool, resolve_static_inference_providers@pytest.fixture(scope = 'module', autouse = True)@@ -16,33 +17,32 @@ def before_all() -> None:state_manager.init_item('download_providers', [ 'github' ])-def test_get_inference_pool() -> None:[email protected]('onnxruntime_version, is_shared',+[+ ((1, 25, 1), True),+ ((1, 26, 0), False),+ ((1, 27, 0), False),+ ((1, 28, 0), False),+ ((1, 29, 0), True)+])+def test_get_inference_pool(onnxruntime_version : Tuple[int, int, int], is_shared : bool) -> None:model_names = [ 'nsfw_1', 'nsfw_2', 'nsfw_3' ]_, model_source_set = content_analyser.collect_model_downloads()with patch('facefusion.inference_manager.has_execution_provider', return_value = True):- with patch('facefusion.inference_manager.get_onnxruntime_version', return_value = (1, 26, 0)):+ with patch('facefusion.inference_manager.get_onnxruntime_version', return_value = onnxruntime_version):+ with patch('facefusion.inference_manager.detect_app_context', return_value = 'ui'):+ clear_inference_pool('facefusion.content_analyser', model_names)with patch('facefusion.inference_manager.detect_app_context', return_value = 'cli'):+ clear_inference_pool('facefusion.content_analyser', model_names)cli_inference_pool = get_inference_pool('facefusion.content_analyser', model_names, model_source_set)- assert isinstance(cli_inference_pool.get('nsfw_1'), InferenceSession)-with patch('facefusion.inference_manager.detect_app_context', return_value = 'ui'):ui_inference_pool = get_inference_pool('facefusion.content_analyser', model_names, model_source_set)- assert isinstance(ui_inference_pool.get('nsfw_1'), InferenceSession)-- assert not (cli_inference_pool.get('nsfw_1') is ui_inference_pool.get('nsfw_1'))-- with patch('facefusion.inference_manager.get_onnxruntime_version', return_value = (1, 24, 4)):-- with patch('facefusion.inference_manager.detect_app_context', return_value = 'ui'):- ui_inference_pool = get_inference_pool('facefusion.content_analyser', model_names, model_source_set)-- assert isinstance(ui_inference_pool.get('nsfw_1'), InferenceSession)-- assert cli_inference_pool.get('nsfw_1') is ui_inference_pool.get('nsfw_1')+ assert isinstance(cli_inference_pool.get('nsfw_1'), InferenceSession)+ assert (cli_inference_pool.get('nsfw_1') is ui_inference_pool.get('nsfw_1')) == is_shared@pytest.fixture