This commit is contained in:
Nicolas Mowen 2025-09-14 16:45:01 -06:00
parent b7a669ee72
commit 7314daf78e
2 changed files with 12 additions and 20 deletions

View File

@ -48,7 +48,7 @@ def is_openvino_gpu_npu_available() -> bool:
"""
available_devices = get_openvino_available_devices()
# Check for GPU, NPU, or other acceleration devices (excluding CPU)
acceleration_devices = ['GPU', 'MYRIAD', 'NPU', 'GNA', 'HDDL']
acceleration_devices = ["GPU", "MYRIAD", "NPU", "GNA", "HDDL"]
return any(device in available_devices for device in acceleration_devices)
@ -354,20 +354,10 @@ def get_optimized_runner(
if rknn_path:
return RKNNModelRunner(rknn_path)
providers, options = get_ort_providers(device == "CPU", device, **kwargs)
if device == "CPU":
return ONNXModelRunner(
ort.InferenceSession(
model_path,
providers=providers,
provider_options=options,
)
)
if is_openvino_gpu_npu_available():
return OpenVINOModelRunner(model_path, device, **kwargs)
providers, options = get_ort_providers(device == "CPU", device, **kwargs)
ortSession = ort.InferenceSession(
model_path,
providers=providers,

View File

@ -338,14 +338,16 @@ def get_ort_providers(
else:
continue
elif provider == "OpenVINOExecutionProvider":
os.makedirs(os.path.join(MODEL_CACHE_DIR, "openvino/ort"), exist_ok=True)
providers.append(provider)
options.append(
{
"cache_dir": os.path.join(MODEL_CACHE_DIR, "openvino/ort"),
"device_type": device,
}
)
# OpenVINO is used directly
if device == "OpenVINO":
os.makedirs(os.path.join(MODEL_CACHE_DIR, "openvino/ort"), exist_ok=True)
providers.append(provider)
options.append(
{
"cache_dir": os.path.join(MODEL_CACHE_DIR, "openvino/ort"),
"device_type": device,
}
)
elif provider == "MIGraphXExecutionProvider":
# MIGraphX uses more CPU than ROCM, while also being the same speed
if device == "MIGraphX":