Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Refactor onnx providers #13804

Merged
merged 3 commits into from
Sep 17, 2024
Merged

Refactor onnx providers #13804

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bb305c6
Ensure dirs exist for model caches
NickM-27 Sep 17, 2024
4b12e03
Formatting
NickM-27 Sep 17, 2024
290b8b1
Don't use tensorrt for embeddings
NickM-27 Sep 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion frigate/detectors/plugins/onnx.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import logging
import os

import cv2
import numpy as np
Expand Down Expand Up @@ -42,6 +43,9 @@ def __init__(self, detector_config: ONNXDetectorConfig):

for provider in providers:
if provider == "TensorrtExecutionProvider":
os.makedirs(
"/config/model_cache/tensorrt/ort/trt-engines", exist_ok=True
)
options.append(
{
"trt_timing_cache_enable": True,
Expand All @@ -51,7 +55,13 @@ def __init__(self, detector_config: ONNXDetectorConfig):
}
)
elif provider == "OpenVINOExecutionProvider":
options.append({"cache_dir": "/config/model_cache/openvino/ort"})
os.makedirs("/config/model_cache/openvino/ort", exist_ok=True)
options.append(
{
"cache_dir": "/config/model_cache/openvino/ort",
"device_type": "GPU",
}
)
else:
options.append({})

Expand Down
18 changes: 10 additions & 8 deletions frigate/embeddings/functions/clip.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,22 +49,24 @@ def _load_models(

@staticmethod
def _load_model(path: str, silent: bool):
providers = ort.get_available_providers()
providers = []
options = []

for provider in providers:
for provider in ort.get_available_providers():
if provider == "TensorrtExecutionProvider":
continue
elif provider == "OpenVINOExecutionProvider":
# TODO need to verify openvino works correctly
os.makedirs("/config/model_cache/openvino/ort", exist_ok=True)
providers.append(provider)
options.append(
{
"trt_timing_cache_enable": True,
"trt_timing_cache_path": "/config/model_cache/tensorrt/ort",
"trt_engine_cache_enable": True,
"trt_engine_cache_path": "/config/model_cache/tensorrt/ort/trt-engines",
"cache_dir": "/config/model_cache/openvino/ort",
"device_type": "GPU",
}
)
elif provider == "OpenVINOExecutionProvider":
options.append({"cache_dir": "/config/model_cache/openvino/ort"})
else:
providers.append(provider)
options.append({})

try:
Expand Down
Loading