scope the nvidia_ml stuff into module alias

This commit is contained in:
henryruhs
2026-05-08 11:09:03 +02:00
parent 0816bea6d3
commit 74a9df35a6
2 changed files with 15 additions and 16 deletions
+15 -15
View File
@@ -7,7 +7,7 @@ from typing import List
import psutil
from facefusion import state_manager
from facefusion.libraries.nvidia_ml import create_memory_configuration, create_static_library, create_utilization_configuration
from facefusion.libraries import nvidia_ml as nvidia_ml_module
from facefusion.types import DiskMetrics, ExecutionProvider, GraphicDevice, MemoryMetrics, Metrics, NetworkMetrics, ProcessorMetrics
@@ -33,36 +33,36 @@ def detect_graphic_devices(execution_providers : List[ExecutionProvider]) -> Lis
def detect_nvidia_graphic_devices() -> List[GraphicDevice]:
nvidia_ml = create_static_library()
nvidia_ml_library = nvidia_ml_module.create_static_library()
graphic_devices : List[GraphicDevice] = []
if nvidia_ml:
nvidia_ml.nvmlInit_v2()
if nvidia_ml_library:
nvidia_ml_library.nvmlInit_v2()
device_count = ctypes.c_uint()
nvidia_ml.nvmlDeviceGetCount_v2(ctypes.byref(device_count))
nvidia_ml_library.nvmlDeviceGetCount_v2(ctypes.byref(device_count))
driver_version = ctypes.create_string_buffer(80)
nvidia_ml.nvmlSystemGetDriverVersion(driver_version, 80)
nvidia_ml_library.nvmlSystemGetDriverVersion(driver_version, 80)
cuda_version = ctypes.c_int()
nvidia_ml.nvmlSystemGetCudaDriverVersion(ctypes.byref(cuda_version))
nvidia_ml_library.nvmlSystemGetCudaDriverVersion(ctypes.byref(cuda_version))
for device_id in range(device_count.value):
device_handle = ctypes.c_void_p()
nvidia_ml.nvmlDeviceGetHandleByIndex_v2(device_id, ctypes.byref(device_handle))
nvidia_ml_library.nvmlDeviceGetHandleByIndex_v2(device_id, ctypes.byref(device_handle))
name = ctypes.create_string_buffer(96)
nvidia_ml.nvmlDeviceGetName(device_handle, name, 96)
nvidia_ml_library.nvmlDeviceGetName(device_handle, name, 96)
memory = create_memory_configuration()
nvidia_ml.nvmlDeviceGetMemoryInfo(device_handle, ctypes.byref(memory))
memory = nvidia_ml_module.create_memory_configuration()
nvidia_ml_library.nvmlDeviceGetMemoryInfo(device_handle, ctypes.byref(memory))
temperature = ctypes.c_uint()
nvidia_ml.nvmlDeviceGetTemperature(device_handle, 0, ctypes.byref(temperature))
nvidia_ml_library.nvmlDeviceGetTemperature(device_handle, 0, ctypes.byref(temperature))
utilization = create_utilization_configuration()
nvidia_ml.nvmlDeviceGetUtilizationRates(device_handle, ctypes.byref(utilization))
utilization = nvidia_ml_module.create_utilization_configuration()
nvidia_ml_library.nvmlDeviceGetUtilizationRates(device_handle, ctypes.byref(utilization))
graphic_devices.append(
{
@@ -118,7 +118,7 @@ def detect_nvidia_graphic_devices() -> List[GraphicDevice]:
}
})
nvidia_ml.nvmlShutdown()
nvidia_ml_library.nvmlShutdown()
return graphic_devices
-1
View File
@@ -3,7 +3,6 @@ numpy==2.4.2
onnx==1.20.1
onnxruntime==1.24.1
opencv-python==4.13.0.92
nvidia-ml-py==13.590.48
psutil==7.2.2
tqdm==4.67.3
scipy==1.16.3