administrator/frigate
1
0
Fork 0
mirror of https://github.com/blakeblackshear/frigate.git synced 2026-04-24 23:57:41 +03:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Use model type to decide if model can use full optimization

Browse Source
This commit is contained in:
Nicolas Mowen 2025-09-18 13:59:34 -06:00
parent 161ed46c55
commit 62c1efc430
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
frigate/detectors/detection_runners.py
View File

@ -6,8 +6,6 @@ from abc import ABC, abstractmethod
from typing import Any from typing import Any
import numpy as np import numpy as np
from frigate.detectors.detector_types import ModelTypeEnum
from frigate.embeddings.types import EnrichmentModelTypeEnum
import onnxruntime as ort import onnxruntime as ort
from frigate.util.model import get_ort_providers from frigate.util.model import get_ort_providers
@ -105,6 +103,10 @@ class CudaGraphRunner(BaseModelRunner):
@staticmethod @staticmethod
def is_complex_model(model_type: str) -> bool: def is_complex_model(model_type: str) -> bool:
# Import here to avoid circular imports
from frigate.detectors.detector_config import ModelTypeEnum
from frigate.embeddings.types import EnrichmentModelTypeEnum
return model_type in [ return model_type in [
ModelTypeEnum.yolonas.value, ModelTypeEnum.yolonas.value,
EnrichmentModelTypeEnum.paddleocr.value, EnrichmentModelTypeEnum.paddleocr.value,
@ -169,6 +171,9 @@ class OpenVINOModelRunner(BaseModelRunner):
@staticmethod @staticmethod
def is_complex_model(model_type: str) -> bool: def is_complex_model(model_type: str) -> bool:
# Import here to avoid circular imports
from frigate.embeddings.types import EnrichmentModelTypeEnum
return model_type in [EnrichmentModelTypeEnum.paddleocr.value] return model_type in [EnrichmentModelTypeEnum.paddleocr.value]
def __init__(self, model_path: str, device: str, model_type: str, **kwargs): def __init__(self, model_path: str, device: str, model_type: str, **kwargs):

2
frigate/detectors/plugins/onnx.py
View File

@ -39,7 +39,7 @@ class ONNXDetector(DetectionApi):
self.runner = get_optimized_runner( self.runner = get_optimized_runner(
path, path,
detector_config.device, detector_config.device,
complex_model=False, model_type=detector_config.model.model_type,
) )
self.onnx_model_type = detector_config.model.model_type self.onnx_model_type = detector_config.model.model_type

2
frigate/detectors/plugins/openvino.py
View File

@ -45,7 +45,7 @@ class OvDetector(DetectionApi):
self.runner = OpenVINOModelRunner( self.runner = OpenVINOModelRunner(
model_path=detector_config.model.path, model_path=detector_config.model.path,
device=detector_config.device, device=detector_config.device,
complex_model=False, model_type=detector_config.model.model_type,
) )
# For dfine models, also pre-allocate target sizes tensor # For dfine models, also pre-allocate target sizes tensor